zydx-plus 1.32.198 → 1.32.199

package/package.json

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

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

@@ -8,7 +8,6 @@
 </template>
 
 <script>
-import {json2html} from "html2json";
 
 export default {
     name: "zydx-tab",

package/src/components/word/src/word.css

@@ -89,6 +89,7 @@
 .subject-title{
     flex: 1;
     position: relative;
+    line-height: 26px;
 }
 .subject-title label{
     display: inline-block;
@@ -171,7 +172,10 @@ input[name='check'] {
     text-indent: 2em;
     font-weight: bold;
     font-size: 14px;
+    line-height: 26px;
 }
 .subject-html-cont{
     text-align: justify;
+    line-height: 26px;
+    text-indent: 2em;
 }

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

@@ -35,9 +35,9 @@
                    </div>
                </div>
                <div class="choice" v-if="item.testKey">
-                   <div class="choice-box" v-for="(ts,ind) in JSON.parse(item.testKey)">
+                   <div class="choice-box" v-for="(ts,ind) in item.testKey">
                        <label>
-                           <input :disabled="disabled" @change="answerChange($event,item,JSON.parse(item.testKey),index)" :type="ques(item.quesType)?'radio':'checkbox'" :name="index" />
+                           <input :disabled="disabled" :checked="ts.checked" @change="answerChange($event,item,index)" :type="ques(item.quesType)?'radio':'checkbox'" :name="index" />
                            <span>{{ ts.index }}. {{ ts.content[0] }}</span>
                        </label>
                    </div>
@@ -100,7 +100,7 @@ export default {
         data: {
             handler: function (val, oldVal) {
                 this.value = val
-                this.value.map((item,index) => {
+                this.value.map((item,index) => { // 转换html
                     item.choice = true
                     item.right = 0
                     item.top = 0
@@ -110,14 +110,31 @@ export default {
                             return x
                         })
                     }
+                    if(item.testKey) {
+                        item.testKey = JSON.parse(item.testKey).map(x => {
+                            if(this.ques(item.quesType)) { // 判断是否单选
+                                x.checked = x.index === item.answer;
+                            }else {
+                                for(let i=0; i<item.answer.length; i++) {
+                                    if(x.index === item.answer[i]) {
+                                        x.checked = true
+                                        break
+                                    }else {
+                                        x.checked = false
+                                    }
+                                }
+                            }
+                            return x
+                        })
+                    }
                     return item
                 })
-                this.$nextTick(() => {
-                    const w = this.$refs.parer.offsetWidth
+                this.$nextTick(() => {  // 保证所有的数据都渲染完毕
+                    const w = this.$refs.parer.offsetWidth // 获取父级宽度
                     for(let i = 0; i< this.$refs.subject.length; i++) {
                         this.value[i].right = w - this.$refs.subject[i].offsetLeft
                         if(this.$refs.b && this.$refs.b.length > 0) {
-                            if(this.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25
+                            if(this.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25 // 判断是否换行
                         }
                     }
                 })
@@ -133,17 +150,17 @@ export default {
     },
     emits: ['change','modify','del','changeAll','replaceData','choiceData','answer'],
     methods: {
-        answerChange(e,v,n,id) {
+        answerChange(e,v,id) {
             let answerArr = []
             const ids = document.getElementsByName(id)
             ids.forEach((x,index) => {
                 if(x.checked) {
-                    answerArr.push(n[index])
+                    answerArr.push(v.testKey[index].index)
                 }
             })
             this.$emit('answer',{
                 ...v,
-                answer: answerArr
+                answer: this.ques(v.quesType)? answerArr[0]: answerArr
             })
         },
         checkboxChange(e,index) {
@@ -165,9 +182,8 @@ export default {
         },
         styleText(v) {
             if(!v || v === 'null') return
-            const data = JSON.parse(v)
-            for(let i=0; i< data.length; i++) {
-                if(data[i].content[0].length > 20) {
+            for(let i=0; i< v.length; i++) {
+                if(v[i].content[0].length > 20) {
                     return true
                 }
             }

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

@@ -57,6 +57,7 @@ export default {
     },
     methods: {
         init() {
+            if(!this.page) return
             this.htmlArr = []
             this.pHeight = 0
             this.html = ''

package/src/index.js

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