zydx-plus 1.33.324 → 1.33.326

package/package.json

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

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

@@ -539,7 +539,7 @@ export default {
     },
     del(index) {
       let that = this
-      that.data.html = html2json(that.editor.getHTML()).child
+      // that.data.html = html2json(that.editor.getHTML()).child
       if (this.uploadAttData[index].name === undefined) {
         that.uploadAttData[index].active = false
         that.$emit('del', that.uploadAttData[index], (e) => {

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

@@ -385,11 +385,13 @@ export default {
             const y2 = this.points[i+1]?this.points[i+1].y*this.scales/this.points[i].scale:0
             const x3 = obj.x
             const y3 = obj.y
-            const a = Math.abs((x1-x2)*(y1-y3)-(x1-x3)*(y1-y2))
-            const b = Math.sqrt(Math.pow(x1-x2,2)+Math.pow(y1-y2,2))
+            // const a = Math.abs((x1-x2)*(y1-y3)-(x1-x3)*(y1-y2))
+            // const b = Math.sqrt(Math.pow(x1-x2,2)+Math.pow(y1-y2,2))
             const c = Math.sqrt(Math.pow(x1-x3,2)+Math.pow(y1-y3,2))
             const d = Math.sqrt(Math.pow(x2-x3,2)+Math.pow(y2-y3,2))
-            if(a/b <= 5 && c <= b && d <= b) {
+            const scope = this.lineWidth/2+15
+            // if(a/b <= 5 && c <= b && d <= b) {
+            if(c<scope&&d<scope&&this.points[i].id===this.points[i+1].id) {
               const id = this.points[i].id
               for(let j=0; j<this.points.length; j++) {
                 if(this.points[j].id === id) {
@@ -399,6 +401,7 @@ export default {
                   j--
                 }
               }
+              return
             }
           }
           // 判断点击的是否是箭头
@@ -993,7 +996,6 @@ export default {
       }
     },
     flipRight(e, v) {
-      console.log(e)
       if (e < 1) {
         this.pageIndex = 1
         return
@@ -1046,16 +1048,16 @@ export default {
         canvas.height = hei * that.sratio
         canvas.style.width = wid + 'px'
         canvas.style.height = hei + 'px'
-        canvas2.width = viewport.width * that.sratio
-        canvas2.height = viewport.height * that.sratio
+        canvas2.width = wid * that.sratio
+        canvas2.height = hei * that.sratio
         canvas2.style.width = wid + 'px'
         canvas2.style.height = hei + 'px'
         that.canvasStyle = {
-          width: viewport.width + 'px',
-          height: viewport.height + 'px',
-          marginLeft: -(viewport.width / 2) + 'px',
-          widthCanvas: viewport.width * that.sratio,
-          heightCanvas: viewport.height * that.sratio
+          width: wid + 'px',
+          height: hei + 'px',
+          marginLeft: -(wid / 2) + 'px',
+          widthCanvas: wid * that.sratio,
+          heightCanvas: hei * that.sratio
         }
         let renderContext = {
           canvasContext: ctx2,

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.324',
+    version: '1.33.326',
     install,
     Calendar,
     Message,