zydx-plus 1.32.268 → 1.32.269

package/package.json

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

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

@@ -647,7 +647,7 @@ let buttonNames = {
                             lowLevel: {
                                 default: "setTask",
                                 setTask: '布置任务',
-                                groupStudy: '小组学习',
+                                // groupStudy: '小组学习',
                                 duplicate: '违纪查重',
                                 teacherReview: '教师评价',
                                 studentReview: '同学互评',

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

@@ -18,6 +18,9 @@
           </div>
         </div>
       </div>
+      <div class="tool-list" @click.stop="mouse">
+        <img src="./img/shubiao.png" alt=""/>
+      </div>
       <div class="tool-list" @click.stop="brush">
         <img src="./img/huabi.png" alt=""/>
       </div>
@@ -31,9 +34,9 @@
             <span>字号</span>
             <em style="font-size: 13px;" v-for="(item,index) in textData" @click.stop="sizeTap(item)">{{ item }}</em>
           </div>
-          <div class="set-list">
+          <div class="set-list" @click.stop="textInputTap">
             <span>内容</span>
-            <input type="text" v-model="text" @click.stop="false"/>
+            <input ref="textInput" type="text" v-model="text"/>
           </div>
           <div class="set-list set-right">
             <button class="but" @click="textBox">确认</button>
@@ -123,8 +126,10 @@ export default {
       this.init()
     }, 0)
     window.addEventListener('keydown', this.handleKeyEvent)
-    this.offLeft = this.$refs.sketchpad.offsetLeft
-    this.offTop = this.$refs.sketchpad.offsetTop
+    const ids = this.$refs.sketchpad.getBoundingClientRect()
+    const bodyWidth = (document.documentElement.clientWidth - this.$refs.sketchpad.offsetLeft - ids.width) / 2
+    this.offLeft = this.$refs.sketchpad.offsetLeft + bodyWidth
+    this.offTop = ids.top
     // 监听滚动
     this.throttleHandleScroll()
     window.addEventListener('scroll', this.throttleHandleScroll);
@@ -141,6 +146,13 @@ export default {
     window.removeEventListener('keydown', this.handleKeyEvent)
   },
   methods: {
+    mouse() {
+      this.state = null
+      this.canvas.isDrawingMode = false
+    },
+    textInputTap() {
+      this.$refs.textInput.focus()
+    },
     throttleHandleScroll() {
       this.scrollTop = document.documentElement.scrollTop || document.body.scrollTop
     },
@@ -221,7 +233,7 @@ export default {
 
       this.canvas.on('mouse:up', (o) => {
         this.isDown = false
-        this.line.setCoords()
+        this.line?.setCoords()
       })
     },
     // 矩形
@@ -269,7 +281,7 @@ export default {
       })
       this.canvas.on('mouse:up', (o) => {
         this.isDown = false
-        this.rect.setCoords()
+        this.rect?.setCoords()
       })
     },
     // 圆形
@@ -325,7 +337,7 @@ export default {
       })
       this.canvas.on('mouse:up', () => {
         this.isDown = false
-        this.circle.setCoords()
+        this.circle?.setCoords()
       })
     },
     // 箭头
@@ -377,7 +389,6 @@ export default {
       this.canvas.add(this.textbox)
     },
     save() {
-      console.log(this.canvas.toJSON())
       this.$emit('save', this.canvas.toJSON())
     },
     clear() {

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.268',
+    version: '1.32.269',
     install,
     Calendar,
     Message,