zydx-plus 1.20.116 → 1.20.118

package/package.json

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

package/src/components/buttonGroup/src/buttonGroup.vue

@@ -1,6 +1,10 @@
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
+export const FILE_ERROR = {
+  SIZE: 'SIZE_ERROR',
+  TYPE: 'TYPE_ERROR'
+}
 export default defineComponent({
   name: 'zydx-button-group',
   props: {
@@ -41,23 +45,15 @@ export default defineComponent({
       }
 
     },
-    onInputChange({ event, accept = [], file_size = 2, cb, disabled }) {
+    onInputChange({ event, accept = [], onError = () => null, file_size = 2, cb, disabled }) {
       if (disabled) return
       let file = event.target.files[0]
       if (file.size > file_size * 1024 * 1024) {
-        this.$message({
-          title: '提示',
-          promptContent: `文件大小不能超过${file_size}M`,
-          cancelShow: false,
-        })
+        onError({ type: FILE_ERROR.SIZE })
         return
       }
       if (accept.length && !accept.includes(file.type)) {
-        this.$message({
-          title: '提示',
-          promptContent: `请选择${accept.join('、')}格式的文件`,
-          cancelShow: false,
-        })
+        onError({ type: FILE_ERROR.TYPE })
         return
       }
       cb(file)
@@ -82,25 +78,43 @@ export default defineComponent({
   },
   render() {
     const { trackClick, onInputChange, showSearch, handleSearch, handleClose, is_show_search } = this
-    const render = ({ type, name, accept = '', file_size, flip = null, ignore = false, onClick, disabled, idx }) => {
+    const render = ({ type, name, accept = '', file_size, flip = null, ignore = false, onClick, onError, disabled, idx, data_id }) => {
       let active_name = flip ? flip : name
       switch (type) {
-        case 'button':
-          return <button
-            class={this.active_state[idx] ? 'z-button active' : 'z-button'}
-            onClick={() => { onClick(); ignore ? () => null : trackClick(idx) }
-            }
-            disabled={disabled}
-          >
-            {this.active_state[idx] ? active_name : name}
-          </button>
-        case 'file':
-          return <label class={disabled ? 'z-button disabled' : 'z-button'} >
-            <span>{name}</span>
+        case 'button': {
+          let curr_name = this.active_state[idx] ? active_name : name
+          let btn = h(
+            <button
+              class={this.active_state[idx] ? 'z-button active' : 'z-button'}
+              data-id={data_id}
+              onClick={() => { onClick(); ignore ? () => null : trackClick(idx) }
+              }
+              disabled={disabled}
+            >
+            </button>,
             {
-              disabled ? null : <input type="file" class="hidden" onClick={(e) => e.target.value = null} onChange={(e) => onInputChange({ event: e, accept, file_size, cb: onClick, disabled })}></input>
+              innerHTML: curr_name
             }
-          </label>
+          )
+          return btn
+        }
+        case 'file': {
+          let btn = h('label', { class: disabled ? 'z-button disabled' : 'z-button' },
+            [
+              h('span', { innerHTML: name }),
+              disabled
+                ? null
+                : h('input', {
+                  type: 'file',
+                  class: 'hidden',
+                  'data-id': data_id,
+                  onClick: (e) => e.target.value = null,
+                  onChange: (e) => onInputChange({ event: e, accept, file_size, cb: onClick, onError, disabled })
+                })
+            ]
+          )
+          return btn
+        }
         case 'search':
           return is_show_search
             ?
@@ -118,6 +132,7 @@ export default defineComponent({
             </div>
             : <button
               class="z-button"
+              data-id={data_id}
               onClick={showSearch}
             >
               {name}
@@ -128,8 +143,8 @@ export default defineComponent({
       <div class="z-button-group">
         {
           this.buttons
-            .map(({ onClick, disabled, file_size, accept, flip, ignore, type = "button", name }, idx) => {
-              return render({ type, name, accept, file_size, flip, ignore, onClick, disabled, idx })
+            .map(({ onClick, onError, disabled, file_size, accept, flip, ignore, type = "button", name, data_id = '' }, idx) => {
+              return render({ type, name, accept, file_size, flip, ignore, onClick, onError, disabled, idx, data_id })
             }
             )
         }

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

@@ -5,15 +5,35 @@ 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: '⑳',}
 
-function typeCode(node,value) {
+
+function resumeSing() {
+    return {
+        type: 'attachment',
+        fileName: signData.text,
+        link: signData.ico,
+        sign: true,
+        children: [{text:''}]
+    }
+}
+
+function typeCode(node,value,num = false) {
     let hasAttachment = false
-    for(let i = 0; i < node.length; i++){
-        for(let j = 0; j < node[i].children.length; j++){
-            if(node[i].children[j].type === value) {
+    if(num) {
+        for(let i = 0; i < node.length; i++){
+            if(node[i][value]) {
                 hasAttachment = true
                 break
             }
         }
+    }else {
+        for(let i = 0; i < node.length; i++){
+            for(let j = 0; j < node[i].children.length; j++){
+                if(node[i].children[j][value]) {
+                    hasAttachment = true
+                    break
+                }
+            }
+        }
     }
     return hasAttachment
 }
@@ -30,12 +50,31 @@ function hasValue(arr, value) {
     let num = 0
     arr.some(item => {
         item.children.some(items => {
-            if(items.sup) num++
+            if(items[value]) num++
         })
     })
     return num
 }
 
+//分割数组
+function group(array, subNum) {
+    let index = 0;
+    let newArray = [];
+    let num = 0
+    while(index < array.length) {
+        newArray.push(array.slice(index, index += subNum));
+    }
+    for(let i=0; i<newArray[1].length; i++) {
+        if(newArray[1][i].children[0].state === undefined) {
+            num = (i === 0)? 1 : i
+            break;
+        }else {
+            num = (i === 0)? 1 : i
+        }
+    }
+    return num;
+}
+
 //添加标志
 class signButtonMenu {
     constructor(v) {
@@ -61,14 +100,8 @@ class signButtonMenu {
         if (this.isDisabled(editor)) return
         let node = editor.children
         let nodes = JSON.parse(JSON.stringify(node)) //拷贝一份
-        if(typeCode(node,'attachment')) return
-        const resume = {
-            type: 'attachment',
-            fileName: signData.text,
-            link: signData.ico,
-            children: [{text:''}]
-        }
-        nodes.unshift(resume)
+        if(typeCode(nodes,'sign')) return
+        nodes.unshift(resumeSing())
         addNode(editor,nodes)
     }
 }
@@ -95,18 +128,10 @@ class redButtonMenu {
         if (this.isDisabled(editor)) return
         let node = editor.children
         let nodes = JSON.parse(JSON.stringify(node)) //拷贝一份
-        if(nodes[0].children.length === 1) nodes.splice(0,1)
-        let hasAttachment = false
-        for(let i = 0; i < node.length; i++){
-            if(node[i].state === 1) {
-                hasAttachment = true
-                break
-            }
-        }
-        if(hasAttachment) return
+        if(typeCode(nodes,'tou', true)) return
         const resume = {
             type: 'paragraph',
-            state: 1,
+            tou: true,
             children: [
                 {
                     text:'XXXXXXX(单位)文件',
@@ -131,7 +156,9 @@ class redButtonMenu {
             type: 'divider',
             children: [{text:''}]
         }
-        if(typeCode(node,'attachment')) {
+        if(typeCode(node,'sign')) {
+            nodes.splice(0,1)
+            nodes.splice(0,0,resumeSing())
             nodes.splice(1,0,resume)
             nodes.splice(2,0,resume1)
             nodes.splice(3,0,resume2)
@@ -304,20 +331,15 @@ class taggingButtonMenu {
         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
-        // })
+        const numSub = hasValue(nodes,'subs')
         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
+            sup: true,
+            subs: true
         },{text: right})
         const devider = {
             type: 'divider',
@@ -334,8 +356,12 @@ class taggingButtonMenu {
         }
         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)
+        let numNode = -1
+        if(nodeType === 'divider') {
+            numNode = group(nodes,anchor.path[0] + 2)
+            deviderData = [devider2]
+        }
+        nodes.splice(anchor.path[0] + 2 + numNode, 0, deviderData)
         addNode(editor,nodes)
     }
 }

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

@@ -178,7 +178,7 @@ export default {
             default: true
         }
     },
-    emits: ['see','del','complete','update:data','enclosureSuccess','download'],
+    emits: ['see','del','complete','update:data','enclosureSuccess','download','updateData'],
     watch:{
         // 强制监听data变化
         data: {
@@ -214,6 +214,12 @@ export default {
                     }
                 }),
             ],
+            onUpdate: ({ editor }) => {
+                this.$emit('updateData', {
+                    html: html2json(editor.getHTML()).child,
+                    enclosure: this.uploadAttData
+                })
+            },
         })
     },
     methods: {

package/src/index.js

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