zydx-plus 1.33.331 → 1.33.333

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.33.331",
+  "version": "1.33.333",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -26,22 +26,28 @@
     "katex": "^0.15.6",
     "simple-mind-map": "^0.9.6",
     "html2json": "^1.0.2",
-    "@tiptap/extension-image": "^2.0.3",
     "@tiptap/starter-kit": "^2.0.3",
     "@tiptap/vue-3": "^2.0.3",
+    "@tiptap/extension-bubble-menu": "^2.1.0",
     "@tiptap/extension-color": "^2.0.3",
+    "@tiptap/extension-focus": "^2.1.13",
     "@tiptap/extension-font-family": "^2.0.3",
+    "@tiptap/extension-heading": "^2.0.4",
     "@tiptap/extension-horizontal-rule": "^2.0.3",
+    "@tiptap/extension-image": "^2.0.3",
+    "@tiptap/extension-link": "^2.0.3",
     "@tiptap/extension-paragraph": "^2.0.3",
     "@tiptap/extension-placeholder": "^2.0.3",
     "@tiptap/extension-superscript": "^2.0.3",
     "@tiptap/extension-text-align": "^2.0.3",
     "@tiptap/extension-text-style": "^2.0.3",
-    "@tiptap/extension-link": "^2.0.3",
     "@vue-office/docx": "^1.1.3",
     "@vue-office/excel": "^1.1.3",
     "js-export-word": "^1.0.5",
-    "js-audio-recorder": "^1.0.7"
+    "js-audio-recorder": "^1.0.7",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "tldraw": "^2.0.2"
   },
   "peerDependencies": {
     "vue": "^3.2.13"

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

@@ -226,8 +226,9 @@ export default {
                 // 判断两个日期的大小
                 let start = (this.rangeStart_ === undefined)? null:this.rangeStart_.replace(/-/g, '')
                 let end = (this.rangeEnd_ === undefined)? null:this.rangeEnd_.replace(/-/g, '')
-                if(start > end) {
-                    date = {end: this.rangeStart_, start: this.rangeEnd_}
+                date = {start: this.rangeStart_, end: this.rangeEnd_}
+                if(Number(start) > Number(end)) {
+                    date = {start: this.rangeEnd_, end: this.rangeStart_}
                 }else {
                     date = {start: this.rangeStart_, end: this.rangeEnd_}
                 }

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

@@ -54,12 +54,12 @@
     <div class="complete" v-if="!readOnly && toolbar.length > 0">
       <button class="but" v-if="butShow" @click="confirm">完成</button>
     </div>
+    <div class="menus" v-if="menus&&readOnly" :style="menusStyle">
+      <button class="but" @click="enlSee" v-if="readOnly">查看</button>
+      <button class="but" @click="enlDownload" v-if="readOnly">下载</button>
+      <button class="but" @click="enlDel" v-if="!readOnly">删除</button>
+    </div>
     <div class="read-only" v-if="page&&readOnly" :style="{width: (wit + 20) + 'px'}">
-      <div class="menus" v-if="menus&&readOnly" :style="menusStyle">
-        <button class="but" @click="enlSee" v-if="readOnly">查看</button>
-        <button class="but" @click="enlDownload" v-if="readOnly">下载</button>
-        <button class="but" @click="enlDel" v-if="!readOnly">删除</button>
-      </div>
       <div class="editing-header" v-if="signMenuShow">
         <img :src="menusData('signMenu')?.ico" alt=""/>
         <span>{{ menusData('signMenu')?.text }}</span>
@@ -704,12 +704,12 @@ export default {
                 const last = this.editor.state.selection.$anchor.path[0].content.size
                 if (t === -1) this.editor.chain().focus().insertContentAt(last, html).run()
                 const num = this.upSort(this.editor, 'enclosure')
-                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}"><span class="mu">${num.num}. ${name}</span></p>`
+                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
                 this.editor.chain().focus().insertContentAt(num.len, html2).run()
               } else {
                 if (t === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph', b - 1), html).run()
                 const num = this.upSort(this.editor, 'enclosure')
-                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}"><span class="mu">${num.num}. ${name}</span></p>`
+                const html2 = `<p contenteditable="false" data-signId="u-${num.num}" data-url="${url}" class="mu"><span>${num.num}. ${name}</span></p>`
                 this.editor.chain().focus().insertContentAt(num.len, html2).run()
               }
             })

