gemercheung 2 år sedan
förälder
incheckning
c6471e0857

+ 1 - 1
packages/qjkankan-editor/src/lang/_en.json

@@ -597,7 +597,7 @@
     "audio_fail": "Format error. Support MP3 files: ≤ 20MB",
     "upload_material": "Upload materials",
     "new_folder": "新建文件夹",
-    "new_folder_placeholder": "请输入文件夹名,限15字",
+    "new_folder_placeholder": "请输入文件夹名,限50字",
     "folder_name_already_used": "文件夹已存在",
     "move_folder": "移动",
     "move_folder_to": "移动到",

+ 7 - 4
packages/qjkankan-editor/src/views/hotspot/hotspotIconType/serial_frame.vue

@@ -109,13 +109,13 @@ export default {
   watch: {
     "hotspot.serialFrameInfo.img": {
       handler(vNew) {
-        console.error('vNew',vNew);   
+        console.error("vNew", vNew);
         if (vNew && vNew.length > 0) {
           this.calcFrameData();
         }
       },
       immediate: true,
-      deep:true
+      deep: true,
     },
     frameHeight: {
       handler() {
@@ -159,7 +159,7 @@ export default {
       }, 200);
     },
     calcFrameData() {
-      console.log('calcFrameData');
+      console.log("calcFrameData");
       setTimeout(() => {
         try {
           this.frameHeight = this.$refs["serial-frame-preview"].naturalHeight;
@@ -174,7 +174,10 @@ export default {
             }
 
             console.log("frameNumber", Math.ceil(frameNumber));
-            this.hotspot.serialFrameInfo.duration = 1;
+            if (!this.hotspot.serialFrameInfo.duration) {
+              this.hotspot.serialFrameInfo.duration = 1;
+            }
+
             this.hotspot.serialFrameInfo.frameWidth = this.frameWidth;
           }
         } catch (e) {