zydx-plus 1.35.547 → 1.35.549

package/package.json

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

package/src/components/dragPopup/src/dragPopup.vue

@@ -412,6 +412,12 @@ export default {
         this.y = window.innerHeight / 2 - this.height / 2;
         this.footDownOffset = this.height;
         this.footRightOffset = this.width;
+        this.$emit('updateDrag', {
+          width: this.footRightOffset,
+          height: this.footDownOffset - ((this.dragTextShow)?60:30),
+          left: this.x,
+          top: this.y
+        })
       }else {
         this.fullScreen()
         setTimeout(() => {
@@ -419,14 +425,14 @@ export default {
           this.y = 0;
           this.footDownOffset = window.outerHeight + 20;
           this.footRightOffset = window.outerWidth + 20;
+          this.$emit('updateDrag', {
+            width: this.footRightOffset,
+            height: this.footDownOffset - ((this.dragTextShow)?60:30),
+            left: this.x,
+            top: this.y
+          })
         },100)
       }
-      this.$emit('updateDrag', {
-        width: this.footRightOffset,
-        height: this.footDownOffset - ((this.dragTextShow)?60:30),
-        left: this.x,
-        top: this.y
-      })
       this.$emit('enlarge', this.state)
     },
     minimizeTap() {

package/src/components/dragPopup2/src/dragPopup.vue

@@ -421,6 +421,12 @@ export default {
         this.y = window.innerHeight / 2 - this.height / 2;
         this.footDownOffset = this.height;
         this.footRightOffset = this.width;
+        this.$emit('updateDrag', {
+          width: this.footRightOffset,
+          height: this.footDownOffset - ((this.dragTextShow)?60:30),
+          left: this.x,
+          top: this.y
+        })
       }else {
         this.fullScreen()
         setTimeout(() => {
@@ -428,14 +434,14 @@ export default {
           this.y = 0;
           this.footDownOffset = window.outerHeight + 20;
           this.footRightOffset = window.outerWidth + 20;
+          this.$emit('updateDrag', {
+            width: this.footRightOffset,
+            height: this.footDownOffset - ((this.dragTextShow)?60:30),
+            left: this.x,
+            top: this.y
+          })
         },100)
       }
-      this.$emit('updateDrag', {
-        width: this.footRightOffset,
-        height: this.footDownOffset - ((this.dragTextShow)?60:30),
-        left: this.x,
-        top: this.y
-      })
       this.$emit('enlarge', this.state)
     },
     minimizeTap() {

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

@@ -25,9 +25,9 @@
             <div class="wrap wrap-block" :ref="`wrap-${item.id}`" v-for="(item,index) in pageInfoArr" :key="index">
               <div class="wrap-can" v-show="!loading" ref="wrapCanBox">
                 <div class="extend-right" v-if="rightMenuShow" :style="extendStyle">
-                  <div class="extend-right-cont">
+                  <div class="extend-right-cont" @click.stop="extendRight(null)">
                     <img src="../img/qubiezhen.svg" alt="">
-                    <p @click.stop="extendRight(null)">链接扩展</p>
+                    <p>链接扩展</p>
                   </div>
                 </div>
                 <div class="textLayer" ref="textLayer">
@@ -77,9 +77,9 @@
           <div class="wrap" ref="wrap" v-show="!doublePage">
             <div class="wrap-can" v-show="!loading" ref="wrapCan">
               <div class="extend-right" v-if="rightMenuShow" :style="extendStyle">
-                <div class="extend-right-cont">
+                <div class="extend-right-cont" @click.stop="extendRight(null)">
                   <img src="../img/qubiezhen.svg" alt="">
-                  <p @click.stop="extendRight(null)">链接扩展</p>
+                  <p>链接扩展</p>
                 </div>
               </div>
               <div class="textLayer" ref="textLayer">
@@ -305,7 +305,7 @@ export default {
     },
     readOnly: {
       type: Boolean,
-      default: false
+      default: true
     }
   },
   watch: {
@@ -337,7 +337,9 @@ export default {
       handler: function (val) {
         if (!val) return
         this.points = val
+        this.processing()
       },
+      deep:true,
       immediate: true
     },
     isDoublePage: {
@@ -477,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') {
@@ -675,6 +678,7 @@ export default {
       this.setShow = false
       this.points = []
       this.clearRect(true)
+      this.$emit('drawEnd', this.points,'empty')
     },
     preserve() {
       this.setShow = false
@@ -695,6 +699,7 @@ export default {
       } else {
         this.points.pop()
       }
+      this.$emit('drawEnd', this.points,'backward')
       this.clearRect()
     },
     // 鼠标
@@ -1007,6 +1012,7 @@ export default {
           i--
         }
       }
+      this.$emit('drawEnd', this.points,'del')
       this.clearRect()
     },
     // 绘制
@@ -1142,6 +1148,7 @@ export default {
         color: obj.color,
         size: obj.size,
       })
