zydx-plus 1.35.546 → 1.35.548

package/package.json

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

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

@@ -39,8 +39,8 @@
                       <div class="magnifier-head">
                         <div class="magnifier-title">拓展阅读</div>
                         <div class="magnifier-icon">
-                          <img @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
-                          <img @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
+                          <img v-if="rightClick&&!readOnly" @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
+                          <img v-if="!readOnly" @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
                           <img @click.stop="extendRightDel" src="../img/guanbi.svg" alt="" />
                         </div>
                       </div>
@@ -93,8 +93,8 @@
                       <div class="magnifier-head">
                         <div class="magnifier-title">拓展阅读</div>
                         <div class="magnifier-icon">
-                          <img @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
-                          <img @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
+                          <img v-if="rightClick&&!readOnly" @click.stop="annotationTap(item,'add')" src="../img/qubiezhen.svg" alt="" />
+                          <img v-if="!readOnly" @click.stop="annEmpty(item.list)" src="../img/shanchu.svg" alt="" />
                           <img @click.stop="extendRightDel" src="../img/guanbi.svg" alt="" />
                         </div>
                       </div>
@@ -302,6 +302,10 @@ export default {
     rightClick: {
       type: Boolean,
       default: true
+    },
+    readOnly: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {
@@ -333,7 +337,9 @@ export default {
       handler: function (val) {
         if (!val) return
         this.points = val
+        this.processing()
       },
+      deep:true,
       immediate: true
     },
     isDoublePage: {
@@ -473,6 +479,7 @@ export default {
     // 右键菜单
     rightMenu(e) {
       e.preventDefault()
+      if(this.readOnly) return;
       if(!this.rightClick) return;
       if(this.doublePage) return;
       if(e.target.nodeName === 'SPAN') {
@@ -671,6 +678,7 @@ export default {
       this.setShow = false
       this.points = []
       this.clearRect(true)
+      this.$emit('drawEnd', this.points,'empty')
     },
     preserve() {
       this.setShow = false
@@ -691,6 +699,7 @@ export default {
       } else {
         this.points.pop()
       }
+      this.$emit('drawEnd', this.points,'backward')
       this.clearRect()
     },
     // 鼠标
@@ -1003,6 +1012,7 @@ export default {
           i--
         }
       }
+      this.$emit('drawEnd', this.points,'del')
       this.clearRect()
     },
     // 绘制
@@ -1138,6 +1148,7 @@ export default {
         color: obj.color,
         size: obj.size,
       })
+      this.$emit('drawEnd', this.points)
     },
     // 画箭头
     arrow(obj, type) {
@@ -1183,6 +1194,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画直线
@@ -1214,6 +1226,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画圆
@@ -1245,6 +1258,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画矩形
@@ -1275,6 +1289,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画线
@@ -1295,6 +1310,7 @@ export default {
       this.ctx.stroke()
       this.ctx.closePath()
       this.points.push(obj)
+      this.$emit('drawEnd', obj,'line')
     },
     clearRect(v) {
       const width = this.canvasStyle.widthCanvas
@@ -1307,7 +1323,7 @@ export default {
       this.ctx.beginPath()
       this.ctx.moveTo(data.x * this.scales / data.scale + v.x, data.y * this.scales / data.scale + v.y)
       if (data.start !== 'end') {
-        this.ctx.lineTo(data2.x * this.scales / data2.scale + v.x, data2.y * this.scales / data2.scale + v.y)
+        this.ctx.lineTo(data2?.x * this.scales / data2?.scale + v.x, data2?.y * this.scales / data2?.scale + v.y)
       }
       this.ctx.strokeStyle = data.color
       this.ctx.lineCap = 'round'
@@ -1427,6 +1443,7 @@ export default {
       }
     },
     flipLeft(e, v) {
+      this.extendRightDel()
       if (e > this.pdfPages) {
         this.pageIndex = this.pdfPages
         return
@@ -1447,6 +1464,7 @@ export default {
       }
     },
     flipRight(e, v) {
+      this.extendRightDel()
       if (e < 1) {
         this.pageIndex = 1
         return

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

@@ -154,12 +154,15 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
-      editorAPP.sideEffects.registerAfterChangeHandler('shape', debounce((next)=> {
+      editorAPP.sideEffects.registerAfterChangeHandler('shape', (prev, next)=> {
         // there can only be one red shape at a time:
-        this.$emit('shapeChangeHandler', next);
-      },300))
+        console.log('shapeChangeHandler prev',prev)
+        // console.log('shapeChangeHandler next',next)
+        this.$emit('shapeChangeHandler', prev);
+      })
       editorAPP.sideEffects.registerAfterDeleteHandler('shape', (shape) => {
         // if the last shape in a frame is deleted, delete the frame too:
+        console.log('shapeDeleteHandler',shape)
         this.$emit('shapeDeleteHandler', shape);
       })
       editorAPP.setCameraOptions({ isLocked: this.cameraIsLocked })

package/src/index.js

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