zydx-plus 1.35.562 → 1.35.563

package/package.json

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

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

@@ -1937,6 +1937,8 @@ export default {
     },
     // 粘贴文本处理
     preventPaste(event) {
+      // 删除选中的文本
+      this.editor.chain().focus().deleteSelection().run()
       const text = event.clipboardData.getData('text/plain');
       const text2 = text.replace(/[\r\n]/g, '').replace(/\s*/g, '')
       this.editor.chain().focus().insertContentAt(this.selection(), text2).run()

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

@@ -10,7 +10,7 @@
         <slot name='titleSuffix'></slot>
       </div>
       <div class="ed-but" v-if="readOnly">
-        <div class="ed-head-but" v-for="(item,index) in toolbar">
+        <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)"
                   :style="{color: (item.active)? '#4B0C77' :'#000'}">{{ item.title }}
           </button>
@@ -19,13 +19,13 @@
                    :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;">
             <span class="buts">{{ item.title }}</span>
           </label>
+          <button v-else-if="item.key === 'paint'" class="buts" @click="toolTap('paint')">{{ item.title }}</button>
+          <button v-else-if="item.key === 'voice'" class="buts" @mousedown.stop="speechDown" @click="voice()"
+                  :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
+          </button>
+          <button v-else-if="item.key === 'ai'" class="buts" @click="showAi">AI助手</button>
           <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
         </div>
-        <button v-if='isShowWhiteboarde' class="buts" @click="toolTap('paint')">手写记录</button>
-        <button v-if="voiceShow" class="buts" @mousedown.stop="speechDown" @click="voice()"
-                :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
-        </button>
-        <button v-if='isShowAiTool' class="buts" @click="showAi">AI助手</button>
         <slot name='toolBtn'></slot>
         <button v-if="butText !== '' && readOnly" class="buts" @click="complete">{{ butText }}</button>
       </div>
@@ -372,12 +372,27 @@ export default {
         })
       },
       deep: true
+    },
+    toolbar: {
+      handler: function (e, oldVal) {
+        let status = null
+        this.toolbars = []
+        e.forEach(x => {
+          if(x.key === 'but') {
+            status = x
+          }else {
+            this.toolbars.push(x)
+          }
+        })
+        if(this.isShowWhiteboarde) this.toolbars.push({key: 'paint', title: '插入手写'})
+        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助手'})
+      },
+      immediate: true
     }
   },
   mounted() {
-    // document.addEventListener('mouseup', this.getSelectedText)
-
-
     let _this = this
     this.uploadAttData = (this.data.enclosure === undefined || this.data.enclosure === null || this.data.enclosure === 'null') ? [] : this.enclosureAction(this.data.enclosure)
     this.heightStyle = (this.height === '100%') ? {height: '100%'} : {'min-height': this.height}
@@ -535,6 +550,8 @@ export default {
     },
     // 粘贴文本处理
     preventPaste(event) {
+      // 删除选中的文本
+      this.editor.chain().focus().deleteSelection().run()
       const text = event.clipboardData.getData('text/plain');
       const text2 = text.replace(/[\r\n]/g, '').replace(/\s*/g, '')
       this.editor.chain().focus().insertContentAt(this.selection(), text2).run()

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.562',
+    version: '1.35.563',
     install,
     Calendar,
     Message,