zydx-plus 1.32.235 → 1.32.236

package/package.json

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

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

@@ -148,6 +148,15 @@ export default {
             let pHeight = 0
             let html = ''
             for (let i = 0; i < data.length; i++) {
+                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 = ''
+                    }
+                }
                 let text = data[i].offsetHeight
                 if ((pHeight + text) > max) {
                     const {start, end, size} = this.rows(data[i], max - pHeight)

package/src/components/word/src/word.vue

@@ -13,7 +13,7 @@
                <div class="subject">
                    <div class="subject-title" v-if="item.subject">
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
-                           <span>{{ item.order? item.order: index + 1 }}.<em v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
+                           <span>{{ item.order? item.order: index + 1 }}{{ item.order === ' '? '': '.' }}}<em v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="butShow" ref="b">
                                      <button class="but" @click="modify(item)">修改</button>

package/src/components/word2/src/word.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="word-cont">
-        <div class="word-slot" :style="page?style:{}" id="test">
+        <div class="word-slot" :style="page?style:{}" :ref="'test'+id">
             <slot></slot>
         </div>
 <!--        <div class="answer">-->
@@ -15,7 +15,7 @@
 <!--                </div>-->
 <!--            </div>-->
 <!--        </div>-->
-        <div class="word-page" v-if="page">
+        <div class="word-page" :ref="'wordPage'+id" v-if="page">
             <div class="page-cont" v-for="(item,index) in htmlArr" :key="index" :style="{'z-index': zIndex}">
                 <div class="page-cont-html" v-html="item" :style="{padding: padding?'100px':'100px 0', 'padding-top': index === 0?'10px': '100px'}"></div>
                 <div class="page-cont-num">{{ index + 1 }}/{{ htmlArr.length }}</div>
@@ -41,7 +41,8 @@ export default {
             max: 0,
             pHeight: 0,
             html: '',
-            loading: false
+            loading: false,
+            id: null
         }
     },
     props: {
@@ -73,17 +74,24 @@ export default {
             }
         }
     },
+    mounted() {
+        this.id = this.randomId()
+    },
     methods: {
+        randomId() { // 生成随机id
+            const id = Math.random().toString(36).substr(2)
+            return id.replace(/[0-9]/g, '')
+        },
         init() {
             if(!this.page) return
             this.htmlArr = []
             this.pHeight = 0
             this.html = ''
             setTimeout(() => {
-                const data = document.getElementById('test').children[0].childNodes
-                this.max = (document.getElementsByClassName('word-page')[0].offsetWidth * 1.4) - 320
+                const data = this.$refs[`test${this.id}`].children[0].childNodes
+                this.max = (this.$refs[`wordPage${this.id}`].offsetWidth * 1.4) - 200
                 this.children(data)
-            },0)
+            },100)
         },
         children(data) {
             for (let i = 0; i < data.length; i++) {
@@ -116,7 +124,7 @@ export default {
             for (let i = 0; i < data.length; i++) {
                 let text = data[i].offsetHeight
                 if((this.pHeight + text) > this.max) {
-                    if(data[i].children.length === 0 || data[i].className.indexOf('paper-choice') !== -1) {
+                    if(data[i].children.length < 3 || data[i].className.indexOf('paper-choice') !== -1 || data[i].localName === 'table') {
                         this.htmlArr.push(this.html)
                         this.pHeight = 0
                         this.html = ''

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.235',
+    version: '1.32.236',
     install,
     Calendar,
     Message,