+      this.$emit('drawEnd', this.points)
     },
     // 画箭头
     arrow(obj, type) {
@@ -1187,6 +1194,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画直线
@@ -1218,6 +1226,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画圆
@@ -1249,6 +1258,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画矩形
@@ -1279,6 +1289,7 @@ export default {
           color: obj.color,
           border: obj.border,
         })
+        this.$emit('drawEnd', this.points)
       }
     },
     // 画线
@@ -1299,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
@@ -1311,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'
@@ -1431,6 +1443,7 @@ export default {
       }
     },
     flipLeft(e, v) {
+      this.extendRightDel()
       if (e > this.pdfPages) {
         this.pageIndex = this.pdfPages
         return
@@ -1451,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,10 +154,10 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
-      editorAPP.sideEffects.registerAfterChangeHandler('shape', debounce((next)=> {
+      editorAPP.sideEffects.registerAfterChangeHandler('shape', debounce((prev, next)=> {
         // there can only be one red shape at a time:
-        this.$emit('shapeChangeHandler', next);
-      },300))
+        this.$emit('shapeChangeHandler', prev);
+      },200) )
       editorAPP.sideEffects.registerAfterDeleteHandler('shape', (shape) => {
         // if the last shape in a frame is deleted, delete the frame too:
         this.$emit('shapeDeleteHandler', shape);
@@ -182,18 +182,25 @@ export default {
     // 清空
     clear() {
       // editorAPP.store.loadSnapshot(clearJson)
-      editorAPP.selectAll()
-      let graphicIds = editorAPP.getSelectedShapeIds()
+      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)
+      editorAPP?.deleteShapes(graphicIds)
+    },
+    //
+    editorCreateShape(myShape){
+      editorAPP.createShape(myShape)
+    },
+    editorDeleteShape(shapeId){
+      editorAPP.deleteShape(shapeId)
     },
     // 添加快照
     setSnapshot(v) {
-      editorAPP.store.loadSnapshot(v)
+      editorAPP.store?.loadSnapshot(v)
       this.isFocused()
     },
     // 获取快照
@@ -222,7 +229,6 @@ export default {
     },
     arrow(v) {
       // 'none', 'semi', 'solid', 'pattern'
-      console.log('arrowarrowarrowarrowarrow');
       this.styleProps('arrow', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('arrow', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('arrow', 'dash').defaultValue = v?.dash ?? 'draw'
@@ -464,7 +470,7 @@ export default {
     isFocused() {
       const top = document.documentElement.scrollTop
       setTimeout(() => {
-        editorAPP.updateInstanceState({isFocused: true})
+        editorAPP?.updateInstanceState({isFocused: true})
         document.documentElement.scrollTop = top
       }, 10)
     }

package/src/components/tagging/src/tagging.css

@@ -99,7 +99,7 @@
     color: rgba(0,0,0,0.6);
     margin-top: 140px;
 }
-.but{
+.but-tag{
     margin-left: 5px;
     font-size: 12px;
     background-color: transparent;
@@ -109,6 +109,7 @@
     cursor: pointer;
     min-width: 60px;
     height: 21px;
+    line-height: 17px;
 }
 .annotation-list{
     margin: 10px;

package/src/components/tagging/src/tagging.vue

@@ -37,10 +37,10 @@
                             <em>{{ item.time === '' ? '' : '(' + item.time + ')' }}</em>
                         </div>
                         <div class="list-right" v-if="!readOnlys">
-                            <button v-if="item.readable" class="but" @click.stop="preservation(item.id,index)">保存批注</button>
-                            <button v-if="item.readable" class="but" @click.stop="cancel(item.id,index)">取消批注</button>
-                            <button v-if="!item.readable" class="but" @click.stop="modify(index)">修改批注</button>
-                            <button v-if="!item.readable" class="but" @click.stop="del(item.id,index)">删除批注</button>
+                            <button v-if="item.readable" class="but-tag" @click.stop="preservation(item.id,index)">保存批注</button>
+                            <button v-if="item.readable" class="but-tag" @click.stop="cancel(item.id,index)">取消批注</button>
+                            <button v-if="!item.readable" class="but-tag" @click.stop="modify(index)">修改批注</button>
+                            <button v-if="!item.readable" class="but-tag" @click.stop="del(item.id,index)">删除批注</button>
                         </div>
                     </div>
                     <div class="list-cont">

package/src/index.js

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