zydx-plus 1.29.142 → 1.29.144

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.29.142",
+  "version": "1.29.144",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -26,7 +26,7 @@
     "snabbdom": "^3.5.1",
     "@wangeditor/plugin-formula": "^1.0.11",
     "katex": "^0.15.6",
-    "simple-mind-map": "^0.5.8",
+    "simple-mind-map": "^0.5.11",
     "html2json": "^1.0.2",
     "@tiptap/extension-image": "^2.0.3",
     "@tiptap/starter-kit": "^2.0.3",

package/src/components/biz_taskInfo/src/bizTaskInfo.vue

@@ -121,6 +121,16 @@
         },
         data() {
             return {
+                keysArr: [
+                    'reviewObj',
+                    'reviewDemand',
+                    'finishState',
+                    'laterScore',
+                    'examJoinTime',
+                    'endTime',
+                    'screenLimit',
+                    'funDisable',
+                    'round'],
                 actionConfig: {
                     action_lesson051: {
                         actionName: '学习调查',
@@ -625,9 +635,10 @@
                 }
             },
             confirm () {
+                let that = this
                 this.taskInfoList.forEach(item => {
                     Object.keys(item).forEach(key=>{
-                        if(this.isEmpty(item[key])) {
+                        if(!that.keysArr.includes(key)) {
                             delete item[key];
                         }
                     })

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

@@ -29,7 +29,7 @@
    <div v-else>
         <div class="choice-list">
             <div class="list-title">
-                <span>试题选项：</span>
+                <span><i>*</i>试题选项：</span>
                 <button class="but" @click="addOption">增加选项</button>
             </div>
             <div class="list-cont">
@@ -67,11 +67,11 @@ export default {
             type: String,
             default: '每道多选题至少有两个正确项, 所有选项需给出至少一个答案'
         },
-        isShow: {
+        isShow: { // 是否显示答案
             type: Boolean,
             default: true
         },
-        single: {
+        single: { // 是否单选
             type: Boolean,
             default: false
         }
@@ -121,10 +121,24 @@ export default {
             }
             return arr
         },
+        // 判断数组是否全是空
+        isAllEmpty(arr) {
+            let flag = true
+            for(let i=0; i< arr.length; i++) {
+                if(arr[i].value !== '') {
+                    flag = false
+                    break
+                }
+            }
+            return flag
+        },
+        // 获取数据
         getContent() {
             let arr = []
+            let prompt = false
             if(this.isShow) {
                 this.list.forEach(x => {
+                    prompt = this.isAllEmpty(x.list)
                     arr.push({
                         index: x.letter,
                         isRight: x.title === '正确选项',
@@ -133,19 +147,24 @@ export default {
                 })
                 return {
                     testKey: arr,
-                    answer: arr.filter(x => x.isRight).map(x => x.index).join(',')
+                    answer: arr.filter(x => x.isRight).map(x => x.index).join(','),
+                    prompt: (this.single)? prompt : arr.filter(x => x.isRight).length < 2 || prompt
                 }
             }else {
                 this.list.forEach(x => {
+                    console.log(x.value)
                     arr.push({
                         index: x.letter,
-                        content: [x.value? x.value: '']
+                        content: [x.value]
                     })
                 })
-                return arr
+                return {
+                    testKey: arr,
+                    prompt: arr.filter(x => x.content[0] === '').length > 0
+                }
             }
         },
-        add(str) {
+        add(str) { // 添加选项
             const index = this.list.length
             if(index === 8) return
             this.list.push({
@@ -155,13 +174,13 @@ export default {
                 list: [{value: ''}]
             })
         },
-        alternative(index) {
+        alternative(index) { // 切换选项
             this.list[index].list.push({value: ''})
         },
-        del(index,ins) {
+        del(index,ins) { // 删除选项
             this.list[index].list.splice(ins, 1)
         },
-        delOption(index) {
+        delOption(index) { // 删除选项
             this.list.splice(index, 1)
         }
     }
@@ -218,9 +237,14 @@ export default {
 }
 .list-title span{
     font-size: 14px;
-    font-weight: 400;
+    font-weight: bold;
     flex: 1;
 }
+.list-title i{
+    color: red;
+    margin-right: 2px;
+    font-style: normal;
+}
 .choice-title{
     display: flex;
     justify-content: center;

package/src/components/mind/src/mind.vue

@@ -183,7 +183,13 @@ export default {
             color: 'rgba(84,150,136,1)',
             boldAct: false,
             italicAct: false,
-            scribeAct: false
+            scribeAct: false,
+            defaultData: {
+                "data": {
+                    "text": "根节点"
+                },
+                "children": []
+            }
         }
     },
     props: {
@@ -202,6 +208,18 @@ export default {
         },
     },
     watch: {
+        readOnly: {
+            handler: function (val, oldVal) {
+                this.mindMap?.setMode(val? 'readonly':'edit')
+            },
+            immediate: true
+        },
+        data: {
+            handler: function (val, oldVal) {
+                this.mindMap?.setData(val)
+            },
+            immediate: true
+        },
         sizeValue(e) { // 字号
             this.activeNodes.forEach(node => {
                 node.setStyle('fontSize',e)
@@ -244,30 +262,31 @@ export default {
         },
     },
     mounted() {
-        let mindSess = sessionStorage.getItem('mind')
-        this.mindMap = new MindMap({
-            el: document.getElementById('mindMapContainer'),
-            enableFreeDrag: false, // 是否开启自由拖拽
-            enableNodeTransitionMove: false, // 是否开启节点过渡动画
-            layout: 'logicalStructure', // 节点布局方式
-            data: this.data
-        });
-        this.mindMap.setMode(this.readOnly ? 'readonly':'edit')
-        this.mindMap.on('node_active', (node, activeNodeList) => {
-            this.mindShow = node === null;
-        })
-        this.mindMap.on('back_forward', (index, len) => {
-            this.retShow = index <= 0;
-            this.forwardShow = index >= len - 1
-        })
-        this.mindMap.on('node_active', (node, activeNodeList) => {
-            this.activeNodes = activeNodeList
-        })
+        this.init()
     },
     methods: {
-        // readOnly() {
-        //     this.mindMap.setMode(value ? 'readonly' : 'edit')
-        // },
+        init() {
+            this.mindMap = new MindMap({
+                el: document.getElementById('mindMapContainer'),
+                enableFreeDrag: false, // 是否开启自由拖拽
+                enableNodeTransitionMove: false, // 是否开启节点过渡动画
+                layout: 'logicalStructure', // 节点布局方式
+                maxHistoryCount: 100, // 最大历史记录数
+                maxNodeCacheCount: 100, // 最大节点缓存数
+                data: Object.keys(this.data).length === 0? this.defaultData: this.data
+            });
+            this.mindMap.setMode(this.readOnly ? 'readonly':'edit')
+            this.mindMap.on('node_active', (node, activeNodeList) => {
+                this.mindShow = node === null;
+            })
+            this.mindMap.on('back_forward', (index, len) => {
+                this.retShow = index <= 0;
+                this.forwardShow = index >= len - 1
+            })
+            this.mindMap.on('node_active', (node, activeNodeList) => {
+                this.activeNodes = activeNodeList
+            })
+        },
         scribes() {
             this.scribeAct = !this.scribeAct
             this.activeNodes.forEach(node => {
@@ -318,11 +337,22 @@ export default {
             }
             this.mindMap.setLayout(layoutList)
         },
+        removeNode(data) {
+            if(data._node) {
+                delete data._node
+            }
+            if(data.children && data.children.length > 0) {
+                data.children.forEach(item => {
+                     this.removeNode(item)
+                })
+            }
+            return data
+        },
         preservation() {
             let that = this
             that.mindMap.export('png',false,'123213', true).then(r => {
                 that.$emit('preservation', {
-                    data: that.data,
+                    data: that.removeNode(that.data),
                     url: r
                 })
             })

package/src/components/read/src/read.vue

@@ -5,6 +5,7 @@
       <div class="view-pdf" v-if="fileType === 'pdf'">
           <div class="pageContainer" v-for="(item,index) in idArr">
               <canvas :id="item"></canvas>
+              <div class="pdfPage">{{ index + 1 }}/{{ pdfPages }}</div>
           </div>
       </div>
       <div class="mp4" v-if="fileType === 'mp4'">
@@ -116,10 +117,21 @@ export default {
 </script>
 
 <style scoped>
+.pdfPage{
+    position: absolute;
+    bottom: 20px;
+    left: 0;
+    z-index: 1;
+    text-align: center;
+    font-size: 14px;
+    color: #666;
+    width: 100%;
+}
 .pageContainer{
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
     margin-bottom: 10px;
     display: inline-block;
+    position: relative;
 }
 .mp4,.mp3{
     width: 100%;

package/src/components/tipBox/src/main.vue

@@ -31,7 +31,7 @@
                                         <input class="file" :accept="item.accept" @change="fileTap($event,index)" type="file" />
                                     </label>
                                 </div>
-                                <div style="display: inline-block;" v-if="item.type === 'input'">
+                                <div class="input-name" v-if="item.type === 'input'">
                                     <div v-if="item.number" class="number-input">
                                         <input type="number" @keypress="isNumberKey($event,index)"
                                                :placeholder="item.placeholder"
@@ -40,6 +40,7 @@
                                     </div>
                                     <input v-else type="text" :placeholder="item.placeholder" :maxlength="item.maxlength"
                                            v-model="item.value" :disabled="item.disabled"/>
+                                    <b>{{ item.tail }}</b>
                                 </div>
                                 <div style="display: inline-block;">
                                     <Select v-if="item.type === 'select'" :options="item.option"

package/src/components/tipBox/src/zydxStyle.css

@@ -251,4 +251,16 @@ font-size: 12px;
   cursor: pointer;
   min-width: 60px;
   display: inline-block;
+}
+.input-name{
+  display: inline-block;
+  position: relative;
+}
+.input-name b{
+  position: absolute;
+  top: 5px;
+  right: 10px;
+  z-index: 1;
+  font-size: 16px;
+  font-weight: normal;
 }

package/src/index.js

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