package/src/components/textarea/src/textarea.vue

@@ -4,7 +4,7 @@
             'min-height': height + 'px',
             border: (readable)? '1px solid #ccc': 'none',
             'background-color': (readable)? '#fff': 'transparent'
-        }" @input="event => checkLength(event, maxLength)" :placeholder="placeholder" :contenteditable="readable"
+        }" @input="event => checkLength(event, maxLength)" @keydown.enter="handleEnterKey" :placeholder="placeholder" :contenteditable="readable"
          ref="textarea"></div>
     <span class="num" v-if="maxLength !== 0&&readable">{{ num }}/{{ maxLength }}</span>
   </div>
@@ -16,7 +16,8 @@ export default {
   data() {
     return {
       num: 0,
-      placeholder: ''
+      placeholder: '',
+      length: 0
     }
   },
   props: {
@@ -39,6 +40,10 @@ export default {
     placeholder: {
       type: String,
       default: ''
+    },
+    lineNum: {
+      type: Number,
+      default: 5
     }
   },
   watch: {
@@ -64,16 +69,30 @@ export default {
   methods: {
     splitHtml(v) {
       if(v === '' || v === null) return ''
-      const arr = v.split('<br>')
+      const arr = v.split('\n')
       let html = ''
       arr.forEach(item => {
+        item = item.replace(/ /g, '&nbsp;')
         html += `<p>${item}</p>`
       })
       return html
     },
+    // 添加限制行数(回车监听)
+    handleEnterKey(e) {
+      if(e.keyCode === 13) {
+        if(this.length + 1 >= this.lineNum) {
+          e.preventDefault();
+          return false;
+        }
+      }
+    },
     checkLength(event, maxLength) {
       if (maxLength === 0) return
-      const text = event.target.innerText;
+      let text = event.target.innerText;
+      let html = event.target.innerHTML;
+      const regex = /<\/div>/g
+      const result = html.match(regex)
+      this.length = result ? result.length : 0 // 添加限制行数
       this.num = text.length
       if (text.length >= maxLength) {
         event.preventDefault();
@@ -83,16 +102,24 @@ export default {
     },
     getContent() {
       const html = this.$refs.textarea.innerHTML
-      const br = html.replace(/<div>/g, '<br>').replace(/<\/div>/g, '').replace(/<p>/g, '<br>').replace(/<\/p>/g, '')
+      console.log(html)
+      const br = html
+          .replace(/<div>/g, '\n')
+          .replace(/<\/div>/g, '')
+          .replace(/<p>/g, '\n')
+          .replace(/<\/p>/g, '')
+          .replace(/<span style="text-indent: 2em;">/g, '')
+          .replace(/<\/span>/g, '')
+          .replace(/&nbsp;/g, ' ')
       // 如果br后边没有内容，就去掉br
-      if (br.indexOf('<br>') !== -1) {
-        const arr = br.split('<br>')
+      if (br.indexOf('\n') !== -1) {
+        const arr = br.split('\n')
         arr.forEach((item, index) => {
           if (item === '') {
             arr.splice(index, 1)
           }
         })
-        return arr.join('<br>')
+        return arr.join('\n')
       }else {
         return br
       }
@@ -120,6 +147,7 @@ export default {
   box-sizing: border-box;
   text-indent: 2em;
   background-color: #fff;
+  word-wrap: break-word;
 }
 
 .text[contenteditable]:empty:before {

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.331',
+    version: '1.33.333',
     install,
     Calendar,
     Message,