zydx-plus 1.35.542 → 1.35.543

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.542",
+  "version": "1.35.543",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/editor2/src/editor.vue

@@ -1,8 +1,14 @@
 <template>
   <div :style="heightStyle" class="edit">
     <div :class="{'ed-head': !titleVertical, 'ed-head-vertical': titleVertical}">
-      <div v-if="titleShow && titleVertical" :style="titleStyle" v-html="title"></div>
-      <div class="ed-title" v-if="titleShow && !titleVertical" :style="titleStyle" v-html="title"></div>
+      <div v-if="titleShow && titleVertical">
+        <div :style="titleStyle" v-html="title"></div>
+        <slot name='titleSuffix'></slot>
+      </div>
+      <div class="ed-title" v-if="titleShow && !titleVertical">
+        <span :style="titleStyle" v-html="title"></span>
+        <slot name='titleSuffix'></slot>
+      </div>
       <div class="ed-but" v-if="readOnly">
         <div class="ed-head-but" v-for="(item,index) in toolbar">
           <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)"
@@ -20,6 +26,7 @@
                 :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
         </button>
         <button v-if='isShowAiTool' class="buts" @click="showAi">AI助手</button>
+        <slot name='toolBtn'></slot>
       </div>
     </div>
     <zydx-chat v-model='isShowAi'></zydx-chat>
@@ -520,6 +527,10 @@ export default {
       const text2 = text.replace(/[\r\n]/g, '').replace(/\s*/g, '')
       this.editor.chain().focus().insertContentAt(this.selection(), text2).run()
     },
+    addContent(text) {
+      const text2 = text.replace(/[\r\n]/g, '').replace(/\s*/g, '')
+      this.editor.chain().focus().insertContentAt(this.selection(), text2).run()
+    },
     to16kHz(audioData, sampleRate = 44100) {
       const data = new Float32Array(audioData);
       const fitCount = Math.round(data.length * (16000 / sampleRate));

package/src/components/flip/src/flip.vue

@@ -194,7 +194,8 @@ export default {
       doc: null,
       viewWidth: 0,
       viewHeight: 0,
-      annotations: []
+      annotations: [],
+      inits: true
     }
   },
   props: {
@@ -249,6 +250,18 @@ export default {
     }
   },
   watch: {
+    annotationsData: {
+      handler: function (val) {
+        console.log(val)
+        if(typeof val === Object) {
+          this.annotations.push(val)
+        }else {
+          this.annotations = val.concat(this.annotations)
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     pointsData: {
       handler: function (val) {
         if (!val) return
@@ -323,6 +336,7 @@ export default {
   },
   emits: ['flip','annotationTap'],
   mounted() {
+    this.inits = true
     if (!this.doublePage) {
       this.id = 'canvas-wrap' + this.generateUniqueKey()
     }
@@ -348,7 +362,7 @@ export default {
       let timestamp = 'flip' + Math.random().toString(36).substr(2)
       this.replaceSelectedStrByEle(timestamp)
       const elements = document.querySelectorAll(`.${timestamp}`)[0];
-      if(!elements) return
+      if(!elements) return next(false)
       const wid = this.$refs.wrap.offsetWidth - 10
       const hei = this.$refs.wrap.offsetHeight - 10
       const hei2 = elements.offsetHeight - 8
@@ -414,10 +428,10 @@ export default {
       return range
     },
     styleAnnotation(v) {
-      const x1 = (v.rect[0] * this.scales / this.viewport.width) * 100
-      const y1 = ((this.viewport.height - (v.rect[1] * this.scales)) / this.viewport.height) * 100
-      const x2 = (((v.rect[2] - v.rect[0]) * this.scales) / this.viewport.width) * 100
-      const y2 = (((v.rect[3] - v.rect[1]) * this.scales) / this.viewport.height) * 100
+      const x1 = (v.rect[0] * this.scales / this.viewport?.width) * 100
+      const y1 = ((this.viewport?.height - (v.rect[1] * this.scales)) / this.viewport?.height) * 100
+      const x2 = (((v.rect[2] - v.rect[0]) * this.scales) / this.viewport?.width) * 100
+      const y2 = (((v.rect[3] - v.rect[1]) * this.scales) / this.viewport?.height) * 100
       return {
         'left': x1 - 0.2 + '%',
         'top': (y1 - y2) - 0.2 + '%',
@@ -1362,7 +1376,7 @@ export default {
             let viewport = page.getViewport({scale: that.scales})
             that.viewport = viewport
             const sc = (viewport.width / viewport.height).toFixed(2)
-            const wid = that.$refs.wrap.offsetWidth - 10
+            const wid = that.$refs.wrap?.offsetWidth - 10
             const hei = wid / sc
             canvas.width = wid * that.sratio
             canvas.height = hei * that.sratio
@@ -1390,7 +1404,15 @@ export default {
               that.styles = res.styles
             })
             page.getAnnotations().then((res) => {
-              that.annotations = res.concat(that.annotationsData)
+              console.log(that.inits)
+              if(that.inits) {
+                that.annotations = res.concat(that.annotationsData)
+                setTimeout(() => {
+                  that.inits = false
+                },1000)
+              }else {
+                that.annotations = res
+              }
             })
             that.loading = false
             if (that.oneIndex === 'right') {
@@ -1466,7 +1488,14 @@ export default {
                 item.styles = res.styles
               })
               page.getAnnotations().then((res) => {
-                item.annotations = res
+                if(that.inits) {
+                  item.annotations = res.concat(that.annotationsData)
+                  setTimeout(() => {
+                    that.inits = false
+                  },1000)
+                }else {
+                  item.annotations = res
+                }
               })
               that.loading = false
               if (that.oneIndex === 'right') {

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.542',
+    version: '1.35.543',
     install,
     Calendar,
     Message,