zydx-plus 1.33.412 → 1.33.414

package/package.json

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

package/src/components/tab/src/tab.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="tabs cl" :ref="`tabs${id}`" :style="{'text-align': heiStart? 'left': 'center'}">
     <div class="tabs-li" :class="{'tab-active': actives === index}" @click="listTap(index)"
-         v-for="(item,index) in list" :key="index">{{ item[column[0]] }}
-    </div>
+         v-for="(item,index) in list" :key="index" v-html="item[column[0]]"></div>
 <!--    <div v-if="addShow" @click="addTap" class="tabs-li tab-add">+</div>-->
   </div>
 </template>

package/src/components/tagging/src/tagging.vue

@@ -110,6 +110,7 @@ export default {
                     document.getElementById('htmlText').style.width = this.$refs.tagging.offsetWidth + 'px'
                     this.annotationsData = val.annotations
                     setTimeout(() => {
+                        this.page = 0
                         this.readOnlyPage() // 分页
                     },100)
                 })
@@ -160,7 +161,6 @@ export default {
                 let text = data[i].offsetHeight
                 if ((pHeight + text) > max) {
                     const {start, end, size} = this.rows(data[i], max - pHeight)
-                    console.log(start, end, size);
                     html += `<p class="text"><span style="font-size: ${size}px">${start.data}</span></p>`
                     this.htmlArr.push(html)
                     pHeight = 0
@@ -185,6 +185,7 @@ export default {
         // 批注数据整理
         annDataArrange() {
             this.annotationsArr = []
+            console.log(this.annotationsData);
             this.annotationsData.forEach(item => {
                 this.annDataID().forEach(item2 => {
                     if (item.id === item2) {
@@ -199,6 +200,7 @@ export default {
         // 当前页批注数据ID
         annDataID() {
             this.dataID = []
+            console.log('childNodes',this.$refs.tagging.childNodes);
             this.$refs.tagging.childNodes.forEach(item => {
                 this.childNode(item)
             })
@@ -206,7 +208,7 @@ export default {
         },
         childNode(data) {
             data.childNodes.forEach(item => {
-                if(item.nodeName === 'I') {
+                if(item.nodeName === 'I' || item.nodeName === 'SPAN') {
                     this.childNode(item)
                 }else {
                     if(data.classList[1]) { // 判断是否有批注
@@ -218,21 +220,23 @@ export default {
         rows(data,num) {
             let line = ''
             if(window.getComputedStyle(data, null).lineHeight === 'normal') {
-                line = 16.8
+                line = 19
             } else {
                 line = parseInt(window.getComputedStyle(data, null).lineHeight)
             }
             let size = parseInt(window.getComputedStyle(data, null).fontSize)
             let width = data.offsetWidth
             let height = data.offsetHeight
-            let rows = Math.round(num / line)  // 行数
-            let text = data.innerText
+            // let rows = Math.round(num / line)// 总行数
+            // num差了多少
+            let rows = Math.floor(num / line)// 差多少行为一整页 向下取整
+            let text = data.outerHTML
             let textLen = this.measureText(text,size,width * rows)
             let start = text.slice(0, textLen)
             let end = text.slice(textLen)
             return {
                 start: {data: start, size: num},
-                end: {data: end, size: height - num},
+                end: {data: end, size: Math.ceil((height-num)/line)*line},
                 size: size,
             }
         },
@@ -251,6 +255,7 @@ export default {
             this.annotationsArr[index].readable = false
             this.annotationsArr[index].more = true
             this.annotationsArr[index].text = text
+            console.log(this.annotationsArr[index]);
             this.linkFor()
             this.htmlArr.forEach(item => html += item)
             this.$emit('preservation', {
@@ -304,7 +309,7 @@ export default {
             const taggingWidth = this.$refs.tagging.offsetWidth
             const height = className.offsetHeight
             const line = window.getComputedStyle(className, null).lineHeight // 行高
-            const lineNum = (line === 'normal')? 16: parseInt(line)
+            const lineNum = (line === 'normal')? 19: parseInt(line)
             const rows = Math.round(height/lineNum) // 行数
             // 底线条宽度
             let linkWidth = taggingWidth - className.offsetLeft + taggingLeft - className.offsetWidth
@@ -357,13 +362,12 @@ export default {
             this.linkData[index*2].border = true
             this.linkData[index*2+1].border = true
         },
-        measureText (text, fontSize=10, max=0) {
-            text = String(text);
-            text = text.split('');
+        measureText (text, fontSize=10, max='') {
+            text = String(text).split('');
             let num = 0
             let width = 0;
             for (let i = 0; i< text.length; i++) {
-                if(max !== 0) {
+                if(max !== '') {
                     if(width * fontSize / 10 >= max) {
                         return num
                     }
@@ -381,7 +385,8 @@ export default {
                     width += 3.25;
                     num += 1
                 } else if (/[\u4e00-\u9fa5]/.test(text[i])) { //中文匹配
-                    width += 9.6;
+                    // width += 9.6;
+                    width += 10.25;
                     num += 1
                 } else if (/\(|\)/.test(text[i])) { // 括号匹配
                     width += 3.73;
@@ -389,10 +394,14 @@ export default {
                 } else if (/\s/.test(text[i])) { // 空格匹配
                     width += 2.5;
                     num += 1
-                } else if (/[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(text[i])) { // 英文符号匹配
+                } else if (/[`!@#$%^&*()_+\-=\[\]{}':"\\|,.<>\/?~]/.test(text[i])) { // 英文符号匹配
                     width += 8;
                     num += 1
+                }  else if (/[;]/.test(text[i])) { // ;匹配
+                    width += 4;
+                    num += 1
                 } else {
+                    // width += 10;
                     width += 10;
                     num += 1
                 }

package/src/index.js

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