zydx-plus 1.32.267 → 1.32.269

package/package.json

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

package/src/components/biz_header/src/bizHeader.vue

@@ -187,6 +187,9 @@ export default {
             return node
         },
         clickRightBtn (selectItem, selectBtnIndex, selectBtnName) {
+            if(selectBtnIndex == this.selectBtnIndex && selectItem == this.selectItem) {
+                return false;
+            }
             this.$emit('clickRightBtn', {selectItem, selectBtnIndex, selectBtnName, 'nodeList': this.nodeList});
         },
     },

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/biz_taskInfo/src/bizTaskInfo.vue

@@ -46,6 +46,7 @@
                                             :placeholder="'不限制'"
                                             :readonly="readonly"
                                             :border="!readonly"
+                                            :key="JSON.stringify(info.endTime)"
                                             :type="'input'">
                                     <template #suffix>
                                         <span><img v-if="!readonly" @click="this.showExamJoinCalenderTime[index] = !this.showExamJoinCalenderTime[index]" src="data:image/png;base64,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"/></span>

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

@@ -863,7 +863,7 @@ export default {
 }
 
 .enclosure-list {
-  margin: 5px 20px 0 20px;
+  margin: 5px 0 0 20px;
   height: 22px;
   line-height: 22px;
 }

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);
@@ -133,18 +138,28 @@ export default {
       this.x = event.clientX - this.left;
       this.y = event.clientY - this.top;
     })
+    document.addEventListener('mouseup', (event) => {
+      this.isMove = false
+    })
   },
   beforeDestroy() {
     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
     },
     mousedown(event) {
       event.preventDefault()
       //鼠标按下事件
-      this.left = event.offsetX + this.offLeft
+      this.left = event.offsetX + this.offLeft + 25
       this.top = event.offsetY + this.offTop - this.scrollTop
       this.isMove = true
     },
@@ -218,7 +233,7 @@ export default {
 
       this.canvas.on('mouse:up', (o) => {
         this.isDown = false
-        this.line.setCoords()
+        this.line?.setCoords()
       })
     },
     // 矩形
@@ -266,7 +281,7 @@ export default {
       })
       this.canvas.on('mouse:up', (o) => {
         this.isDown = false
-        this.rect.setCoords()
+        this.rect?.setCoords()
       })
     },
     // 圆形
@@ -322,7 +337,7 @@ export default {
       })
       this.canvas.on('mouse:up', () => {
         this.isDown = false
-        this.circle.setCoords()
+        this.circle?.setCoords()
       })
     },
     // 箭头
@@ -374,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.267',
+    version: '1.32.269',
     install,
     Calendar,
     Message,