zydx-plus 1.20.115 → 1.20.116

package/package.json

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

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

@@ -148,8 +148,9 @@ export default defineComponent({
 
 /*工具栏样式*/
 .toolbar {
-    border: 1px solid #d9d9d9;
-    margin-bottom: 20px;
+    border-top: 1px solid #d9d9d9;
+    border-left: 1px solid #d9d9d9;
+    border-right: 1px solid #d9d9d9;
 }
 
 /*工具栏剧中显示*/
@@ -188,4 +189,19 @@ export default defineComponent({
 :deep(.w-e-text-placeholder) {
     top: 6px;
 }
+:deep(.w-e-bar-item) {
+    border-right: 1px solid rgba(204, 204, 204, 1);
+    flex: 1;
+    padding: 0;
+    height: auto;
+}
+:deep(.w-e-bar-item):last-child {
+    border-right: 0;
+}
+:deep(.w-e-bar):last-child {
+    padding: 0;
+}
+:deep(.w-e-bar-item-menus-container) {
+    margin-top: 32px;
+}
 </style>

package/src/components/editor/src/menu.js

@@ -1,5 +1,7 @@
 let signData = null
 let titleData = null
+let authorData = null
+let numberData = null
 
 const num = {1: '①', 2: '②', 3: '③', 4: '④', 5: '⑤', 6: '⑥', 7: '⑦', 8: '⑧', 9: '⑨', 10: '⑩', 11: '⑪', 12: '⑫', 13: '⑬', 14: '⑭', 15: '⑮', 16: '⑯', 17: '⑰', 18: '⑱', 19: '⑲', 20: '⑳',}
 
@@ -181,10 +183,49 @@ class titleButtonMenu {
         editor.insertNode(resume2)
     }
 }
+//作者
+class authorButtonMenu {
+    constructor(v) {
+        authorData = v
+        this.title = '添加作者' // 自定义菜单标题
+        this.tag = 'button'
+    }
+    // 获取菜单执行时的 value ，用不到则返回空 字符串或 false
+    getValue(editor) {
+        return false
+    }
+    // 菜单是否需要激活（如选中加粗文本，“加粗”菜单会激活），用不到则返回 false
+    isActive(editor) {
+        return false
+    }
+    // 菜单是否需要禁用（如选中 H1 ，“引用”菜单被禁用），用不到则返回 false
+    isDisabled(editor) {
+        return false
+    }
+    // 点击菜单时触发的函数
+    exec(editor, value) {
+        if (this.isDisabled(editor)) return
+        const resume = {
+            type: 'paragraph',
+            children: [{
+                type: 'authorAttachment',
+                fileName: authorData.text,
+                children: [{text:''}]
+            }],
+            textAlign: 'center'
+        }
+        const resume2 = {
+            type: 'paragraph',
+            children: [{text:''}],
+            textAlign: 'left'
+        }
+        editor.insertNode(resume)
+        editor.insertNode(resume2)
+    }
+}
 // 添加参考文献
 class literatureButtonMenu {
     constructor(v) {
-        titleData = v
         this.title = '参考文献' // 自定义菜单标题
         this.tag = 'button'
     }
@@ -245,7 +286,6 @@ class literatureButtonMenu {
 // 添加标注
 class taggingButtonMenu {
     constructor(v) {
-        titleData = v
         this.title = '添加标注' // 自定义菜单标题
         this.tag = 'button'
     }
@@ -260,32 +300,143 @@ class taggingButtonMenu {
     }
     exec(editor, value) {
         if (this.isDisabled(editor)) return
-        const anchor = editor.selection.anchor
+        const anchor = editor.selection.anchor // 获取光标位置
         if(anchor.offset === 0) return
         let node = editor.children
         let nodes = JSON.parse(JSON.stringify(node)) //拷贝一份
         const numSub = hasValue(nodes,'sup')
-        let one = nodes[0]
-        nodes.splice(0,1)
-        nodes.unshift({
-            type: 'attachment',
-            text: one.children[0].text
-        })
+        // let one = nodes[0]
+        // nodes.splice(0,1)
+        // nodes.unshift({
+        //     type: 'attachment',
+        //     text: one.children[0].text
+        // })
+        let textNode = nodes[anchor.path[0]].children[anchor.path[1]].text
+        const left = textNode.substring(0, anchor.offset)
+        const right = textNode.substring(anchor.offset)
+        nodes[anchor.path[0]].children[anchor.path[1]].text = left
         nodes[anchor.path[0]].children.push({
             text: num[numSub+1],
             sup: true
-        },{text: ' '})
-        nodes.push({
+        },{text: right})
+        const devider = {
             type: 'divider',
             children: [{text:''}]
-        })
-        nodes.push({
+        }
+        const devider2 = {
             type: 'paragraph',
             children: [{
+                state: numSub+1,
                 text: `${num[numSub+1]}填写标注内容`,
+                fontSize: '12px'
             }],
             textAlign: 'left'
-        })
+        }
+        let nodeType = (nodes[anchor.path[0] + 1])? nodes[anchor.path[0] + 1].type : ''
+        let deviderData = [devider,devider2]
+        if(nodeType === 'divider') deviderData = [devider2]
+        nodes.splice(anchor.path[0] + 1, 0, deviderData)
+        addNode(editor,nodes)
+    }
+}
+// 摘要
+class abstractButtonMenu {
+    constructor(v) {
+        this.title = '添加摘要' // 自定义菜单标题
+        this.tag = 'button'
+    }
+    getValue(editor) {
+        return false
+    }
+    isActive(editor) {
+        return false
+    }
+    isDisabled(editor) {
+        return false
+    }
+    exec(editor, value) {
+        if (this.isDisabled(editor)) return
+        const resume = {
+            type: 'paragraph',
+            children: [{
+                text: '        摘要：',
+                color: '#000000',
+                fontSize: '12px',
+                bold: true
+            },{
+                text: '请填写摘要内容',
+                color: '#000000',
+                fontSize: '12px',
+            }],
+            textAlign: 'left'
+        }
+        editor.insertNode(resume)
+    }
+}
+//关键词
+class keywordButtonMenu {
+    constructor(v) {
+        this.title = '关键词' // 自定义菜单标题
+        this.tag = 'button'
+    }
+    getValue(editor) {
+        return false
+    }
+    isActive(editor) {
+        return false
+    }
+    isDisabled(editor) {
+        return false
+    }
+    exec(editor, value) {
+        if (this.isDisabled(editor)) return
+        const resume = {
+            type: 'paragraph',
+            children: [{
+                text: '        关键词：',
+                color: '#000000',
+                fontSize: '12px',
+                bold: true
+            },{
+                text: '请填写关键词内容',
+                color: '#000000',
+                fontSize: '12px',
+            }],
+            textAlign: 'left'
+        }
+        editor.insertNode(resume)
+    }
+}
+// 编号
+class numberButtonMenu {
+    constructor(v) {
+        numberData = v
+        this.title = '标注编号' // 自定义菜单标题
+        this.tag = 'button'
+    }
+    getValue(editor) {
+        return false
+    }
+    isActive(editor) {
+        return false
+    }
+    isDisabled(editor) {
+        return false
+    }
+    exec(editor, value) {
+        if (this.isDisabled(editor)) return
+        const anchor = editor.selection.anchor // 获取光标位置
+        if(anchor.offset === 0) return
+        let node = editor.children
+        let nodes = JSON.parse(JSON.stringify(node)) //拷贝一份
+        let textNode = nodes[anchor.path[0]].children[anchor.path[1]].text
+        const left = textNode.substring(0, anchor.offset)
+        const right = textNode.substring(anchor.offset)
+        nodes[anchor.path[0]].children[anchor.path[1]].text = left
+        nodes[anchor.path[0]].children.push({
+            text: `【${numberData.text}】`,
+            sup: true
+        },{text: right})
         addNode(editor,nodes)
     }
 }
@@ -322,7 +473,31 @@ const taggingMenuConf = {
         return new taggingButtonMenu(v)
     },
 }
+const authorMenuConf = {
+    key: 'authorMenu',
+    factory(v) {
+        return new authorButtonMenu(v)
+    },
+}
+const abstractMenuConf = {
+    key: 'abstractMenu',
+    factory() {
+        return new abstractButtonMenu()
+    },
+}
+const keywordMenuConf = {
+    key: 'keywordMenu',
+    factory() {
+        return new keywordButtonMenu()
+    },
+}
+const numberMenuConf = {
+    key: 'numberMenu',
+    factory(v) {
+        return new numberButtonMenu(v)
+    },
+}
 
 export const menuModule = {
-    menus: [signMenuConf,redMenuConf,titleMenuConf,literatureMenuConf,taggingMenuConf]
+    menus: [signMenuConf,redMenuConf,titleMenuConf,literatureMenuConf,taggingMenuConf,authorMenuConf,numberMenuConf,abstractMenuConf,keywordMenuConf]
 }

package/src/components/editor/src/node.js

@@ -48,7 +48,27 @@ function titleAttachment(elem, children, editor) {
     )
     return attachVnode
 }
-
+// 作者
+function authorAttachment(elem, children, editor) {
+    const iconText = h(
+        'span',
+        {
+            props: { contentEditable: false },
+            style: {display: 'inline-block',fontSize: '16px'}
+        },
+        [ elem.fileName ]
+    )
+    const attachVnode = h(
+        'span',
+        {
+            props: { contentEditable: false },
+            style: { display: 'inline-block'},
+            // on: { click() { console.log('clicked', link) } }
+        },
+        [ iconText]
+    )
+    return attachVnode
+}
 
 const renderElemConf = {
     type: 'attachment',
@@ -58,7 +78,11 @@ const titleElemConf = {
     type: 'titleAttachment',
     renderElem: titleAttachment,
 }
+const authorElemConf = {
+    type: 'authorAttachment',
+    renderElem: authorAttachment,
+}
 
 export const nodeModule = {
-    renderElems: [renderElemConf,titleElemConf]
+    renderElems: [renderElemConf,titleElemConf,authorElemConf]
 }

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

@@ -24,7 +24,9 @@
                 <p :style="enclosureStyle">{{ enclosureText }}</p>
                 <div class="enclosure-list" v-for="(item,index) in uploadAttData">
                     <div class="enclosure-item">
-                        <span>{{ index + 1 }}. {{ (item.name)? item.name : item.annexName }}</span>
+                        <span v-if="item.name">{{ index + 1 }}. {{ item.name }}</span>
+                        <span v-if="item.annexName">{{ index + 1 }}. {{ item.annexName }}</span>
+                        <span v-if="item.fileName">{{ index + 1 }}. {{ item.fileName }}</span>
                     </div>
                     <div class="enclosure-item en-but">
                         <div style="display: inline-block; height: 21px;">

package/src/index.js

@@ -63,7 +63,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.20.115',
+    version: '1.20.116',
     install,
     Calendar,
     Message,