zydx-plus 1.32.287 → 1.32.288

package/package.json

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

package/src/components/biz_header/src/button_name.js

@@ -2127,24 +2127,24 @@ let buttonNames = {
                     }
                 },
                 resource_lesson020: {
-                    actionName: '逻辑思维',
+                    actionName: '思维训练',
                     buttonList: {
                         0: {
                             headLevel: {
                                 default: "demand",
                                 demand: '训练要求',
-                                resourceIndex: '训练题目',
+                                resourceIndex: '训练试题',
                                 analyse: '训练分析',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '题目',
-                                allClass: this.getPrefix(item) + '题目'
+                                singletonClass: this.getCurrentPrefix(item) + '试题',
+                                allClass: this.getPrefix(item) + '试题'
                             },
                             lowLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '题目'
+                                singletonClass: this.getCurrentPrefix(item) + '试题'
                             }
                         }
                     }
@@ -2155,10 +2155,10 @@ let buttonNames = {
                         0: {
                             headLevel: {
                                 default: "demand",
-                                demand: '分析要求',
-                                resourceIndex: '题  目',
-                                review: '分析点评',
-                                analyse: '分析资源',
+                                demand: '案析要求',
+                                resourceIndex: '案析题目',
+                                review: '案析点评',
+                                analyse: '案析分析',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {

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

@@ -146,7 +146,7 @@ export default {
     this.id = 'canvas-wrap' + Math.random().toString(36).substr(2)
     // 在画板以外松开鼠标后冻结画笔
     document.onmouseup = () => {
-      this.mouseUp()
+      if (this.isDrawing) this.mouseUp()
     }
   },
   methods: {
@@ -185,9 +185,11 @@ export default {
     drawStart (obj) {
       obj.index = this.pageIndex
       obj.start = 'start'
+      obj.scale = this.scales
       this.startX = obj.x
       this.startY = obj.y
       this.ctx.beginPath()
+      this.ctx.strokeStyle = 'red'
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
       this.ctx.lineCap = 'round'
@@ -200,7 +202,9 @@ export default {
     drawEnd (obj) {
       obj.index = this.pageIndex
       obj.start = 'end'
+      obj.scale = this.scales
       this.ctx.beginPath()
+      this.ctx.strokeStyle = 'red'
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
       this.ctx.lineCap = 'round'
@@ -213,6 +217,7 @@ export default {
     drawMove (obj) {
       obj.index = this.pageIndex
       obj.start = 'move'
+      obj.scale = this.scales
       this.ctx.beginPath()
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
@@ -308,9 +313,9 @@ export default {
             for(let i = 0; i < that.points.length; i++) {
               if(that.points[i].index === that.pageIndex) {
                 that.ctx.beginPath()
-                that.ctx.moveTo(that.points[i].x,that.points[i].y)
+                that.ctx.moveTo(that.points[i].x*that.scales/that.points[i].scale,that.points[i].y*that.scales/that.points[i].scale)
                 if(that.points[i].start !== 'end') {
-                  that.ctx.lineTo(that.points[i+1].x, that.points[i+1].y)
+                  that.ctx.lineTo(that.points[i+1].x*that.scales/that.points[i].scale, that.points[i+1].y*that.scales/that.points[i].scale)
                 }
                 that.ctx.strokeStyle = 'red'
                 that.ctx.lineCap = 'round'

package/src/index.js

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