zydx-plus 1.35.543 → 1.35.544

package/package.json

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

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

@@ -59,7 +59,7 @@
                 <span :dir="item.dir" :style="styleText(item,styles)" v-for="(item,index) in items">{{ item.str }}</span>
               </div>
               <div class="annotationLayer" ref="annotationLayer">
-                <section tabindex="1000" :style="styleAnnotation(item)" v-for="(item,index) in annotations">
+                <section tabindex="1000" @click="annotationTap(item)" :style="styleAnnotation(item)" v-for="(item,index) in annotations">
                   <a :href="item.url" target="_blank"></a>
                 </section>
               </div>
@@ -195,7 +195,7 @@ export default {
       viewWidth: 0,
       viewHeight: 0,
       annotations: [],
-      inits: true
+      annotationsInit: []
     }
   },
   props: {
@@ -252,11 +252,10 @@ 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)
+          this.annotations = val.concat(this.annotationsInit)
         }
       },
       deep: true,
@@ -336,7 +335,6 @@ export default {
   },
   emits: ['flip','annotationTap'],
   mounted() {
-    this.inits = true
     if (!this.doublePage) {
       this.id = 'canvas-wrap' + this.generateUniqueKey()
     }
@@ -354,6 +352,7 @@ export default {
   },
   methods: {
     annotationTap(v) {
+      if(v.url) return
       this.$emit('annotationTap',v)
     },
     // 添加标注
@@ -546,6 +545,7 @@ export default {
       } else {
         this.points.pop()
       }
+      this.$emit('drawEnd', this.points,'backward')
       this.clearRect()
     },
     // 鼠标
@@ -858,6 +858,8 @@ export default {
           i--
         }
       }
+      console.log('delChart')
+      this.$emit('drawEnd', this.points,'del')
       this.clearRect()
     },
     // 绘制
