zydx-plus 1.29.140 → 1.29.142

package/package.json

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

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

@@ -1,12 +1,12 @@
 <template>
-   <div class="choice">
+   <div class="choice" v-if="isShow">
        <div class="choice-title">
            <div class="choice-title-left">
-               <span><i>*</i>试题选项：</span>
-               <em>(每道多选题至少有两个正确项, 所有选项需给出至少一个答案)</em>
+               <span><i>*</i>{{ title }}：</span>
+               <em>({{ text }})</em>
            </div>
            <div class="choice-title-right">
-               <button class="but" @click="add('correct')">增正确项</button>
+               <button class="but" @click="add('correct')" v-if="!single">增正确项</button>
                <button class="but" @click="add('interfere')">增干扰项</button>
            </div>
        </div>
@@ -26,6 +26,23 @@
            </div>
        </div>
    </div>
+   <div v-else>
+        <div class="choice-list">
+            <div class="list-title">
+                <span>试题选项：</span>
+                <button class="but" @click="addOption">增加选项</button>
+            </div>
+            <div class="list-cont">
+                <div class="list-cont-li" v-for="(item,index) in list">
+                    <span>{{ item.letter }}.</span>
+                    <div class="list-cont-input">
+                        <input type="text" v-model="item.value" placeholder="请输入选项..." />
+                        <img @click="delOption(index)" src="data:image/png;base64,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" alt="" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -41,6 +58,22 @@ export default {
         value: {
             type: Array,
             default: []
+        },
+        title: {
+            type: String,
+            default: '试题选项'
+        },
+        text: {
+            type: String,
+            default: '每道多选题至少有两个正确项, 所有选项需给出至少一个答案'
+        },
+        isShow: {
+            type: Boolean,
+            default: true
+        },
+        single: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
@@ -56,30 +89,61 @@ export default {
         this.list = this.organize(this.value)
     },
     methods: {
+        addOption() {
+            const index = this.list.length
+            if(index === 8) return
+            this.list.push({
+                letter: this.letter[index],
+                value: ''
+            })
+        },
         // 整理数据
         organize(v) {
             let arr = []
-            v.forEach(x => {
-                arr.push({
-                    type: (x.isRight)? 'correct' : 'disturb',
-                    letter: x.index,
-                    title: (x.isRight)? '正确选项' : '干扰选项',
-                    list: x.content.map(y => ({value: y}))
+            if(v.length === 0) {
+                if(this.single) {
+                    arr.push({
+                        type: 'correct',
+                        letter: this.letter[0],
+                        title: '正确选项',
+                        list: [{value: ''}]
+                    })
+                }
+            }else {
+                v.forEach(x => {
+                    arr.push({
+                        type: (x.isRight)? 'correct' : 'interfere',
+                        letter: x.index,
+                        title: (x.isRight)? '正确选项' : '干扰选项',
+                        list: x.content.map(y => ({value: y}))
+                    })
                 })
-            })
+            }
             return arr
         },
         getContent() {
             let arr = []
-            this.list.forEach(x => {
-                arr.push({
-                    index: x.letter,
-                    isRight: x.title === '正确选项',
-                    content: x.list.map(y => y.value)
+            if(this.isShow) {
+                this.list.forEach(x => {
+                    arr.push({
+                        index: x.letter,
+                        isRight: x.title === '正确选项',
+                        content: x.list.map(y => y.value)
+                    })
                 })
-            })
-            console.log(arr)
-            return arr
+                return {
+                    testKey: arr,
+                    answer: arr.filter(x => x.isRight).map(x => x.index).join(',')
+                }
+            }else {
+                this.list.forEach(x => {
+                    arr.push({
+                        index: x.letter,
+                        content: [x.value? x.value: '']
+                    })
+                })
+                return arr
+            }
         },
         add(str) {
             const index = this.list.length
@@ -97,6 +161,9 @@ export default {
         del(index,ins) {
             this.list[index].list.splice(ins, 1)
         },
+        delOption(index) {
+            this.list.splice(index, 1)
+        }
     }
 }
 </script>

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

@@ -79,6 +79,7 @@ export default defineComponent({
         html: {
             handler: function (e, oldVal) {
                 this.formData.html = e
+                if(this.readOnly) this.readOnlyPage()
             },
             deep: true
         },

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

@@ -390,6 +390,9 @@ export default {
                 html += '<p style="text-align: right;"><span style="color: #999;">请填来源</span></p>'
                 this.editor.commands.setContent(html)
             }
+            if(v === 'centerH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('center').run()
+            if(v === 'leftH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('left').run()
+            if(v === 'rightH2') this.editor.chain().focus().toggleHeading({level:2}).setTextAlign('right').run()
         }
     }
 }

package/src/components/sketchpad/index.js

@@ -0,0 +1,6 @@
+import main from './src/sketchpad';
+
+main.install = function(Vue) {
+    Vue.component(main.name, main);
+};
+export default main;

package/src/index.js

@@ -69,7 +69,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.29.140',
+    version: '1.29.142',
     install,
     Calendar,
     Message,