zydx-plus 1.35.585 → 1.35.586

package/package.json

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

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

@@ -1128,10 +1128,20 @@ export default {
             const selection = state.selection.$from.parent.attrs
             const ids = selection?.lineHeightId?.split(' ')
             if (ids && img) {
-              this.imageStyle.width = view.dom.children[0].children[0].offsetWidth - 5 + 'px'
-              this.imageStyle.height = view.dom.children[0].children[0].offsetHeight - 5 + 'px'
-              this.imageStyle.top = view.dom.offsetTop + 2 + 'px'
-              this.imageStyle.left = view.dom.offsetLeft + 2 + view.dom.children[0].children[0].offsetLeft + 'px'
+              if(!state.selection.node) {
+                this.imageStyle.width = '0px'
+                this.imageStyle.height = '0px'
+                this.imageStyle.top = '0px'
+                this.imageStyle.left = '0px'
+                _this.imgMenuShow = false
+                return false
+              }
+              const imgSrc = state.selection.node.attrs.src;
+              const imgDom = editor.view.dom.querySelector(`img[src="${imgSrc}"]`);
+              this.imageStyle.width = imgDom.offsetWidth + 'px'
+              this.imageStyle.height = imgDom.offsetHeight + 'px'
+              this.imageStyle.top = view.dom.offsetTop + imgDom.offsetTop + 'px'
+              this.imageStyle.left = view.dom.offsetLeft + imgDom.offsetLeft + 'px'
               // 获取图片宽度百分比
               const attWidth = state.selection.node? state.selection.node.attrs.width : 100
               const width = attWidth ? parseInt(attWidth) : 100
@@ -2490,15 +2500,6 @@ export default {
       if (this.signMenuShow) {
         data.sign = sign
       }
-      // data.push(this.editor.getJSON())
-      // if (this.signMenuShow) {
-      //   data.unshift({
-      //     node: 'element',
-      //     tag: 'sign',
-      //     child: []
-      //   })
-      // }
-      // data.push({type: 'interpositionData', data: [...this.interpositionData]})
       this.$emit('confirm', data)
     },
     getConfirm() {
@@ -2515,19 +2516,6 @@ export default {
       if (this.signMenuShow) {
         data.sign = sign
       }
-      // let data = []
-      // data.push(this.editor.getJSON())
-      // if (this.signMenuShow) {
-      //   data.unshift({
-      //     node: 'element',
-      //     tag: 'sign',
-      //     child: []
-      //   })
-      // }
-      // data.push({
-      //   type: 'interpositionData',
-      //   data: this.interpositionData
-      // })
       return data
     },
     changeOutlineMenu() {
@@ -2689,7 +2677,7 @@ export default {
             up.customInsert(res, (data) => {
               setTimeout(() => {
                 const cla = this.randomId()
-                const html = `<p contenteditable="false" class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
+                const html = `<p class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
                 this.editor.chain().focus().insertContentAt(this.selection(), html).run()
                 if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
                 if (this.selectionClass(cla)) {
@@ -2785,7 +2773,7 @@ export default {
       if (this.imgUrl === '') return
       if (this.imgPopType === 'insertImage') {
         const cla = this.randomId()
-        const html = `<p contenteditable="false" class="imgCont ${cla}"><img src="${this.imgUrl}" alt="" /></p>`
+        const html = `<p class="imgCont ${cla}"><img src="${this.imgUrl}" alt="" /></p>`
         this.editor.chain().focus().insertContentAt(this.selection(), html).run()
         if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
         if (this.selectionClass(cla)) {
@@ -4587,7 +4575,7 @@ label {
 }
 
 .editing-cont :deep(img) {
-  padding: 5px;
+  padding: 3px;
 }
 
 li {

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.585',
+    version: '1.35.586',
     install,
     Calendar,
     Message,