zydx-plus 1.32.204 → 1.32.206

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.204",
+  "version": "1.32.206",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -24,7 +24,7 @@
     "pdfjs-dist": "^2.0.943",
     "snabbdom": "^3.5.1",
     "katex": "^0.15.6",
-    "simple-mind-map": "^0.5.11",
+    "simple-mind-map": "^0.6.14",
     "html2json": "^1.0.2",
     "@tiptap/extension-image": "^2.0.3",
     "@tiptap/starter-kit": "^2.0.3",

package/src/components/editor/src/butJson.js

@@ -64,7 +64,10 @@ export function butJson (editor,data) {
             name: '标注编号',
             key: 'numberMenu',
             menuKeys: [],
-            html: `<sup>[${menusData(data,'numberMenu').text}]</sup>`
+            html: [
+                `<sup>[${menusData(data,'numberMenu').text}]</sup>`,
+                `<sup>[${menusData(data,'numberMenu').text}]</sup><span> </span>`
+            ]
         },
         keywordMenu: {
             name: '关键词',
@@ -91,7 +94,8 @@ export function butJson (editor,data) {
             html: [
                 `<sup>${num[numSort(editor)]}</sup>`,
                 `<hr class="custom-link" contenteditable="false">`,
-                `<p data-signId="s-${numSort(editor)}"><span style="font-family: KaiTi">${num[numSort(editor)]}填写标注内容<span></p>`
+                `<p data-signId="s-${numSort(editor)}"><span style="font-family: KaiTi">${num[numSort(editor)]}填写标注内容<span></p>`,
+                `<sup>${num[numSort(editor)]}</sup><span> </span>`,
             ],
             index: numSort(editor)
         },
@@ -155,4 +159,4 @@ function getTime() {
     let month = date.getMonth() + 1
     let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
     return year + '年' + month + '月' + day + '日'
-}
+}

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

@@ -704,14 +704,11 @@ export default {
             }
             // 标注编号
             if (data.key === 'numberMenu') {
-                // const {path, pos} = this.editor.state.selection.$head
+                let index = 0
+                const {path, pos} = this.editor.state.selection.$head
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                // if(path[5] === pos) {
-                //     this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-                // }else {
-                //     this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-                // }
-                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                if(path[5] === pos) index = 1
+                this.editor.chain().focus().insertContentAt(this.selection(), html[index]).run()
             }
             // 关键词
             if (data.key === 'keywordMenu') {
@@ -747,15 +744,18 @@ export default {
             }
             // 添加标注
             if (data.key === 'taggingMenu') {
-                const index = this.editor.state.selection.$anchor.path[1] // 获取当前光标所行数
+                let ind = 0
+                const {path, pos} = this.editor.state.selection.$head
+                let index = this.editor.state.selection.$anchor.path[1] // 获取当前光标所行数
                 const content = this.editor.state.selection.$anchor.path[0].content.content // 获取内容
                 const name = content[index + 1]?.type.name
                 const num = this.cursorPosition(content, index) // 获取当前光标位置
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                this.editor.chain().focus().insertContentAt(this.selection(), html[0]).run()
+                if(path[5] === pos) ind = 3
+                this.editor.chain().focus().insertContentAt(this.selection(), html[ind]).run()
                 const si = butJson(this.editor, this.menusText)[data.key].index - 1 // 获取标记的位置
-                const signID = this.selectionPath(`s-${si}`)
-                if (name !== 'horizontalRule') {
+                const signID = this.selectionPath(`s-${si}`) // 获取标记的位置
+                if (name !== 'horizontalRule') { // 判断是否有分割线
                     this.editor.chain().focus().insertContentAt(num, html[1]).run()
                     this.editor.chain().focus().insertContentAt(num + 2, html[2]).run()
                 } else {
@@ -855,7 +855,7 @@ export default {
 }
 
 :deep(.read-only-p p) {
-    line-height: 26px;
+    line-height: 24px;
     text-align: justify;
 }
 
@@ -964,7 +964,7 @@ label {
 }
 
 .editing-cont :deep(p) {
-    line-height: 26px;
+    line-height: 24px;
 }
 .editing-cont :deep(img) {
     padding: 5px 0;
@@ -1125,4 +1125,4 @@ li {
         width: 100%;
     }
 }
-</style>
+</style>

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

@@ -447,20 +447,20 @@ export default {
     display: none !important;
 }
 .editor :deep(h1) {
-    line-height: 26px;
+    line-height: 24px;
     font-size: 18px;
 }
 .editor :deep(h2) {
-    line-height: 26px;
+    line-height: 24px;
     font-size: 16px;
 }
 .editor :deep(h3) {
-    line-height: 26px;
+    line-height: 24px;
     font-size: 14px;
 }
 .editor :deep(p) {
     font-size: 14px;
-    line-height: 26px;
+    line-height: 24px;
 }
 :deep(.ProseMirror) p.is-editor-empty:first-child::before {
     content: attr(data-placeholder);
@@ -536,7 +536,7 @@ export default {
     padding: 5px 0;
 }
 .ed-cont{
-    padding-top: 6px;
+    padding-top: 4px;
 }
 .editor{
     border-radius: 3px;

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

@@ -114,13 +114,6 @@
 import Select from '../../select/src/select.vue'
 import Coloring from '../../coloring/src/coloring.vue'
 import MindMap from "simple-mind-map";
-import Drag from 'simple-mind-map/src/Drag.js'
-import AssociativeLine from 'simple-mind-map/src/AssociativeLine.js'
-import Export from 'simple-mind-map/src/Export.js'
-import "simple-mind-map/dist/simpleMindMap.esm.css";
-
-// 注册插件
-MindMap.usePlugin(Drag).usePlugin(AssociativeLine).usePlugin(Export)
 
 export default {
     components: {Select, Coloring},

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

@@ -89,7 +89,7 @@ export default {
 .text{
     width: 100%;
     border: 1px solid #ccc;
-    line-height: 26px;
+    line-height: 24px;
     box-sizing: border-box;
     text-indent: 2em;
     background-color: #fff;
@@ -98,4 +98,4 @@ export default {
     content: attr(placeholder);
     color: gray;
 }
-</style>
+</style>

package/src/index.js

@@ -77,7 +77,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.204',
+    version: '1.32.206',
     install,
     Calendar,
     Message,