zydx-plus 1.35.609 → 1.35.611

package/package.json

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

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

@@ -12,7 +12,14 @@
       <div class="ed-but" v-if="readOnly">
         <slot name='leftToolBtn'></slot>
         <div class="ed-head-but" v-for="(item,index) in toolbars" :key="index">
-          <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)" :disabled="disabled"
+          <div class="but-relative" v-if="item.key === 'h'">
+            <span>标题</span>
+            <div class="but-absolute">
+              <button class="buts" @click="toolTap('h2')">一级标题</button>
+              <button class="buts" @click="toolTap('h3')">二级标题</button>
+            </div>
+          </div>
+          <button v-else-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'">
@@ -93,12 +100,9 @@
           <svg style="cursor: pointer" @click="close" t="1698630749910" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4415" width="20" height="20"><path d="M726.976 274.432a16 16 0 0 0-22.656 0L512 466.752l-192.32-192.32a16 16 0 0 0-22.624 0l-22.656 22.624a16 16 0 0 0 0 22.624l192.32 192.32-192.32 192.32a16 16 0 0 0 0 22.656l22.656 22.624a16 16 0 0 0 22.624 0l192.32-192.32 192.32 192.32a16 16 0 0 0 22.656 0l22.624-22.624a16 16 0 0 0 0-22.624L557.28 512l192.32-192.352a16 16 0 0 0 0-22.624l-22.624-22.624z" fill="#fff" p-id="4416"></path></svg>
         </div>
       </div>
-      <!--      <div class="editor-but" v-if="butText !== '' && readOnly">-->
-      <!--        <button class="buts" @click="complete">{{ butText }}</button>-->
-      <!--      </div>-->
       <div class="enclosure" v-if="uploadAttData.length > 0 && enclosureShow">
         <p :style="enclosureStyle">{{ enclosureText }}</p>
-        <div class="enclosure-list" v-for="(item,index) in uploadAttData">
+        <div class="enclosure-list" v-for="(item,index) in uploadAttData" :key="index">
           <div class="enclosure-item" v-if="uploadAttData.length <= 1">
             <span v-if="item.name">{{ item.name }}</span>
             <span v-if="item.annexName">{{ item.annexName }}</span>
@@ -263,7 +267,7 @@ export default {
     },
     toolbar: {
       type: Array,
-      default: []
+      default: () => []
     },
     title: {
       type: String,
@@ -304,11 +308,11 @@ export default {
     },
     uploadImage: {
       type: Object,
-      default: {}
+      default: () => {}
     },
     uploadAttachment: {
       type: Object,
-      default: {}
+      default: () => {}
     },
     delShow: {
       type: Boolean,
@@ -360,7 +364,7 @@ export default {
     },
     enclosureButton: {
       type: Object,
-      default: {}
+      default: () => {}
     },
     updateStatus: {
       type: Boolean,
@@ -368,14 +372,14 @@ export default {
     },
     downName: {
       type: Array,
-      default: []
+      default: () => []
     }
   },
   emits: ['see', 'del', 'complete', 'update:data', 'enclosureSuccess', 'download', 'updateData', 'syncDel','assets'],
   watch: {
     // 强制监听data变化
     data: {
-      handler: function (e, oldVal) {
+      handler: function (e) {
         if(this.updateInit) return
         if(this.updateStatus) this.updateInit = true
         this.editor?.commands.setContent(json2html({node: "root", child: this.dataChange(e).html}))
@@ -384,7 +388,7 @@ export default {
       deep: true
     },
     readOnly: {
-      handler: function (e, oldVal) {
+      handler: function (e) {
         this.editor.setOptions({
           editable: e
         })
@@ -395,26 +399,31 @@ export default {
       handler: function (e) {
         let status = null
         let upload = null
+        let title = null
         this.toolbars = []
         e.forEach(x => {
           if(x.key === 'but') {
             status = x
           } else if (x.key === 'uploadAtt') {
             upload = x
+          }else if(['h1','h2','h3','h4','h5','h6'].includes(x.key)) {
+            title = {key: 'h', title: '标题'}
           }else {
             this.toolbars.push(x)
           }
         })
+        if(title) this.toolbars.unshift(title) // 标题
         if(this.isShowWhiteboarde) this.toolbars.push({key: 'paint', title: '插入手写'})
         if(upload) this.toolbars.push(upload) // 上传附件
         if(this.voiceShow) this.toolbars.push({key: 'voice', title: '语音输入'})
         if(status) this.toolbars.push(status) // 之定义按钮
         if(this.isShowAiTool) this.toolbars.push({key: 'ai', title: 'AI助手'})
+        console.log(this.toolbars)
       },
       immediate: true
     },
     disabled: {
-      handler: function (e, oldVal) {
+      handler: function (e) {
         this.editor.setOptions({
           editable: this.readOnly ?(!e):this.readOnly
         })
@@ -474,7 +483,7 @@ export default {
         _this.close()
       },
       // 获取焦点
-      onFocus: (e) => {
+      onFocus: () => {
         this.limits = true
       },
     })
@@ -520,8 +529,6 @@ export default {
       const selection = window.getSelection();
       const selectedText = selection.toString()
       if (!selectedText || this.lastSelectedText === selectedText) return
-      const clientX = e.clientX
-      const clientY = e.clientX
       this.lastSelectedText = selectedText
     },
     showAssets() {
@@ -552,6 +559,7 @@ export default {
         this.imgSizeVal = 100
         this.editor.chain().setImageWidth('100%').focus().run()
       } else if(parseInt(e.target.value) < 10) {
+
       } else {
         if(this.lock) {
           this.lock = false
@@ -595,6 +603,7 @@ export default {
     },
     // 粘贴文本处理
     preventPaste(event) {
+      if(!this.readOnly) return
       // 删除选中的文本
       this.editor.chain().focus().deleteSelection().run()
       const text = event.clipboardData.getData('text/plain');
@@ -993,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()
@@ -1368,4 +1376,37 @@ export default {
   color: #666;
   line-height: 30px;
 }
+.but-relative{
+  position: relative;
+  margin-left: 1px;
+  font-size: 12px;
+  background-color: transparent;
+  border: 1px solid #000;
+  border-radius: 3px;
+  padding: 2px 5px;
+  cursor: pointer;
+  min-width: 60px;
+  height: 21px;
+  display: inline-block;
+  line-height: 14px;
+  box-sizing: border-box;
+  -moz-text-align-last: justify;
+  text-align-last: justify;
+  word-break: break-all;
+  text-justify: distribute;
+}
+.but-relative:hover .but-absolute{
+  display: block;
+}
+.but-absolute{
+  position: absolute;
+  top: 20px;
+  left: -2px;
+  background: #fff;
+  z-index: 1;
+  display: none;
+}
+.but-absolute>button{
+  margin-top: 1px;
+}
 </style>

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

@@ -11,16 +11,30 @@
                :class="{'select-css-focus': isOpen}"
                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">
@@ -102,7 +116,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
@@ -122,6 +136,16 @@ export default defineComponent({
         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) {

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/index.js

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