@94ai/nf-audio 3.3.73 → 3.3.75

package/lib/nf-audio.cjs.js

@@ -43,7 +43,7 @@ const _sfc_main = {
     },
     crossTimeTip: {
       type: String,
-      default: "开始时间不能大于总时长"
+      default: "定位播放时间点不能大于音频总时长"
     },
     unloadTip: {
       type: String,
@@ -95,11 +95,11 @@ const _sfc_main = {
     },
     // 默认速度
     initSpeedValue: {
-      type: Number,
+      type: Number | String,
       default: 1
     },
     initVolumnValue: {
-      type: Number,
+      type: Number | String,
       default: 0.8
     },
     betweenStart: {
@@ -182,9 +182,9 @@ const _sfc_main = {
     }
   },
   mounted() {
-    this.volume = this.initVolumnValue;
-    this.volumeValue = this.initVolumnValue * 100;
-    this.syncSpeed();
+    this.volume = Number(this.initVolumnValue);
+    this.volumeValue = this.volume * 100;
+    this.speed = Number(this.initSpeedValue);
   },
   beforeDestroy() {
     var _a, _b, _c, _d;
@@ -213,11 +213,6 @@ const _sfc_main = {
       this.betweenPlaying = false;
       this.jumpToTime(time);
     },
-    syncSpeed() {
-      if (this.speed != this.initSpeedValue) {
-        this.speed = this.initSpeedValue;
-      }
-    },
     docClick(e) {
       if (this.$refs.popperRef.contains(e.target) || this.$refs.reference.contains(e.target)) {
         return;
@@ -478,10 +473,13 @@ const _sfc_main = {
     changeSpeed(speed) {
       if (!this.disabled) {
         if (this.audio) {
-          this.audio.playbackRate = speed;
+          const preSpeed = this.speed;
+          this.speed = Number(speed);
+          if (this.speed !== preSpeed) {
+            this.audio.playbackRate = this.speed;
+            this.$emit("speedChange", this.speed);
+          }
         }
-        this.speed = speed;
-        this.$emit("speedChange", speed);
       }
     },
     downRecord(e) {
@@ -530,12 +528,15 @@ const _sfc_main = {
           return false;
         }
         if (time >= this.audio.duration) {
-          this.audio.currentTime = this.audio.duration;
-          this.currentTime = timeFormat(this.audio.currentTime);
-          this.calcMoveX();
-          this.playAudio();
           if (time > this.audio.duration) {
-            console.error(this.crossTimeTip);
+            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();
           }
           return false;
         } else if (time >= 0 && time < this.audio.duration) {
@@ -555,16 +556,14 @@ const _sfc_main = {
   },
   watch: {
     initSpeedValue: {
-      handle() {
-        if (this.speed != this.initSpeedValue) {
-          this.speed = this.initSpeedValue;
-        }
+      handler() {
+        this.speed = Number(this.initSpeedValue);
       }
     },
     initVolumnValue: {
-      handle() {
-        this.volume = this.initVolumnValue;
-        this.volumeValue = this.initVolumnValue * 100;
+      handler() {
+        this.volume = Number(this.initVolumnValue);
+        this.volumeValue = this.volume * 100;
       }
     },
     volumeVisible(val) {
@@ -818,7 +817,7 @@ var _sfc_render = function render() {
           return _c("div", {
             key: index,
             staticClass: "nf-audio-btn-item",
-            class: _vm.speed == item ? "active" : "",
+            class: _vm.speed == Number(item) ? "active" : "",
             on: {
               "click": function($event) {
                 return _vm.changeSpeed(item);

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

@@ -41,7 +41,7 @@ const _sfc_main = {
     },
     crossTimeTip: {
       type: String,
-      default: "开始时间不能大于总时长"
+      default: "定位播放时间点不能大于音频总时长"
     },
     unloadTip: {
       type: String,
@@ -93,11 +93,11 @@ const _sfc_main = {
     },
     // 默认速度
     initSpeedValue: {
-      type: Number,
+      type: Number | String,
       default: 1
     },
     initVolumnValue: {
-      type: Number,
+      type: Number | String,
       default: 0.8
     },
     betweenStart: {
@@ -180,9 +180,9 @@ const _sfc_main = {
     }
   },
   mounted() {
-    this.volume = this.initVolumnValue;
-    this.volumeValue = this.initVolumnValue * 100;
-    this.syncSpeed();
+    this.volume = Number(this.initVolumnValue);
+    this.volumeValue = this.volume * 100;
+    this.speed = Number(this.initSpeedValue);
   },
   beforeDestroy() {
     var _a, _b, _c, _d;
@@ -211,11 +211,6 @@ const _sfc_main = {
       this.betweenPlaying = false;
       this.jumpToTime(time);
     },
-    syncSpeed() {
-      if (this.speed != this.initSpeedValue) {
-        this.speed = this.initSpeedValue;
-      }
-    },
     docClick(e) {
       if (this.$refs.popperRef.contains(e.target) || this.$refs.reference.contains(e.target)) {
         return;
@@ -476,10 +471,13 @@ const _sfc_main = {
     changeSpeed(speed) {
       if (!this.disabled) {
         if (this.audio) {
-          this.audio.playbackRate = speed;
+          const preSpeed = this.speed;
+          this.speed = Number(speed);
+          if (this.speed !== preSpeed) {
+            this.audio.playbackRate = this.speed;
+            this.$emit("speedChange", this.speed);
+          }
         }
-        this.speed = speed;
-        this.$emit("speedChange", speed);
       }
     },
     downRecord(e) {
@@ -528,12 +526,15 @@ const _sfc_main = {
           return false;
         }
         if (time >= this.audio.duration) {
-          this.audio.currentTime = this.audio.duration;
-          this.currentTime = timeFormat(this.audio.currentTime);
-          this.calcMoveX();
-          this.playAudio();
           if (time > this.audio.duration) {
-            console.error(this.crossTimeTip);
+            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();
           }
           return false;
         } else if (time >= 0 && time < this.audio.duration) {
@@ -553,16 +554,14 @@ const _sfc_main = {
   },
   watch: {
     initSpeedValue: {
-      handle() {
-        if (this.speed != this.initSpeedValue) {
-          this.speed = this.initSpeedValue;
-        }
+      handler() {
+        this.speed = Number(this.initSpeedValue);
       }
     },
     initVolumnValue: {
-      handle() {
-        this.volume = this.initVolumnValue;
-        this.volumeValue = this.initVolumnValue * 100;
+      handler() {
+        this.volume = Number(this.initVolumnValue);
+        this.volumeValue = this.volume * 100;
       }
     },
     volumeVisible(val) {
@@ -816,7 +815,7 @@ var _sfc_render = function render() {
           return _c("div", {
             key: index,
             staticClass: "nf-audio-btn-item",
-            class: _vm.speed == item ? "active" : "",
+            class: _vm.speed == Number(item) ? "active" : "",
             on: {
               "click": function($event) {
                 return _vm.changeSpeed(item);

package/package/nf-audio.vue

@@ -138,7 +138,7 @@
                       <div v-for="(item,index) in multipleArray"
                            :key="index"
                            class="nf-audio-btn-item"
-                           :class="speed==item?'active':''"
+                           :class="speed==Number(item)?'active':''"
                            @click="changeSpeed(item)"
                       >
                         {{ speedPreDesc }}{{ item }}
@@ -203,7 +203,7 @@ export default {
     },
     crossTimeTip: {
       type: String,
-      default: '开始时间不能大于总时长'
+      default: '定位播放时间点不能大于音频总时长'
     },
     unloadTip: {
       type: String,
@@ -255,11 +255,11 @@ export default {
     },
     // 默认速度
     initSpeedValue: {
-      type: Number,
+      type: Number | String,
       default: 1.0
     },
     initVolumnValue: {
-      type: Number,
+      type: Number | String,
       default: 0.8
     },
     betweenStart: {
@@ -346,9 +346,9 @@ export default {
     }
   },
   mounted() {
-    this.volume = this.initVolumnValue
-    this.volumeValue = this.initVolumnValue * 100
-    this.syncSpeed()
+    this.volume = Number(this.initVolumnValue)
+    this.volumeValue = this.volume * 100
+    this.speed = Number(this.initSpeedValue)
   },
   beforeDestroy() {
     this.betweenPlaying = false
@@ -379,11 +379,6 @@ export default {
       this.betweenPlaying = false
       this.jumpToTime(time)
     },
-    syncSpeed() {
-      if (this.speed != this.initSpeedValue) {
-        this.speed = this.initSpeedValue
-      }
-    },
     docClick(e) {
       //如果点击的是音量 或者 是音量面板 则 不隐藏音量面板
       if (this.$refs.popperRef.contains(e.target) || this.$refs.reference.contains(e.target)) {
@@ -652,10 +647,13 @@ export default {
     changeSpeed(speed) {
       if (!this.disabled) {
         if (this.audio) {
-          this.audio.playbackRate = speed
+          const preSpeed = this.speed
+          this.speed = Number(speed)
+          if (this.speed !== preSpeed) {
+            this.audio.playbackRate = this.speed
+            this.$emit('speedChange', this.speed)
+          }
         }
-        this.speed = speed
-        this.$emit('speedChange', speed)
       }
     },
     downRecord(e) {
@@ -706,12 +704,15 @@ export default {
           return false
         }
         if (time >= this.audio.duration) {
-          this.audio.currentTime = this.audio.duration
-          this.currentTime = timeFormat(this.audio.currentTime)
-          this.calcMoveX()
-          this.playAudio()
           if (time > this.audio.duration) {
-            console.error(this.crossTimeTip)
+            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()
           }
           return false
         } else if (time >= 0 && time < this.audio.duration) {
@@ -731,16 +732,14 @@ export default {
   },
   watch: {
     initSpeedValue: {
-      handle() {
-        if (this.speed != this.initSpeedValue) {
-          this.speed = this.initSpeedValue
-        }
+      handler() {
+        this.speed = Number(this.initSpeedValue)
       }
     },
     initVolumnValue: {
-      handle() {
-        this.volume = this.initVolumnValue
-        this.volumeValue = this.initVolumnValue * 100
+      handler() {
+        this.volume = Number(this.initVolumnValue)
+        this.volumeValue = this.volume * 100
       }
     },
     volumeVisible(val) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@94ai/nf-audio",
-  "version": "3.3.73",
+  "version": "3.3.75",
   "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": "^3.3.73",
-    "@94ai/nf-theme-chalk": "^3.3.73",
+    "@94ai/nf-message": "^3.3.75",
+    "@94ai/nf-theme-chalk": "^3.3.75",
     "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": "7e95b41555babc235857fa1e7a5fa6c64da80bbd"
+  "gitHead": "3605bf1ea3b1c111a72d475fcf011bdf609c6f27"
 }