zydx-plus 1.33.381 → 1.33.382

package/package.json

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

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

@@ -1920,98 +1920,100 @@ export default {
     readOnlyPage() { // 只读分页
       this.htmlArr = []
       const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
-      this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth + 20
-      if (this.wit > 900) this.wit = 900
-      let max = this.wit * 1.6 - 46
-      let pHeight = 0
-      let html = ''
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].className === 'custom-link') { // 分割线
-          pHeight += 21
-          html += data[i].outerHTML
-          continue
-        }
-        if (data[i].firstChild.localName === 'img') {
-          const img = data[i].firstChild
-          const imgHeight = img.offsetHeight
-          if ((pHeight + imgHeight) > max) {
+      this.$nextTick(()=>{
+        this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth + 20
+        if (this.wit > 900) this.wit = 900
+        let max = this.wit * 1.6 - 46
+        let pHeight = 0
+        let html = ''
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].className === 'custom-link') { // 分割线
+            pHeight += 21
+            html += data[i].outerHTML
+            continue
+          }
+          if (data[i].firstChild.localName === 'img') {
+            const img = data[i].firstChild
+            const imgHeight = img.offsetHeight
+            if ((pHeight + imgHeight) > max) {
+              this.htmlArr.push(html)
+              pHeight = 0
+              html = ''
+            }
+          }
+          if (data[i].dataset?.signid === 'splitLine') {
             this.htmlArr.push(html)
             pHeight = 0
             html = ''
           }
-        }
-        if (data[i].dataset?.signid === 'splitLine') {
-          this.htmlArr.push(html)
-          pHeight = 0
-          html = ''
-        }
-        if (data[i].dataset?.signid === 'ack') {
-          this.htmlArr.push(html)
-          pHeight = 0
-          html = ''
-        }
-        let text = data[i].offsetHeight
-        if ((pHeight + text) > max) {
-          const {start, end, size} = this.rows(data[i], max - pHeight)
-          let child = data[i].childNodes[0]
-          let childNodes = data[i].childNodes[0].childNodes[0]
-          let fontSize = size
-          let fontFamily = 'Microsoft Yahei'
-          let childBColor = '#fff'
-          let childColor = '#000'
-          let textAlign = window.getComputedStyle(data[i], null).textAlign
-          let color = '#000'
-          let className = data[i].className
-          let signid = data[i].dataset.signid
-          let signidArr = signid ? signid.split('-') : []
-          let label = 'span'
-          if (child && child.nodeName !== '#text') {
-            fontSize = window.getComputedStyle(child, null).fontSize
-            fontFamily = window.getComputedStyle(child, null).fontFamily
-            color = window.getComputedStyle(child, null).color
-          }
-          if (childNodes && childNodes.nodeName === 'MARK') {
-            childBColor = window.getComputedStyle(childNodes, null).backgroundColor
-            childColor = window.getComputedStyle(childNodes, null).color
-          }
-          if (signid && signidArr[0] === 'title') {
-            label = 'strong'
-          } else {
-            label = 'span'
+          if (data[i].dataset?.signid === 'ack') {
+            this.htmlArr.push(html)
+            pHeight = 0
+            html = ''
           }
-          if (child && child.nodeName !== '#text') {
+          let text = data[i].offsetHeight
+          if ((pHeight + text) > max) {
+            const {start, end, size} = this.rows(data[i], max - pHeight)
+            let child = data[i].childNodes[0]
+            let childNodes = data[i].childNodes[0].childNodes[0]
+            let fontSize = size
+            let fontFamily = 'Microsoft Yahei'
+            let childBColor = '#fff'
+            let childColor = '#000'
+            let textAlign = window.getComputedStyle(data[i], null).textAlign
+            let color = '#000'
+            let className = data[i].className
+            let signid = data[i].dataset.signid
+            let signidArr = signid ? signid.split('-') : []
+            let label = 'span'
+            if (child && child.nodeName !== '#text') {
+              fontSize = window.getComputedStyle(child, null).fontSize
+              fontFamily = window.getComputedStyle(child, null).fontFamily
+              color = window.getComputedStyle(child, null).color
+            }
             if (childNodes && childNodes.nodeName === 'MARK') {
-              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}"><mark class="custom-class" data-color="${childBColor}" style="background-color: ${childBColor}; color: ${childColor};">${start.data}</mark></${label}></p>`
+              childBColor = window.getComputedStyle(childNodes, null).backgroundColor
+              childColor = window.getComputedStyle(childNodes, null).color
+            }
+            if (signid && signidArr[0] === 'title') {
+              label = 'strong'
             } else {
-              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}">${start.data}</${label}></p>`
+              label = 'span'
             }
-          } else {
-            html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${size}px;">${start.data}</${label}></p>`
-          }
-          this.htmlArr.push(html)
-          pHeight = 0
-          html = ''
-          if (child && child.nodeName !== '#text') {
-            if (childNodes && childNodes.nodeName === 'MARK') {
-              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}"><mark class="custom-class" data-color="${childBColor}" style="background-color: ${childBColor}; color: ${childColor};">${end.data}</mark></${label}></p>`
+            if (child && child.nodeName !== '#text') {
+              if (childNodes && childNodes.nodeName === 'MARK') {
+                html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}"><mark class="custom-class" data-color="${childBColor}" style="background-color: ${childBColor}; color: ${childColor};">${start.data}</mark></${label}></p>`
+              } else {
+                html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}">${start.data}</${label}></p>`
+              }
+            } else {
+              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}" class="${className}"><${label} style="font-size: ${size}px;">${start.data}</${label}></p>`
+            }
+            this.htmlArr.push(html)
+            pHeight = 0
+            html = ''
+            if (child && child.nodeName !== '#text') {
+              if (childNodes && childNodes.nodeName === 'MARK') {
+                html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}"><mark class="custom-class" data-color="${childBColor}" style="background-color: ${childBColor}; color: ${childColor};">${end.data}</mark></${label}></p>`
+              } else {
+                html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}">${end.data}</${label}></p>`
+              }
             } else {
-              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${fontSize}; font-family: ${fontFamily};color:${color}">${end.data}</${label}></p>`
+              html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${size}px;">${end.data}</${label}></p>`
             }
