zydx-plus 1.32.193 → 1.32.195

package/package.json

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

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

@@ -355,7 +355,7 @@ export default {
             this.htmlArr = []
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
             this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth
-            let max = this.wit * 1.4 - 200
+            let max = this.wit * 1.4
             let pHeight = 0
             let html = ''
             for (let i = 0; i < data.length; i++) {
@@ -401,8 +401,7 @@ export default {
             let height = data.offsetHeight
             let rows = Math.round(num / line)  // 行数
             let text = data.innerText
-            let len = this.measureText(text,size) // 文本宽度
-            let textLen = Math.round((width / (len/text.length)) * rows) // 文本长度
+            let textLen = this.measureText(text,size,width * rows)
             let start = text.slice(0, textLen)
             let end = text.slice(textLen)
             return {
@@ -410,31 +409,46 @@ export default {
                 end: {data: end, size: height - num}
             }
         },
-        measureText (text, fontSize=10) {
+        measureText (text, fontSize=10, max=0) {
             text = String(text);
             text = text.split('');
+            let num = 0
             let width = 0;
-            text.forEach(function(item) {
-                if (/[a-zA-Z]/.test(item)) { // 英文匹配
+            for (let i = 0; i< text.length; i++) {
+                if(max !== 0) {
+                    if(width * fontSize / 10 >= max) {
+                        return num
+                    }
+                }
+                if (/[a-zA-Z]/.test(text[i])) { // 英文匹配
                     width += 7;
-                } else if (/[0-9]/.test(item)) { // 数字匹配
+                    num += 1
+                } else if (/[0-9]/.test(text[i])) { // 数字匹配
                     width += 5.5;
-                } else if (/\./.test(item)) { // 英文句点匹配
+                    num += 1
+                } else if (/\./.test(text[i])) { // 英文句点匹配
                     width += 2.7;
-                } else if (/-/.test(item)) { // 英文减号匹配
+                    num += 1
+                } else if (/-/.test(text[i])) { // 英文减号匹配
                     width += 3.25;
-                } else if (/[\u4e00-\u9fa5]/.test(item)) { //中文匹配
-                    width += 10;
-                } else if (/\(|\)/.test(item)) { // 括号匹配
+                    num += 1
+                } else if (/[\u4e00-\u9fa5]/.test(text[i])) { //中文匹配
+                    width += 10.105;
+                    num += 1
+                } else if (/\(|\)/.test(text[i])) { // 括号匹配
                     width += 3.73;
-                } else if (/\s/.test(item)) { // 空格匹配
+                    num += 1
+                } else if (/\s/.test(text[i])) { // 空格匹配
                     width += 2.5;
-                } else if (/[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(item)) { // 英文符号匹配
+                    num += 1
+                } else if (/[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(text[i])) { // 英文符号匹配
                     width += 8;
+                    num += 1
                 } else {
                     width += 10;
+                    num += 1
                 }
-            });
+            }
             return width * fontSize / 10;
         },
         confirm() {
@@ -516,7 +530,7 @@ export default {
                             const cla = this.randomId()
                             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.selectionClass2(cla)
+                            if(this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
                             if(this.selectionClass(cla)) {
                                 this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
                             }
@@ -562,7 +576,7 @@ export default {
             const cla = this.randomId()
             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.selectionClass2(cla)
+            if(this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
             if(this.selectionClass(cla)) {
                 this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
             }
@@ -832,6 +846,7 @@ export default {
 
 :deep(.read-only-p p) {
     line-height: 25px;
+    text-align: justify;
 }
 
 .read-only-a {

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

@@ -347,7 +347,7 @@ export default {
             const html = `<p class="imgCont ${cla}"><img src="${url}" alt="" /></p>`
             this.editor.chain().focus().insertContentAt(this.selection(),html).run()
             console.log(this.selection())
-            if(this.selection() <= 6) this.selectionClass2(cla)
+            if(this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
             if(this.selectionClass(cla)) {
                 this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
             }

package/src/components/textarea/src/textarea.vue

@@ -91,6 +91,7 @@ export default {
        border: 1px solid #ccc;
        line-height: 30px;
        box-sizing: border-box;
+       text-indent: 2em;
        background-color: #fff;
    }
 .text[contenteditable]:empty:before {

package/src/index.js

@@ -77,7 +77,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.193',
+    version: '1.32.195',
     install,
     Calendar,
     Message,