zydx-plus 1.30.166 → 1.30.168

package/package.json

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

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

@@ -139,7 +139,7 @@ export default {
                     this.signMenuShow = true
                     e.shift()
                 }
-                this.editor?.commands.setContent(json2html({node: "root",child: (e === undefined)? [] : e}))
+                this.editor?.commands.setContent(json2html({node: "root",child: (e === undefined || null)? [] : e}))
                 if(this.readOnly) {
                     if(this.page) this.editableShow = true
                     setTimeout(() => {
@@ -151,7 +151,6 @@ export default {
                 }
             },
             deep: true,
-            immediate: true
         },
         readOnly: {
             handler: function (e, oldVal) {
@@ -168,8 +167,13 @@ export default {
     },
     mounted() {
         const _this = this
+        let dataHtml = json2html({node: "root",child: (_this.html === undefined || null)? [] : _this.html})
+        if(dataHtml[0]?.tag === 'sign') {
+            this.signMenuShow = true
+            dataHtml.shift()
+        }
         _this.editor = new Editor({
-            content: '',
+            content: dataHtml,
             editable: !_this.readOnly,
             extensions: [
                 signId, // 签名
@@ -333,7 +337,7 @@ export default {
         uploadFile(file,data) {
             let _this = this
             return new Promise((rl,re) => {
-                const meta = Object.keys(data.meta)
+                const meta = data.meta? Object.keys(data.meta): []
                 const param = new FormData()
                 param.append('file', file)
                 for(let i = 0; i < meta.length; i++) {

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

@@ -191,7 +191,7 @@ export default {
         // 强制监听data变化
         data: {
             handler: function (e, oldVal) {
-                this.editor.commands.setContent(json2html({node: "root",child: (e.html === undefined)? [] : e.html}))
+                this.editor.commands.setContent(json2html({node: "root",child: (e.html === undefined || null)? [] : e.html}))
                 this.uploadAttData = (e.enclosure === undefined)? [] : this.enclosureAction(e.enclosure)
             },
             deep: true
@@ -212,7 +212,7 @@ export default {
         const height = this.height.split('px')[0] - 44
         this.heightStyleCont = (this.height === '100%')? {height: 'calc(100% - 44px)'} : {'min-height': `${height}px`}
         this.editor = new Editor({
-            content: json2html({node: "root",child: (this.data.html === undefined)? [] : this.data.html}),
+            content: json2html({node: "root",child: (this.data.html === undefined || null)? [] : this.data.html}),
             editable: this.readOnly,
             extensions: [
                 sid,
@@ -283,7 +283,7 @@ export default {
         },
         uploadFile(file,data) {
             return new Promise((rl,re) => {
-                const meta = Object.keys(data.meta)
+                const meta = data.meta? Object.keys(data.meta): []
                 const param = new FormData()
                 param.append('file', file)
                 for(let i = 0; i < meta.length; i++) {

package/src/index.js

@@ -71,7 +71,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.30.166',
+    version: '1.30.168',
     install,
     Calendar,
     Message,