From 2a8be784c4fb3b648252cf1600bfbdaed9c8f189 Mon Sep 17 00:00:00 2001
From: zhouliujun <1096432931@qq.com>
Date: Thu, 9 Jul 2020 11:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |  2 ++
 examples/App.vue                  | 14 ++++++++------
 lib/vue-aliplayer-v2.umd.js       |  8 ++++----
 package.json                      |  4 ++--
 packages/AliplayerV2/src/main.vue | 17 +++++++++--------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 537e341..aa8ee3b 100644
--- a/README.md
+++ b/README.md
@@ -378,6 +378,8 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 ## 更新日志
 
+> v1.2.1 修复指定id情况下,播放器报错"没有为播放器指定容器",目前移除外部指定id的方式,所有的播放器id都由内部生成,不再由外部指定容器(外部指定的意义并不大), 感谢"liyoro"的反馈和建议.
+
 > v1.2.1 修复直播播放的情况下,播放器已经销毁,而后台还在继续下载资源造成卡顿的bug,修复多个播放器只渲染1个的bug, 感谢"Jonauil"和"guangming95"两位网友的反馈和建议.
 
 > v1.2.0 修复播放源(MP4/m3u8)之间切换无法正常播放的bug,增加options配置项动态响应功能,优化部分播放器的逻辑, 感谢"liyoro"网友的反馈和建议.
diff --git a/examples/App.vue b/examples/App.vue
index 3332611..b9e7a20 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -1,7 +1,7 @@
 <template>
     <div id="app">
         <template v-if="!isShowMultiple && show">
-            <vue-aliplayer-v2 :source="source" ref="VueAliplayerV3" :options="options" />
+            <vue-aliplayer-v2 :source="source" ref="VueAliplayerV2" :options="options" />
         </template>
         <div v-if="isShowMultiple && show" class="show-multiple">
             <template v-for="x in 5">
@@ -10,13 +10,15 @@
         </div>
         <p class="remove-text" v-if="!show">播放器已销毁!</p>
         <div class="player-btns">
-            <span @click="play()">播放</span>
-            <span @click="pause()">暂停</span>
-            <span @click="replay()">重播</span>
-            <span @click="getCurrentTime()">播放时刻</span>
+            <template v-if="!isShowMultiple && show">
+                <span @click="play()">播放</span>
+                <span @click="pause()">暂停</span>
+                <span @click="replay()">重播</span>
+                <span @click="getCurrentTime()">播放时刻</span>
+                <span @click="getStatus()">获取播放器状态</span>
+            </template>
             <span @click="show = !show">{{ show ? '销毁' : '重载' }}</span>
             <span @click="options.isLive = !options.isLive">{{ options.isLive ? '切换普通模式' : '切换直播模式' }}</span>
-            <span @click="getStatus()">获取播放器状态</span>
             <span @click="showMultiple()">{{isShowMultiple ? '显示1个播放器' : '显示多个播放器'}}</span>
         </div>
         <div class="source-box">
diff --git a/lib/vue-aliplayer-v2.umd.js b/lib/vue-aliplayer-v2.umd.js
index 8cd3ccb..b29fb96 100644
--- a/lib/vue-aliplayer-v2.umd.js
+++ b/lib/vue-aliplayer-v2.umd.js
@@ -389,7 +389,7 @@ var es6_regexp_to_string = __webpack_require__("cc1d");
 
         if (this.source) this.config.source = this.source; //播放源
 
-        if (this.id) this.config.id = this.id;
+        // if (this.id) this.config.id = this.id;
         this.player && this.player.dispose(); //防止实例的重复
 
         this.player = Aliplayer(this.config);
@@ -697,7 +697,7 @@ var es6_regexp_to_string = __webpack_require__("cc1d");
   }
 });
 // CONCATENATED MODULE: ./packages/AliplayerV2/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
+ /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
 // CONCATENATED MODULE: ./node_modules/_vue-loader@15.7.2@vue-loader/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
 
@@ -809,7 +809,7 @@ var component = normalizeComponent(
   null,
   null,
   null
-  
+
 )
 
 /* harmony default export */ var main = (component.exports);
@@ -1872,4 +1872,4 @@ module.exports = !__webpack_require__("0cc1")(function () {
 
 /******/ });
 });
-//# sourceMappingURL=vue-aliplayer-v2.umd.js.map
\ No newline at end of file
+//# sourceMappingURL=vue-aliplayer-v2.umd.js.map
diff --git a/package.json b/package.json
index 4588566..164d6ad 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "vue-aliplayer-v2",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "author": "yxs",
-    "description": "感谢每一位开源的开发者. 这是一个基于Alipayer 开发并封装成vue组件的播放器.",
+    "description": "感谢每一位开源的开发者. 这是一个基于Alipayer 开发并封装成vue组件的集成播放器.",
     "main":"lib/vue-aliplayer-v2.umd.min.js",
     "private": false,
     "license": "MIT",
diff --git a/packages/AliplayerV2/src/main.vue b/packages/AliplayerV2/src/main.vue
index 41ec010..a4e3a36 100644
--- a/packages/AliplayerV2/src/main.vue
+++ b/packages/AliplayerV2/src/main.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :id="config.id"></div>
+    <div :id="playerId"></div>
 </template>
 <script>
 export default {
@@ -15,11 +15,11 @@ export default {
             type: [String],
             default: null
         },
-        id:{
-            required: false,
-            type: [String],
-            default: null
-        },
+        // id:{
+        //     required: false,
+        //     type: [String],
+        //     default: null
+        // },
         cssLink:{   //css版本源
             required: false,
             type: [String],
@@ -34,8 +34,9 @@ export default {
     data () {
         return {
             player: null,   //播放器实例
+            playerId: `player-${Math.random().toString(36).substr(2).toLocaleUpperCase()}`,
             config:{
-                id: `player-${Math.random().toString(36).substr(2).toLocaleUpperCase()}`,  //播放器的ID
+                id: null,  //播放器的ID
                 width: '100%',
                 autoplay: true,
                 // isLive: true,
@@ -200,7 +201,7 @@ export default {
                     }
                 }
                 if(this.source) this.config.source = this.source; //播放源
-                if(this.id) this.config.id = this.id
+                this.config.id = this.playerId; //赋值播放器容器id
                 this.player && this.player.dispose();   //防止实例的重复
                 this.player = Aliplayer(this.config);
                 for(const ev in this.events){