+            pHeight = end.size
           } else {
-            html += `<p ${signid ? 'data-signid=' + signid : ''} style="text-align: ${textAlign}"><${label} style="font-size: ${size}px;">${end.data}</${label}></p>`
+            pHeight += text
+            if(data[i].dataset?.signid !== 'splitLine'&&data[i].dataset?.signid !== 'referenceSplitLine')html += data[i].outerHTML
+          }
+          if (i === data.length - 1) {
+            this.htmlArr.push(html)
+            pHeight = 0
+            html = ''
+            break
           }
-          pHeight = end.size
-        } else {
-          pHeight += text
-          if(data[i].dataset?.signid !== 'splitLine'&&data[i].dataset?.signid !== 'referenceSplitLine')html += data[i].outerHTML
-        }
-        if (i === data.length - 1) {
-          this.htmlArr.push(html)
-          pHeight = 0
-          html = ''
-          break
         }
-      }
+      })
       // 绑定点击事件
       setTimeout(() => {
         this.documentClick()
@@ -4551,9 +4553,9 @@ li {
   border-bottom: 1px dashed rgba(204, 204, 204, 1);
 }
 :deep(.paging-line)::before{
-  //margin-right: 0.25rem;
+//margin-right: 0.25rem;
 }
 :deep(.paging-line)::after{
-  //margin-left: 0.25rem;
+//margin-left: 0.25rem;
 }
 </style>

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.381',
+    version: '1.33.382',
     install,
     Calendar,
     Message,