@94ai/nf-audio 4.0.1 → 4.0.2

package/lib/nf-audio.cjs.js

@@ -351,13 +351,15 @@ const _sfc_main = {
       this.$emit("error", e);
     },
     //视频在可以播放时触发
-    getDuration() {
+    getDuration(e) {
       this.totalTime = timeFormat(this.audio.duration);
       this.audio.volume = this.volume;
       this.$emit("canPlay", this.totalTime);
+      this.$emit("canplay", e);
     },
     //进度条发生变化时触发
-    updateTime() {
+    updateTime(e) {
+      this.$emit("updateTime", e);
       if (!this.$refs.progressContainer)
         return;
       this.currentTime = timeFormat(this.audio.currentTime);
@@ -390,7 +392,8 @@ const _sfc_main = {
         this.jumpToTime(this.betweenStart);
       }
     },
-    handleAudioEnded() {
+    handleAudioEnded(e) {
+      this.$emit("ended", e);
       this.$refs.progressCurrent.style.width = this.$refs.progressContainer.clientWidth + "px";
       this.$refs.progressBar.style.left = this.$refs.progressContainer.clientWidth - this.$refs.progressBar.clientWidth / 2 + "px";
       this.pause();
@@ -508,12 +511,10 @@ const _sfc_main = {
     openWindow() {
       window.open(this.src);
     },
-    calcMoveX() {
-      if (!this.audio.paused) {
-        let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration);
-        this.$refs.progressCurrent.style.width = MoveX + "px";
-        this.$refs.progressBar.style.left = MoveX - this.$refs.progressBar.clientWidth / 2 + "px";
-      }
+    async calcMoveX() {
+      let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration);
+      this.$refs.progressCurrent.style.width = MoveX + "px";
+      this.$refs.progressBar.style.left = MoveX - this.$refs.progressBar.clientWidth / 2 + "px";
     },
     checkAudioEffectNull() {
       return this.audio.duration === 0 || Number.isNaN(this.audio.duration);
@@ -528,16 +529,9 @@ const _sfc_main = {
           return false;
         }
         if (time >= this.audio.duration) {
-          if (time > this.audio.duration) {
-            NfMessage.Message.warning(this.crossTimeTip);
-            this.paused = true;
-            this.betweenPlaying = false;
-          } else {
-            this.audio.currentTime = this.audio.duration;
-            this.currentTime = timeFormat(this.audio.currentTime);
-            this.calcMoveX();
-            this.playAudio();
-          }
+          this.audio.currentTime = this.audio.duration;
+          this.currentTime = timeFormat(this.audio.currentTime);
+          this.calcMoveX();
           return false;
         } else if (time >= 0 && time < this.audio.duration) {
           this.audio.currentTime = time;
@@ -605,7 +599,61 @@ var _sfc_render = function render() {
       "canplay": _vm.getDuration,
       "error": _vm.loadError,
       "timeupdate": _vm.updateTime,
-      "ended": _vm.handleAudioEnded
+      "ended": _vm.handleAudioEnded,
+      "abort": function($event) {
+        return _vm.$emit("abort", $event);
+      },
+      "canplaythrough": function($event) {
+        return _vm.$emit("canplaythrough", $event);
+      },
+      "durationchange": function($event) {
+        return _vm.$emit("durationchange", $event);
+      },
+      "emptied": function($event) {
+        return _vm.$emit("emptied", $event);
+      },
+      "loadeddata": function($event) {
+        return _vm.$emit("loadeddata", $event);
+      },
+      "loadedmetadata": function($event) {
+        return _vm.$emit("loadedmetadata", $event);
+      },
+      "loadstart": function($event) {
+        return _vm.$emit("loadstart", $event);
+      },
+      "pause": function($event) {
+        return _vm.$emit("pause", $event);
+      },
+      "play": function($event) {
+        return _vm.$emit("play", $event);
+      },
+      "playing": function($event) {
+        return _vm.$emit("playing", $event);
+      },
+      "progress": function($event) {
+        return _vm.$emit("progress", $event);
+      },
+      "ratechange": function($event) {
+        return _vm.$emit("ratechange", $event);
+      },
+      "seeked": function($event) {
+        return _vm.$emit("seeked", $event);
+      },
+      "seeking": function($event) {
+        return _vm.$emit("seeking", $event);
+      },
+      "stalled": function($event) {
+        return _vm.$emit("stalled", $event);
+      },
+      "suspend": function($event) {
+        return _vm.$emit("suspend", $event);
+      },
+      "volumechange": function($event) {
+        return _vm.$emit("volumechange", $event);
+      },
+      "waiting": function($event) {
+        return _vm.$emit("waiting", $event);
+      }
     }
   }), _vm.showJumpTime ? _vm._t("jump", function() {
     return [_c("div", {

package/lib/nf-audio.esm-bundler.js

@@ -349,13 +349,15 @@ const _sfc_main = {
       this.$emit("error", e);
     },
     //视频在可以播放时触发
-    getDuration() {
+    getDuration(e) {
       this.totalTime = timeFormat(this.audio.duration);
       this.audio.volume = this.volume;
       this.$emit("canPlay", this.totalTime);
+      this.$emit("canplay", e);
     },
     //进度条发生变化时触发
-    updateTime() {
+    updateTime(e) {
+      this.$emit("updateTime", e);
       if (!this.$refs.progressContainer)
         return;
       this.currentTime = timeFormat(this.audio.currentTime);
@@ -388,7 +390,8 @@ const _sfc_main = {
         this.jumpToTime(this.betweenStart);
       }
     },
-    handleAudioEnded() {
+    handleAudioEnded(e) {
+      this.$emit("ended", e);
       this.$refs.progressCurrent.style.width = this.$refs.progressContainer.clientWidth + "px";
       this.$refs.progressBar.style.left = this.$refs.progressContainer.clientWidth - this.$refs.progressBar.clientWidth / 2 + "px";
       this.pause();
@@ -506,12 +509,10 @@ const _sfc_main = {
     openWindow() {
       window.open(this.src);
     },
-    calcMoveX() {
-      if (!this.audio.paused) {
-        let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration);
-        this.$refs.progressCurrent.style.width = MoveX + "px";
-        this.$refs.progressBar.style.left = MoveX - this.$refs.progressBar.clientWidth / 2 + "px";
-      }
+    async calcMoveX() {
+      let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration);
+      this.$refs.progressCurrent.style.width = MoveX + "px";
+      this.$refs.progressBar.style.left = MoveX - this.$refs.progressBar.clientWidth / 2 + "px";
     },
     checkAudioEffectNull() {
       return this.audio.duration === 0 || Number.isNaN(this.audio.duration);
@@ -526,16 +527,9 @@ const _sfc_main = {
           return false;
         }
         if (time >= this.audio.duration) {
-          if (time > this.audio.duration) {
-            Message.warning(this.crossTimeTip);
-            this.paused = true;
-            this.betweenPlaying = false;
-          } else {
-            this.audio.currentTime = this.audio.duration;
-            this.currentTime = timeFormat(this.audio.currentTime);
-            this.calcMoveX();
-            this.playAudio();
-          }
+          this.audio.currentTime = this.audio.duration;
+          this.currentTime = timeFormat(this.audio.currentTime);
+          this.calcMoveX();
           return false;
         } else if (time >= 0 && time < this.audio.duration) {
           this.audio.currentTime = time;
@@ -603,7 +597,61 @@ var _sfc_render = function render() {
       "canplay": _vm.getDuration,
       "error": _vm.loadError,
       "timeupdate": _vm.updateTime,
-      "ended": _vm.handleAudioEnded
+      "ended": _vm.handleAudioEnded,
+      "abort": function($event) {
+        return _vm.$emit("abort", $event);
+      },
+      "canplaythrough": function($event) {
+        return _vm.$emit("canplaythrough", $event);
+      },
+      "durationchange": function($event) {
+        return _vm.$emit("durationchange", $event);
+      },
+      "emptied": function($event) {
+        return _vm.$emit("emptied", $event);
+      },
+      "loadeddata": function($event) {
+        return _vm.$emit("loadeddata", $event);
+      },
+      "loadedmetadata": function($event) {
+        return _vm.$emit("loadedmetadata", $event);
+      },
+      "loadstart": function($event) {
+        return _vm.$emit("loadstart", $event);
+      },
+      "pause": function($event) {
+        return _vm.$emit("pause", $event);
+      },
+      "play": function($event) {
+        return _vm.$emit("play", $event);
+      },
+      "playing": function($event) {
+        return _vm.$emit("playing", $event);
+      },
+      "progress": function($event) {
+        return _vm.$emit("progress", $event);
+      },
+      "ratechange": function($event) {
+        return _vm.$emit("ratechange", $event);
+      },
+      "seeked": function($event) {
+        return _vm.$emit("seeked", $event);
+      },
+      "seeking": function($event) {
+        return _vm.$emit("seeking", $event);
+      },
+      "stalled": function($event) {
+        return _vm.$emit("stalled", $event);
+      },
+      "suspend": function($event) {
+        return _vm.$emit("suspend", $event);
+      },
+      "volumechange": function($event) {
+        return _vm.$emit("volumechange", $event);
+      },
+      "waiting": function($event) {
+        return _vm.$emit("waiting", $event);
+      }
     }
   }), _vm.showJumpTime ? _vm._t("jump", function() {
     return [_c("div", {

package/package/nf-audio.vue

@@ -14,6 +14,24 @@
            @error="loadError"
            @timeupdate="updateTime"
            @ended="handleAudioEnded"
+           @abort="$emit('abort', $event)"
+           @canplaythrough="$emit('canplaythrough', $event)"
+           @durationchange ="$emit('durationchange', $event)"
+           @emptied="$emit('emptied', $event)"
+           @loadeddata="$emit('loadeddata', $event)"
+           @loadedmetadata ="$emit('loadedmetadata', $event)"
+           @loadstart ="$emit('loadstart', $event)"
+           @pause="$emit('pause', $event)"
+           @play="$emit('play', $event)"
+           @playing="$emit('playing', $event)"
+           @progress="$emit('progress', $event)"
+           @ratechange="$emit('ratechange', $event)"
+           @seeked="$emit('seeked', $event)"
+           @seeking="$emit('seeking', $event)"
+           @stalled="$emit('stalled', $event)"
+           @suspend="$emit('suspend', $event)"
+           @volumechange="$emit('volumechange', $event)"
+           @waiting="$emit('waiting', $event)"
     />
 
     <!--    跳帧 -->
@@ -515,13 +533,15 @@ export default {
       this.$emit('error', e)
     },
     //视频在可以播放时触发
-    getDuration() {
+    getDuration(e) {
       this.totalTime = timeFormat(this.audio.duration)
       this.audio.volume = this.volume
       this.$emit('canPlay', this.totalTime)
+      this.$emit('canplay', e)
     },
     //进度条发生变化时触发
-    updateTime() {
+    updateTime(e) {
+      this.$emit('updateTime', e)
       if (!this.$refs.progressContainer) return
       // 设置当前时间
       this.currentTime = timeFormat(this.audio.currentTime)
@@ -556,7 +576,8 @@ export default {
         this.jumpToTime(this.betweenStart)
       }
     },
-    handleAudioEnded() {
+    handleAudioEnded(e) {
+      this.$emit('ended', e)
       this.$refs.progressCurrent.style.width = this.$refs.progressContainer.clientWidth + 'px'
       this.$refs.progressBar.style.left = this.$refs.progressContainer.clientWidth - (this.$refs.progressBar.clientWidth / 2) + 'px'
       this.pause()
@@ -682,14 +703,12 @@ export default {
     openWindow() {
       window.open(this.src)
     },
-    calcMoveX() {
-      if (!this.audio.paused) {
-        // 设置当前时间
-        let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration)
-        //播放时更新距离
-        this.$refs.progressCurrent.style.width = MoveX + 'px'
-        this.$refs.progressBar.style.left = MoveX - (this.$refs.progressBar.clientWidth / 2) + 'px'
-      }
+    async calcMoveX() {
+      // 设置当前时间
+      let MoveX = this.$refs.progressContainer.clientWidth * (this.audio.currentTime / this.audio.duration)
+      //播放时更新距离
+      this.$refs.progressCurrent.style.width = MoveX + 'px'
+      this.$refs.progressBar.style.left = MoveX - (this.$refs.progressBar.clientWidth / 2) + 'px'
     },
     checkAudioEffectNull() {
       return this.audio.duration === 0 || Number.isNaN(this.audio.duration)
@@ -704,16 +723,16 @@ export default {
           return false
         }
         if (time >= this.audio.duration) {
-          if (time > this.audio.duration) {
-            Message.warning(this.crossTimeTip)
-            this.paused = true
-            this.betweenPlaying = false
-          } else {
-            this.audio.currentTime = this.audio.duration
-            this.currentTime = timeFormat(this.audio.currentTime)
-            this.calcMoveX()
-            this.playAudio()
-          }
+          // if (time > this.audio.duration) {
+          //   Message.warning(this.crossTimeTip)
+          //   console.error(this.crossTimeTip)
+          //   this.paused = true
+          //   this.betweenPlaying = false
+          // } else {
+          this.audio.currentTime = this.audio.duration
+          this.currentTime = timeFormat(this.audio.currentTime)
+          this.calcMoveX()
+          // }
           return false
         } else if (time >= 0 && time < this.audio.duration) {
           this.audio.currentTime = time

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@94ai/nf-audio",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "> TODO: description",
   "keywords": [],
   "author": "liuxiangxiang <liuxiangxiang@94ai.com>",
@@ -14,8 +14,8 @@
     "url": "http://94ai.gitlab.com/zoujiahe/common-ui.git"
   },
   "dependencies": {
-    "@94ai/nf-message": "^4.0.1",
-    "@94ai/nf-theme-chalk": "^4.0.1",
+    "@94ai/nf-message": "^4.0.2",
+    "@94ai/nf-theme-chalk": "^4.0.2",
     "vue-demi": "^0.14.5"
   },
   "peerDependenciesMeta": {
@@ -31,5 +31,5 @@
   "types": "lib/index.d.ts",
   "main": "lib/nf-audio.cjs.js",
   "module": "lib/nf-audio.esm-bundler.js",
-  "gitHead": "08e918fa49ed52ea117a59b3d5b760bbcd42560d"
+  "gitHead": "608b84fe8c8fdce3264d69acaed34642a0c9d3d1"
 }