zydx-plus 1.32.186 → 1.32.188

package/package.json

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

package/src/components/choice/src/choice.vue

@@ -67,7 +67,7 @@ export default {
             type: String,
             default: '每道多选题至少有两个正确项, 所有选项需给出至少一个答案'
         },
-        isShow: { // 是否显示答案
+        isShow: {
             type: Boolean,
             default: true
         },
@@ -96,6 +96,12 @@ export default {
                 letter: this.letter[index],
                 value: ''
             })
+            this.option()
+        },
+        option() {
+            this.list.map((x, i) => {
+                x.letter = this.letter[i]
+            })
         },
         // 整理数据
         organize(v) {
@@ -161,7 +167,6 @@ export default {
                 }
             }else {
                 this.list.forEach(x => {
-                    console.log(x.value)
                     arr.push({
                         index: x.letter,
                         content: [x.value]
@@ -182,15 +187,18 @@ export default {
                 title: (str === 'correct')? '正确选项' : '干扰选项',
                 list: [{value: ''}]
             })
+            this.option()
         },
         alternative(index) { // 切换选项
             this.list[index].list.push({value: ''})
         },
         del(index,ins) { // 删除选项
             this.list[index].list.splice(ins, 1)
+            this.option()
         },
         delOption(index) { // 删除选项
             this.list.splice(index, 1)
+            this.option()
         }
     }
 }
@@ -240,7 +248,7 @@ export default {
     color: #FF0000;
 }
 .list-title{
-    padding: 2px 0 2px 10px;
+    padding: 2px 0;
     display: flex;
     justify-content: center;
 }

package/src/components/editor/src/butJson.js

@@ -18,10 +18,10 @@ export function butJson (editor,data) {
                 {name: '(左)黑体5号', key: 'blackLeft5'},
             ],
             html: {
-                blackCenter4: `<p data-signId="title-1" id="${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
-                blackLeft4: `<p data-signId="title-2" id="${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
-                blackCenter5: `<p data-signId="title-3" id="${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
-                blackLeft5: `<p data-signId="title-4" id="${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
+                blackCenter4: `<p data-signId="title-1" class="${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
+                blackLeft4: `<p data-signId="title-2" class="${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 16px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
+                blackCenter5: `<p data-signId="title-3" class="${randomId()}" style="text-align: center;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
+                blackLeft5: `<p data-signId="title-4" class="${randomId()}" style="text-align: left;"><span style="font-weight: 700;color: rgb(0, 0, 0);font-size: 14px;font-family: SimHei">${menusData(data,'titleMenu').text}</span></p>`,
             }
         },
         textMenu: {
@@ -142,9 +142,10 @@ function menusData(data,key) {
     return arr
 }
 
-// 随机id
+// 随机
 function randomId() {
-    return Math.random().toString(36).substr(2)
+    const id = Math.random().toString(36).substr(2)
+    return id.replace(/[0-9]/g, '')
 }
 
 // 时间

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

@@ -224,7 +224,7 @@ export default {
          readOnlyPage() {
             this.htmlArr = []
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
-            let max = 1123
+            let max = 1110
             let pHeight = 0
             let html = ''
             for (let i = 0; i < data.length; i++) {
@@ -235,10 +235,13 @@ export default {
                     html = ''
                 }
                 if((pHeight + text) > max) {
-                    // console.log(this.rows(data[i],(pHeight + text) - max))
+                    console.log(this.rows(data[i],(pHeight + text) - max))
+                    const {start,end} = this.rows(data[i],pHeight - max)
+                    html += `<p>${start}</p>`
                     this.htmlArr.push(html)
                     pHeight = 0
                     html = ''
+                    html += `<p>${end}</p>`
                 }
                 pHeight += text + 5
                 html += data[i].outerHTML
@@ -603,7 +606,7 @@ export default {
     height: 100%;
 }
 :deep(.read-only-p p) {
-    margin: 5px 0;
+    line-height: 25px;
 }
 .read-only-a{
     position: absolute;
@@ -692,7 +695,7 @@ label{
     margin: 10px 0;
 }
 .editing-cont :deep(p) {
-    margin: 10px 0;
+    line-height: 25px;
 }
 li{
     list-style: none;

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

@@ -85,6 +85,7 @@ import Color from '@tiptap/extension-color'
 import textStyle from '@tiptap/extension-text-style'
 import { sid } from "./sign-id";
 import { FontSize } from "./font-size";
+import { titleId } from "./title-id";
 export default {
     name: 'zydx-xiao-editor',
     components: {
@@ -184,7 +185,7 @@ export default {
         },
         placeholder: {
             type: String,
-            default: ''
+            default: '请输入内容'
         }
     },
     emits: ['see','del','complete','update:data','enclosureSuccess','download','updateData'],
@@ -220,6 +221,7 @@ export default {
                 StarterKit,
                 textStyle,
                 FontSize,
+                titleId,
                 Color.configure({
                     types: ['textStyle'],
                 }),
@@ -405,7 +407,7 @@ export default {
             if(v === 'center' || v === 'left' || v === 'right') this.editor.chain().focus().setTextAlign(v).run()
             if(v === 'add') {
                 let html = this.editor.getHTML()
-                html += '<p style="text-align: right;"><span style="color: #999;">请填来源</span></p>'
+                html += '<p class="source" style="text-align: right;"><span></span></p>'
                 this.editor.commands.setContent(html)
             }
             if(v === 'centerH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('center').run()
@@ -441,6 +443,13 @@ export default {
     pointer-events: none;
     height: 0;
 }
+:deep(.source).is-empty::before {
+    color: #adb5bd;
+    content: '添加来源';
+    float: right;
+    height: 0;
+    pointer-events: none;
+}
 :deep(.editor-img){
     max-width: 100%;
 }

package/src/components/editor2/src/title-id.js

@@ -0,0 +1,33 @@
+import { Extension } from '@tiptap/core'
+
+export const titleId = Extension.create({
+    name: 'titleId',
+
+    addOptions() {
+        return {
+            types: ['heading', 'paragraph'],
+        }
+    },
+
+    addGlobalAttributes() {
+        return [
+            {
+                types: this.options.types,
+                attributes: {
+                    titleId: {
+                        default: null,
+                        parseHTML: element => element.getAttribute('class'),
+                        renderHTML: attributes => {
+                            if (!attributes.titleId) {
+                                return {}
+                            }
+                            return {
+                                'class': attributes.titleId,
+                            }
+                        },
+                    },
+                },
+            },
+        ]
+    }
+})

package/src/components/question/src/question.vue

@@ -158,7 +158,7 @@ export default {
             let arr = []
             v.forEach(item => {
                 arr.push({
-                    ...v,
+                    ...item,
                     quesType: item.quesType,
                     quesName: item.quesName,
                     easyScore: item.easyScore? item.easyScore: '',

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

@@ -166,4 +166,12 @@ input[name='check'] {
 }
 .subject-html :deep(p){
     margin: 2px 0;
+}
+.subject-html-title{
+    text-indent: 2em;
+    font-weight: bold;
+    font-size: 14px;
+}
+.subject-html-cont{
+    text-align: justify;
 }

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

@@ -6,7 +6,7 @@
                    <div class="subject-title">
                        <label>
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
-                           <span>{{ item.order }}.<em v-html="item.title"></em>
+                           <span>{{ 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>
@@ -29,7 +29,10 @@
                    </div>
                </div>
                <div v-if="item.alist" class="subject-html">
-                   <div v-for="(item,index) in item.alist" v-html="item.amexontet"></div>
+                   <div v-for="(item,index) in item.alist">
+                       <div class="subject-html-title">{{ titleText }}{{ index + 1 }}</div>
+                       <div class="subject-html-cont" v-html="item.annexContent"></div>
+                   </div>
                </div>
                <div class="choice" v-if="item.testKey">
                    <div class="choice-box" v-for="(ts,ind) in JSON.parse(item.testKey)">
@@ -83,6 +86,14 @@ export default {
         choice: {
             type: Boolean,
             default: false
+        },
+        titleText: {
+            type: String,
+            default: '材料'
+        },
+        scoreShow: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
@@ -95,7 +106,7 @@ export default {
                     item.top = 0
                     if(item.alist) {
                         item.alist.map(x => {
-                            x.amexontet = json2html({node: "root",child: JSON.parse(x.amexontet)})
+                            x.annexContent = json2html({node: "root",child: JSON.parse(x.annexContent)})
                             return x
                         })
                     }
@@ -105,10 +116,11 @@ export default {
                     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.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25
+                        if(this.$refs.b && this.$refs.b.length > 0) {
+                            if(this.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25
+                        }
                     }
                 })
-                console.log(this.value)
             },
             immediate: true,
         },
@@ -139,7 +151,7 @@ export default {
             return v.indexOf('101') > -1
         },
         styleText(v) {
-            if(!v) return
+            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) {

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

@@ -4,7 +4,7 @@
             <slot></slot>
         </div>
         <div class="word-page" v-if="page">
-            <div class="page-cont" v-for="(item,index) in htmlArr">
+            <div class="page-cont" v-for="(item,index) in htmlArr" :key="index">
                 <div class="page-cont-html" v-html="item"></div>
                 <div class="page-cont-num">{{ index + 1 }}/{{ htmlArr.length }}</div>
             </div>
@@ -15,11 +15,15 @@
 <script>
 import exportWord from 'js-export-word'
 
+
 export default {
     name: "zydx-paper",
     data() {
         return {
-            htmlArr: []
+            htmlArr: [],
+            max: 823,
+            pHeight: 0,
+            html: ''
         }
     },
     props: {
@@ -43,35 +47,52 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.init()
-        })
-    },
     methods: {
         init() {
-            const slot = this.$slots.default()[0]
-            let max = 1123
-            let pHeight = 0
-            let html = ''
-            for (let i = 0; i < slot.children.length; i++) {
-                const data = document.getElementsByClassName(slot.children[i].props.class)
-                let text = data[0].offsetHeight
-                if((pHeight + text) > max) {
-                    this.htmlArr.push(html)
-                    pHeight = 0
-                    html = ''
+            this.htmlArr = []
+            this.pHeight = 0
+            this.html = ''
+            setTimeout(() => {
+                const data = document.getElementById('test').children[0].childNodes
+                this.children(data)
+            },0)
+        },
+        children(data) {
+            for (let i = 0; i < data.length; i++) {
+                let text = data[i].offsetHeight
+                if((this.pHeight + text) > this.max) {
+                    this.propsClass(data[i].children)
+                }else {
+                    this.pHeight += text
+                    this.html += data[i].outerHTML
                 }
-                pHeight += text
-                html += data[0].outerHTML
-                if(i === slot.children.length - 1) {
-                    this.htmlArr.push(html)
-                    pHeight = 0
-                    html = ''
+                if(i === data.length - 1) {
+                    this.htmlArr.push(this.html)
+                    this.pHeight = 0
+                    this.html = ''
                     break
                 }
             }
         },
+        propsClass(data) {
+            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) {
+                        this.htmlArr.push(this.html)
+                        this.pHeight = 0
+                        this.html = ''
+                        this.pHeight += text
+                        this.html += data[i].outerHTML
+                    }else {
+                        this.propsClass(data[i].children)
+                    }
+                }else {
+                    this.pHeight += text
+                    this.html += data[i].outerHTML
+                }
+            }
+        },
         exportToWord() {
             const wrap = document.getElementById('test')
             const config = {

package/src/index.js

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