zydx-plus 1.35.601 → 1.35.603

package/package.json

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

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

@@ -15,11 +15,14 @@
           <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)" :disabled="disabled"
                   :style="{color: (disabled) ? '#ccc' : (item.active)? '#4B0C77' :'#000'}">{{ item.title }}
           </button>
-          <label v-else-if="item.key === 'upImg' || item.key === 'uploadAtt'">
+          <label v-else-if="item.key === 'upImg'">
             <input type="file" @change="upload($event,item.key)" :disabled="disabled"
                    :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;"/>
             <span class="buts" :style="{color: ( disabled) ? '#ccc':'#000'}">{{ item.title }}</span>
           </label >
+          <button v-else-if="item.key === 'uploadAtt'" class="buts" @click="item.onClick(item)" :disabled="disabled"
+                  :style="{color: (disabled) ? '#ccc' : (item.active)? '#4B0C77' :'#000'}">{{ item.title }}
+          </button>
           <button v-else-if="item.key === 'paint'" class="buts" @click="toolTap('paint')" :disabled="disabled">{{ item.title }}</button>
           <button v-else-if="item.key === 'voice'" class="buts" @mousedown.stop="speechDown" :disabled="disabled" @click="voice()"
                   :style="{color:  (disabled) ? '#ccc' : (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}

package/src/components/mind/src/mind.css

@@ -196,7 +196,7 @@
     border: 1px solid #ccc;
     cursor: pointer;
     font-size: 14px;
-    height: 30px;
+    height: 28px;
     line-height: 28px;
     flex: 1;
     position: relative;

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

@@ -137,7 +137,7 @@ export default {
       if (!document.fullscreenElement) {
         this.fullShow = true
       }
-      this.mindMap.resize()
+      this.mindMap?.resize()
     }
   },
   methods: {
@@ -281,6 +281,8 @@ export default {
     // 保存
     preservation() {
       let that = this
+      this.styleStatus = false
+      this.lineStyleStatus = false
       that.$emit('preservation', {
         data: {
           msg: that.mindMap.getData(),

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

@@ -141,7 +141,7 @@ export default {
       ],
       lineStyleValue: 'none',
       styleValue: 'none',
-      widthValue: 1,
+      widthValue: 0,
       optionWidth: [
         {label: "0", value: 0},
         {label: "1", value: 1},
@@ -202,7 +202,7 @@ export default {
           this.color = val.nodeData.data.color || 'rgba(0,0,0,1)'
           this.borderColor = val.nodeData.data.borderColor || 'rgba(84, 150, 136,1)'
           this.styleValue = val.nodeData.data.borderDasharray || 'none'
-          this.widthValue = val.nodeData.data.borderWidth || 1
+          this.widthValue = val.nodeData.data.borderWidth || 0
           this.filletValue = val.nodeData.data.borderRadius || 5
           this.fillColor = val.nodeData.data.fillColor || 'rgba(255,255,255,1)'
           this.lineValue = val.nodeData.data.lineWidth || 1

package/src/components/select/src/select.vue

@@ -25,9 +25,9 @@
           <template v-if="!readonly">
             <template v-if="options.length">
               <ul v-if="isOpen"
+                  class="custom-select-options scroll"
                   ref="dropdown"
-                  :style="{position: 'fixed', 'z-index': '30000', left: x + 'px', top: y + 'px', width: width + 'px'}"
-                  :class="{ 'custom-select-options': true, 'scroll': maxHeight > 0 }">
+                  :style="{position: 'fixed', 'z-index': '30000', left: x + 'px', top: y + 'px', width: width + 'px', maxHeight: height + 'px'}">
                 <li v-for="(option, idx) in options"
                     :key="idx"
                     :class="option.disable ? 'disable': ''"
@@ -86,16 +86,19 @@ export default defineComponent({
       selected: null,
       x: 0,
       y: 0,
-      width: 0
+      width: 0,
+      height: 300
     }
   },
   emits: ['update:value', 'select'],
   methods: {
     toggleDropDown: function () {
+      const winHeight = window.innerHeight
       const { x, y, width, height } = this.$refs.selectRef.getBoundingClientRect()
       this.x = x
       this.y = y + height
       this.width = width
+      this.height = (winHeight - this.y) - 50
       this.isOpen = !this.isOpen
       if(this.isOpen) {
         window.addEventListener('scroll', this.handler)
@@ -120,18 +123,11 @@ export default defineComponent({
   },
   computed: {
     transform: function () {
-      return this.isOpen
-        ? 'rotate(90 12 12)'
-        : 'rotate(-90 12 12)'
+      return this.isOpen ? 'rotate(90 12 12)' : 'rotate(-90 12 12)'
     },
     style: function () {
       return 'transition: all 0.2s ease;'
     },
-    _maxHeight: function () {
-      return this.maxHeight > 0
-        ? `${this.maxHeight}px`
-        : ''
-    }
   },
   watch: {
     value: {
@@ -247,14 +243,20 @@ export default defineComponent({
 }
 
 .custom-select-options.scroll {
-  max-height: v-bind(_maxHeight);
   overflow-y: scroll;
 }
 
 .custom-select-options::-webkit-scrollbar {
   display: none;
 }
-
+.custom-select-options {
+  scrollbar-width: none;
+}
+/** IE 与微软浏览器 **/
+.custom-select-options {
+  -ms-overflow-style: none;
+  overflow: -moz-scrollbars-none;
+}
 .custom-select-options li {
   padding: 0 10px;
   font-size: 14px;

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.601',
+    version: '1.35.603',
     install,
     Calendar,
     Message,