zydx-plus 1.32.203 → 1.32.205

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.203",
+  "version": "1.32.205",
   "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

@@ -356,7 +356,7 @@ export default {
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
             this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth
             if(this.wit > 900) this.wit = 900
-            let max = this.wit * 1.4
+            let max = this.wit * 1.4 - 200
             let pHeight = 0
             let html = ''
             for (let i = 0; i < data.length; i++) {
@@ -381,12 +381,12 @@ export default {
                     html = ''
                 }
                 if ((pHeight + text) > max) {
-                    const {start, end} = this.rows(data[i], max - pHeight)
-                    html += `<p>${start.data}</p>`
+                    const {start, end, size} = this.rows(data[i], max - pHeight)
+                    html += `<p class="text"><span style="font-family: SimSun; font-size: ${size}px">${start.data}</span></p>`
                     this.htmlArr.push(html)
                     pHeight = 0
                     html = ''
-                    html += `<p>${end.data}</p>`
+                    html += `<p class="text"><span style="font-family: SimSun;font-size: ${size}px">${end.data}</span></p>`
                     pHeight = end.size
                 }else {
                     pHeight += text
@@ -412,7 +412,9 @@ export default {
             let end = text.slice(textLen)
             return {
                 start: {data: start, size: num},
-                end: {data: end, size: height - num}
+                end: {data: end, size: height - num},
+                size: size,
+                // family: fontFamily.replace(/\"/g,"")
             }
         },
         measureText (text, fontSize=10, max=0) {
@@ -702,8 +704,11 @@ export default {
             }
             // 标注编号
             if (data.key === 'numberMenu') {
+                let index = 0
+                const {path, pos} = this.editor.state.selection.$head
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                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') {
@@ -739,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 {
@@ -1117,4 +1125,4 @@ li {
         width: 100%;
     }
 }
-</style>
+</style>

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

@@ -4,12 +4,12 @@
             <div class="ed-title" v-if="titleShow" :style="titleStyle" v-html="title"></div>
             <div class="ed-but" v-if="readOnly">
                 <div class="ed-head-but" v-for="(item,index) in toolbar">
-                    <button v-if="item.key === 'but'" class="but" @click="item.onClick(item,info)" :style="{color: (item.active)? '#00ff00' :'#000'}">{{ item.title }}</button>
+                    <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)" :style="{color: (item.active)? '#00ff00' :'#000'}">{{ item.title }}</button>
                     <label v-else-if="item.key === 'upImg' || item.key === 'uploadAtt'">
                         <input type="file" @change="upload($event,item.key)" :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;">
-                        <span class="but">{{ item.title }}</span>
+                        <span class="buts">{{ item.title }}</span>
                     </label>
-                    <button v-else class="but" @click="toolTap(item.key)">{{ item.title }}</button>
+                    <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
                 </div>
             </div>
         </div>
@@ -549,7 +549,7 @@ export default {
   .ed-head{
       text-align: right;
   }
-  .but{
+  .buts{
       margin-left: 1px;
       font-size: 12px;
       background-color: transparent;

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

@@ -10,14 +10,15 @@
                 <button :disabled="mindShow" @click="associativeLine">关联线</button>
                 <button :disabled="mindShow" @click="nodeStyle">节点样式</button>
                 <button @click="structure">结构切换</button>
-                <button @click="preservation">保存</button>
+                <button v-if="protectShow" @click="preservation">保存</button>
             </div>
             <button @click="fullTap" v-if="fullShow">全屏</button>
             <button @click="fullDel" v-else>退出</button>
         </div>
         <div :id="id" class="mindMapContainer"></div>
-        <div class="node-style" ref="nodeStyle" :class="{'node-s': trans, 'node-h': !trans}">
+        <div class="node-style" :ref="id+'e'" :class="{'node-s': trans, 'node-h': !trans}">
             <div class="style-li">
+                <img @click="nodeStyle" src="data:image/png;base64,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" alt="" />
                 <div class="style-title">文字</div>
                 <div class="style-list">
                     <div class="node-left zIndex2">
@@ -113,20 +114,13 @@
 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},
     name: "zydx-mind",
     data() {
         return {
-            id: '',
+            id: null,
             mindMap: null,
             mindShow: false,
             retShow: false,
@@ -218,17 +212,26 @@ export default {
             type: Boolean,
             default: false
         },
+        protectShow: {
+            type: Boolean,
+            default: true
+        }
     },
     watch: {
         readOnly: {
             handler: function (val, oldVal) {
                 this.mindMap?.setMode(val ? 'readonly' : 'edit')
             },
+            deep: true,
             immediate: true
         },
         data: {
             handler: function (val, oldVal) {
-                this.mindMap?.setData(val)
+                if(Object.keys(val).length === 0) {
+                    this.mindMap?.setData(this.defaultData)
+                }else {
+                    this.mindMap?.setData(val)
+                }
             },
             immediate: true
         },
@@ -274,10 +277,10 @@ export default {
         },
     },
     mounted() {
-        this.id = Math.random().toString(36).substr(2)
+        this.id = this.randomId()
         setTimeout(() => {
             this.init()
-        },0)
+        }, 0)
         window.onresize = () => {
             if (!document.fullscreenElement) {
                 this.fullShow = true
@@ -286,6 +289,10 @@ export default {
         }
     },
     methods: {
+        randomId() {
+            const id = Math.random().toString(36).substr(2)
+            return id.replace(/[0-9]/g, '')
+        },
         fullScreen(element) {
             if (element.requestFullScreen) {
                 element.requestFullScreen()
@@ -317,14 +324,15 @@ export default {
         },
         // 初始化
         init() {
+            const that = this
             this.mindMap = new MindMap({
-                el: document.getElementById(this.id),
+                el: document.getElementById(that.id),
                 enableFreeDrag: false, // 是否开启自由拖拽
                 enableNodeTransitionMove: false, // 是否开启节点过渡动画
                 layout: 'logicalStructure', // 节点布局方式
                 maxHistoryCount: 100, // 最大历史记录数
                 maxNodeCacheCount: 100, // 最大节点缓存数
-                data: Object.keys(this.data).length === 0 ? this.defaultData : this.data
+                data: Object.keys(that.data).length === 0 ? that.defaultData : that.data
             });
             this.mindMap.setMode(this.readOnly ? 'readonly' : 'edit')
             this.mindMap.on('node_active', (node, activeNodeList) => {
@@ -398,14 +406,25 @@ export default {
                 })
             })
         },
+        getContent() {
+            let that = this
+            return new Promise((rl,rs) => {
+                that.mindMap.export('png', false, '123213', true).then(r => {
+                    rl({
+                        data: that.mindMap.getData(),
+                        url: r
+                    })
+                })
+            })
+        },
         nodeStyle() {
-            this.$refs.nodeStyle.style.display = 'block'
-            this.$refs.mind.style.overflow = 'hidden'
+            this.$refs[`${this.id}e`].style.display = 'block'
+            this.$refs[this.id].style.overflow = 'hidden'
             this.trans = !this.trans
             setTimeout(() => {
-                this.$refs.mind.style.overflow = 'visible'
+                this.$refs[this.id].style.overflow = 'visible'
                 if (!this.trans) {
-                    this.$refs.nodeStyle.style.display = 'none'
+                    this.$refs[`${this.id}e`].style.display = 'none'
                 }
             }, 250)
         },
@@ -438,6 +457,7 @@ export default {
 </script>
 
 <style scoped>
+
 .table-left {
     display: inline-block;
     margin-right: 5px;
@@ -558,7 +578,18 @@ export default {
     box-shadow: rgba(0, 0, 0, 0.06) 0 2px 16px 0;
     z-index: 10;
 }
-
+.style-li{
+    position: relative;
+}
+.style-li img{
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    width: 15px;
+    height: 15px;
+    cursor: pointer;
+}
 .style-list {
     display: flex;
     padding: 5px 0;

package/src/index.js

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