@@ -907,7 +909,7 @@ export default {
     turnText() {
       if (this.textStart) return
       if (this.state === 'text') {
-        const text = this.$refs.textInput.innerText
+        const text = this.$refs.textInput.innerText || '输入文字'
         this.contenteditable = false
         this.state = null
         if (text === '') {
@@ -993,6 +995,7 @@ export default {
         color: obj.color,
         size: obj.size,
       })
+      this.$emit('drawEnd', this.points)
     },
     // 画箭头
     arrow(obj, type) {
@@ -1038,6 +1041,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画直线
@@ -1069,6 +1073,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画圆
@@ -1100,6 +1105,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画矩形
@@ -1130,6 +1136,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画线
@@ -1150,6 +1157,9 @@ export default {
       this.ctx.stroke()
       this.ctx.closePath()
       this.points.push(obj)
+      if(obj.start === 'end'){
+        this.$emit('drawEnd', this.points)
+      }
     },
     clearRect(v) {
       const width = this.canvasStyle.widthCanvas
@@ -1258,24 +1268,31 @@ export default {
       for (let i = 0; i < this.points.length; i++) {
         if (this.points[i].index === this.pageIndex) {
           if (this.points[i].type === 'line') {
+            console.log('type1',this.points[i].type)
             this.lineProcessing(this.points[i], this.points[i + 1], {x: 0, y: 0})
           }
           if (this.points[i].type === 'rectangle') {
+            console.log('type2',this.points[i].type)
             this.rectangleProcessing(this.points[i], {x: 0, y: 0})
           }
           if (this.points[i].type === 'circular') {
+            console.log('type3',this.points[i].type)
             this.circularProcessing(this.points[i], {x: 0, y: 0})
           }
           if (this.points[i].type === 'straight') {
+            console.log('type4',this.points[i].type)
             this.straightProcessing(this.points[i], {x: 0, y: 0})
           }
           if (this.points[i].type === 'arrow') {
+            console.log('type5',this.points[i].type)
             this.arrowProcessing(this.points[i], {x: 0, y: 0})
           }
           if (this.points[i].type === 'text') {
+            console.log('type6',this.points[i].type)
             this.textProcessing(this.points[i], {x: 0, y: 0})
           }
           if (this.points[i].type === 'sign') {
+            console.log('type7',this.points[i].type)
             this.signProcessing(this.points[i], {x: 0, y: 0})
           }
         }
@@ -1404,15 +1421,8 @@ export default {
               that.styles = res.styles
             })
             page.getAnnotations().then((res) => {
-              console.log(that.inits)
-              if(that.inits) {
-                that.annotations = res.concat(that.annotationsData)
-                setTimeout(() => {
-                  that.inits = false
-                },1000)
-              }else {
-                that.annotations = res
-              }
+              that.annotationsInit = res
+              that.annotations = res.concat(that.annotationsData)
             })
             that.loading = false
             if (that.oneIndex === 'right') {
@@ -1488,14 +1498,8 @@ export default {
                 item.styles = res.styles
               })
               page.getAnnotations().then((res) => {
-                if(that.inits) {
-                  item.annotations = res.concat(that.annotationsData)
-                  setTimeout(() => {
-                    that.inits = false
-                  },1000)
-                }else {
-                  item.annotations = res
-                }
+                that.annotationsInit = res
+                that.annotations = res.concat(that.annotationsData)
               })
               that.loading = false
               if (that.oneIndex === 'right') {

package/src/components/sketchpad/src/sketchpad.vue

@@ -6,9 +6,10 @@
 <script>
 import {createElement} from 'react'
 import {createRoot} from 'react-dom/client'
-import {AssetRecordType,createShapeId, Tldraw, FileHelpers} from 'tldraw'
+import {AssetRecordType,createShapeId, Tldraw} from 'tldraw'
 import 'tldraw/tldraw.css'
-import * as buffer from "buffer"; //引入buffer
+import * as buffer from "buffer";
+import {debounce} from "../../utils"; //引入buffer
 
 if (typeof window.Buffer === "undefined") { // 判断当前环境是否有Buffer对象
   window.Buffer = buffer.Buffer; // Buffer对象不存在则创建导入的buffer
@@ -153,7 +154,14 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
-      // console.log('editorAPP',editorAPP);
+      editorAPP.sideEffects.registerAfterChangeHandler('shape', debounce((next)=> {
+        // there can only be one red shape at a time:
+        this.$emit('shapeChangeHandler', next);
+      },300))
+      editorAPP.sideEffects.registerAfterDeleteHandler('shape', (shape) => {
+        // if the last shape in a frame is deleted, delete the frame too:
+        this.$emit('shapeDeleteHandler', shape);
+      })
       editorAPP.setCameraOptions({ isLocked: this.cameraIsLocked })
       editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
       if (this.top) {
@@ -174,12 +182,13 @@ export default {
     // 清空
     clear() {
       // editorAPP.store.loadSnapshot(clearJson)
-      let graphicIds = []
-      for(let key in editorAPP.store.query.atoms.current) {
-        if(key.split(':')[0]==='shape') {
-          graphicIds.push(key)
-        }
-      }
+      editorAPP.selectAll()
+      let graphicIds = editorAPP.getSelectedShapeIds()
+      // for(let key in editorAPP.store.query.atoms.current) {
+      //   if(key.split(':')[0]==='shape') {
+      //     graphicIds.push(key)
+      //   }
+      // }
       editorAPP.deleteShapes(graphicIds)
     },
     // 添加快照

package/src/components/utils/index.js

@@ -10,4 +10,16 @@ export function debounce(fn, delay = debounceTimer) {
             fn.apply(that, args)
         }, delay)
     }
+}
+export function throttle(fn, limit=debounceTimer) {
+    let inThrottle;
+    return function() {
+        const args = arguments;
+        const context = this;
+        if (!inThrottle) {
+            fn.apply(context, args);
+            inThrottle = true;
+            setTimeout(() => { inThrottle = false; }, limit);
+        }
+    };
 }

package/src/index.js

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