zydx-plus 1.35.610 → 1.35.612

package/package.json

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

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

@@ -1002,13 +1002,12 @@ export default {
       // if (v === 'h1') this.editor.chain().focus().setFontSize('18px').setBold().run()
       // if (v === 'h2') this.editor.chain().focus().setFontSize('16px').setBold().run()
       // if (v === 'h3') this.editor.chain().focus().setFontSize('14px').setBold().run()
-      if(v === 'h1') this.editor.chain().focus().toggleHeading({ level: 1 }).setFontSize('18px').run()
-      if(v === 'h2') this.editor.chain().focus().toggleHeading({ level: 2 }).setFontSize('16px').run()
-      if(v === 'h3') this.editor.chain().focus().toggleHeading({ level: 3 }).setFontSize('14px').run()
+      if(v === 'h1') this.editor.chain().focus().setBold().setFontSize('18px').run()
+      if(v === 'h2') this.editor.chain().focus().setBold().setFontSize('16px').run()
+      if(v === 'h3') this.editor.chain().focus().setBold().setFontSize('14px').run()
 
       if (v === 'p') {
-        this.editor.chain().focus().setFontSize('14px').run()
-        this.editor.chain().focus().unsetBold().run()
+        this.editor.chain().focus().setFontSize('14px').unsetBold().run()
       }
       if (v === 'bold') this.editor.chain().focus().toggleBold().run()
       if (v === 'center' || v === 'left' || v === 'right') this.editor.chain().focus().setTextAlign(v).run()
@@ -1247,7 +1246,7 @@ export default {
 
 .ed-cont {
   padding-top: 4px;
-  margin-bottom: 14px;
+  padding-bottom: 14px;
   position: relative;
 }
 

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

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

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

@@ -9,18 +9,32 @@
                :readonly="true"
                @click.stop="toggleDropDown"
                :class="{'select-css-focus': isOpen}"
-               class="select-css" />
+               class="select-css"/>
 
-        <span class="custom-select-icons" v-if="!readonly" @click.stop="toggleDropDown">
-          <svg xmlns="http://www.w3.org/2000/svg"
-               width="16"
+        <span v-if="!readonly" class="custom-select-icons">
+          <svg v-if="!selected"
+               @click.stop="toggleDropDown"
                height="16"
-               viewBox="0 0 24 24">
-            <g :transform="transform" >
-              <path fill="#c0c4cc"
-                    d="M15.125 21.1L6.7 12.7q-.15-.15-.213-.325T6.425 12q0-.2.062-.375T6.7 11.3l8.425-8.425q.35-.35.875-.35t.9.375q.375.375.375.875t-.375.875L9.55 12l7.35 7.35q.35.35.35.863t-.375.887q-.375.375-.875.375t-.875-.375Z" />
+               viewBox="0 0 24 24"
+               width="16"
+               xmlns="http://www.w3.org/2000/svg">
+            <g :transform="transform">
+              <path
+                  d="M15.125 21.1L6.7 12.7q-.15-.15-.213-.325T6.425 12q0-.2.062-.375T6.7 11.3l8.425-8.425q.35-.35.875-.35t.9.375q.375.375.375.875t-.375.875L9.55 12l7.35 7.35q.35.35.35.863t-.375.887q-.375.375-.875.375t-.875-.375Z"
+                  fill="#c0c4cc"/>
             </g>
           </svg>
+          <svg v-else
+               @click.stop="clearSelected"
+               height="16"
+               viewBox="0 0 1024 1024"
+               width="16"
+               xmlns="http://www.w3.org/2000/svg">
+            <path
+                d="M512 14.8973037A497.1026963 497.1026963 0 1 0 1009.1026963 512 497.1026963 497.1026963 0 0 0 512 14.8973037z m219.96794311 628.83491082a62.13783703 62.13783703 0 0 1-88.23572859 88.23572859L512 599.61435022 380.26778548 731.96794311a62.13783703 62.13783703 0 0 1-88.23572859-88.23572859L424.38564978 512 292.03205689 380.26778548a62.13783703 62.13783703 0 0 1 88.23572859-88.23572859L512 424.38564978l131.73221452-132.35359289a62.13783703 62.13783703 0 0 1 88.23572859 88.23572859L599.61435022 512z"
+                fill="#c0c4cc"></path>
+          </svg>
+
         </span>
         <teleport to="body">
           <template v-if="!readonly">
@@ -35,7 +49,7 @@
                     :class="option.disable ? 'disable': ''"
                     @click.stop="handleClick(option)">
                   <div class="countersign-image" v-if="multiple">
-                    <img v-if="option.active" :src="countersign"  alt=""/>
+                    <img v-if="option.active" :src="countersign" alt=""/>
                   </div>
                   <span>{{ option.label }}</span>
                 </li>
@@ -48,15 +62,17 @@
   </onClickOutSide>
 </template>
 <script setup>
-import { ref } from 'vue'
+import {ref} from 'vue'
+
 let dropdown = ref(null)
 </script>
 <script>
 import onClickOutSide from './onClickOutSide.vue'
-import { defineComponent } from 'vue'
+import {defineComponent} from 'vue'
+
 export default defineComponent({
   name: 'zydx-select',
-  components: { onClickOutSide },
+  components: {onClickOutSide},
   props: {
     options: {
       type: Array,
@@ -102,7 +118,7 @@ export default defineComponent({
       countersign: 'data:image/png;base64,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'
     }
   },
-  emits: ['update:value', 'select'],
+  emits: ['update:value', 'select', 'clear'],
   methods: {
     mouseleave() {
       this.isOpen = false
@@ -110,29 +126,39 @@ export default defineComponent({
     },
     toggleDropDown: function () {
       const winHeight = window.innerHeight
-      const { x, y, width, height } = this.$refs.selectRef.getBoundingClientRect()
+      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) {
+      if (this.isOpen) {
         window.addEventListener('scroll', this.handler)
-      }else {
+      } else {
         window.removeEventListener('scroll', this.handler)
       }
     },
+    clearSelected: function () {
+      this.selected = ''
+      if (this.multiple) {
+        this.options.forEach(x => {
+          x.active = false
+        })
+      }
+      this.$emit('update:value', this.selected)
+      this.$emit('clear', 'clear')
+    },
     handleClick: function (option) {
-      if(option.disable) return
-      if(this.multiple) {
+      if (option.disable) return
+      if (this.multiple) {
         option.active = !option.active
         let value = ''
         this.options.forEach(x => {
-          if(x.active) value += `${x.value},`
+          if (x.active) value += `${x.value},`
         })
         this.$emit('update:value', value.slice(0, -1))
-        this.$emit('select', option)
-      }else {
+        this.$emit('select', {label: option.label, value: option.value})
+      } else {
         this.$emit('update:value', option.value)
         this.$emit('select', option)
         this.isOpen = false
@@ -157,17 +183,18 @@ export default defineComponent({
   watch: {
     value: {
       handler: function (v) {
+        v = String(v)
         if (!v || !this.options.length) {
           this.selected = ''
           return
         }
-        const data = this.multiple? v.split(',') : v.split(',')[0]
+        const data = v.split(',')
         let label = ''
         this.options.forEach(x => {
-          if(data.includes(x.value)) {
+          if (data.includes(String(x.value))) {
             x.active = true
             label += `${x.label}、`
-          }else {
+          } else {
             x.active = false
           }
         })
@@ -180,7 +207,7 @@ export default defineComponent({
 })
 
 </script>
-<style  scoped>
+<style scoped>
 .v-enter-active,
 .v-leave-active {
   transition: opacity 0.5s ease;
@@ -203,7 +230,7 @@ export default defineComponent({
   margin-bottom: 1em;
 }
 
-.countersign-image{
+.countersign-image {
   width: 14px;
   height: 14px;
   margin-right: 5px;
@@ -211,7 +238,8 @@ export default defineComponent({
   top: 2px;
   display: inline-block;
 }
-.countersign-image>img{
+
+.countersign-image > img {
   width: 100%;
   height: 100%;
 }
@@ -296,14 +324,17 @@ export default defineComponent({
 .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/components/sketchpad/src/sketchpad.vue

@@ -235,6 +235,9 @@ export default {
     },
     // 添加快照
     setSnapshot(v) {
+      if(this.isEmpty(v)){
+        v = clearJson
+      }
       editorAPP.store?.loadSnapshot(v)
       this.isFocused()
     },
@@ -542,6 +545,16 @@ export default {
         editorAPP?.updateInstanceState({isFocused: true})
         document.documentElement.scrollTop = top
       }, 10)
+    },
+    isEmpty(v) {
+      if (Array.isArray(v)) {
+        return v.length === 0
+      }
+      if (v === undefined || v === null || v === '' || v === '0' || v === 0 || v === 'null') {
+        return true
+      } else {
+        return typeof v === 'object' && Object.keys(v).length === 0;
+      }
     }
   }
 }

package/src/components/tipBox/src/main.vue

@@ -44,7 +44,7 @@
                 <div v-if="item.type === 'file'" class="file-cont">
                   <em>{{ fileName }}</em>
                   <label>
-                    <span class="but">上传</span>
+                    <span class="but">选择文件</span>
                     <input class="file" :accept="item.accept" @change="fileTap($event,index)" type="file"/>
                   </label>
                 </div>

package/src/index.js

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