zydx-plus 1.32.268 → 1.32.270

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.268",
+  "version": "1.32.270",
   "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/calendar/src/Calendar.css

@@ -215,6 +215,7 @@ li{list-style-type:none;}
 	text-align: center;
 	height: 34px;
 	box-sizing: border-box;
+	line-height: 34px;
 }
 
 .calendar-day-6-7{

package/src/components/calendar/src/Calendar.vue

@@ -148,7 +148,7 @@ export default {
          */
         showLunar: {
             type: Boolean,
-            default: true
+            default: false
         },
         /**
          * @description 设置标记范围
@@ -208,15 +208,15 @@ export default {
             firstRangeSelected: false, // 范围开始时间是否已经选择
             rangeStart_: undefined, //标记范围开始，yyyyMM-dd
             rangeEnd_: undefined, //标记范围结束，yyyyMM-dd
-            transform_x:0,
-            transform_time:0,
-            cleDate: '00:00',
-            cleFocusShow: false,
-            transHour: 0,
-            transMinute: 0,
-            hour: '00',
-            minute: '00',
-            dayChange: undefined,
+            transform_x:0, // 顶部日期选择器的偏移量
+            transform_time:0, // 顶部时间选择器的偏移量
+            cleDate: '00:00', //时间选择器的时间
+            cleFocusShow: false, // 是否显示时间选择器
+            transHour: 0, // 小时选择器的偏移量
+            transMinute: 0, // 分钟选择器的偏移量
+            hour: '00', // 选择的小时
+            minute: '00', // 选择的分钟
+            dayChange: undefined, // 选择的日期
         };
     },
     methods: {

package/src/components/mind/src/mind.vue

@@ -657,4 +657,8 @@ export default {
     width: 100%;
     height: 100%;
 }
+:deep(.custom-select){
+  width: 94px;
+  margin-left: -40px;
+}
 </style>

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/components/tab/src/tab.vue

@@ -114,6 +114,7 @@ export default {
     line-height: 26px;
     color: #333;
     font-size: 14px;
+    user-select: none;
 }
 
 .tabs-li:hover {

package/src/components/time/src/time.vue

@@ -200,6 +200,7 @@ export default {
   box-shadow: 0 0 5px rgba(0, 0, 0, .12);
   overflow: hidden;
   user-select: none;
+  z-index: 20;
 }
 
 .time-but {

package/src/index.js

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