zydx-plus 1.32.307 → 1.32.309

package/package.json

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

package/src/components/biz_header/src/bizHeader.vue

@@ -15,8 +15,8 @@
 <template>
     <div class="headLevel">
         <div v-for="(item, index) in nodeList" :key="index" class="borderBottom1cccccc padding0_10 box_sizing_border_box" v-show="getShow(item)">
-            <zydx-topic-dry>
-                <template v-slot:title_slot><span class="fontSize16" :class="'level'+item.level">{{item.name}}</span></template>
+            <zydx-topic-dry :is_hide="true">
+                <template v-slot:title_slot><span class="fontSize16" :title="item.name" :class="'level'+item.level">{{item.name}}</span></template>
                 <template v-slot:button_slot v-if="isShowBtn">
                     <template v-for="(buttonInfo, buttonIndex) in initConfig(item).buttonList[tabType]">
                         <template v-if="buttonInfo instanceof Object" v-for="(childButtonInfo, childButtonIndex) in buttonInfo">
@@ -166,9 +166,9 @@ export default {
             this.recursionNode(node.catalogId)
             this.nodeList = this.nodeList.reverse()
             // 资源去掉节级
-            if (this .headerType === 0) {
-                this.nodeList = this.nodeList.filter(item => item.level !== 2)
-            }
+            // if (this .headerType === 0) {
+            //     this.nodeList = this.nodeList.filter(item => item.level !== 2)
+            // }
         },
         // 递归节点
         recursionNode: function (catalogId) {

package/src/components/biz_header/src/button_name.js

@@ -2500,12 +2500,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '图谱'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '图谱',
                                 createResource: '创建图谱',
                                 viewResource: '图谱列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '图谱',
+                                btnIndex2: this.getPrefix(item) + '图谱'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '图谱',
+                                btnIndex2: this.getPrefix(item) + '图谱'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '图谱',
+                                // createResource: '创建图谱',
+                                viewResource: '图谱列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },
@@ -2524,12 +2543,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '课件'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '课件',
                                 importResource: '导入课件',
                                 viewResource: '课件列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        0: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '课件',
+                                btnIndex2: this.getPrefix(item) + '课件'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '课件',
+                                btnIndex2: this.getPrefix(item) + '课件'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '课件',
+                                // importResource: '导入课件',
+                                viewResource: '课件列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },
@@ -2548,12 +2586,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '视频'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '视频',
                                 importResource: '导入视频',
                                 viewResource: '视频列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                btnIndex2: this.getPrefix(item) + '视频'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                btnIndex2: this.getPrefix(item) + '视频'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                // importResource: '导入视频',
+                                viewResource: '视频列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },
@@ -2572,12 +2629,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '视频'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '视频',
                                 importResource: '导入视频',
                                 viewResource: '视频列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                btnIndex2: this.getPrefix(item) + '视频'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                btnIndex2: this.getPrefix(item) + '视频'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '视频',
+                                // importResource: '导入视频',
+                                viewResource: '视频列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },
@@ -2596,12 +2672,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '数据'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '数据',
                                 importResource: '导入数据',
                                 viewResource: '数据列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '数据',
+                                btnIndex2: this.getPrefix(item) + '数据'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '数据',
+                                btnIndex2: this.getPrefix(item) + '数据'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '数据',
+                                // importResource: '导入数据',
+                                viewResource: '数据列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },
@@ -2620,12 +2715,31 @@ let buttonNames = {
                                 btnIndex2: this.getPrefix(item) + '歌诀'
                             },
                             lowLevel: {
-                                default: "btnIndex1",
+                                default: "",
                                 // btnIndex1: this.getCurrentPrefix(item) + '歌诀',
                                 createResource: '创建歌诀',
                                 viewResource: '歌诀列表',
                                 selectResource: '查找资源',
                             }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '歌诀',
+                                btnIndex2: this.getPrefix(item) + '歌诀'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '歌诀',
+                                btnIndex2: this.getPrefix(item) + '歌诀'
+                            },
+                            lowLevel: {
+                                default: "",
+                                // btnIndex1: this.getCurrentPrefix(item) + '歌诀',
+                                // createResource: '创建歌诀',
+                                viewResource: '歌诀列表',
+                                selectResource: '查找资源',
+                            }
                         }
                     }
                 },

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

@@ -275,6 +275,7 @@ export default {
 .list-title em{
   font-weight: normal;
   font-style: normal;
+  font-size: 12px;
 }
 .choice-title{
     display: flex;

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

@@ -104,6 +104,7 @@ import {signId} from "./extend/sign-id";
 import {Contenteditable} from "./extend/contenteditable";
 import {titleId} from "./extend/title-id";
 import {dataUrl} from "./extend/data-url";
+import Mess from "@/components/tipBox";
 
 export default {
   name: 'zydx-editor',
@@ -749,7 +750,16 @@ export default {
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4) {
             if (xhr.status === 200) {
-              rl(JSON.parse(xhr.responseText))
+              const text = JSON.parse(xhr.responseText)
+              if(text.code === '200') {
+                rl(text)
+              }else {
+                Mess({
+                  type: 'text',
+                  cancelShow: false,
+                  promptContent: text.msg
+                })
+              }
             }
           }
         }
@@ -845,25 +855,25 @@ export default {
         }else {
           this.butDataName('titleMenu',`字体 ${key.name}`)
         }
-        this.editor.commands.setFontFamily(key.key)
+        this.editor.commands.setFontFamily(key.key).run()
       }
       // 正文
       if (data.key === 'textMenu') {
         this.menuStast = 'textMenu'
         this.butDataName('textMenu',`字号 ${key.name}`)
-        this.editor.commands.setFontSize(key.key)
+        this.editor.commands.setFontSize(key.key).run()
       }
       // 大纲级别
       if (data.key === 'outlineMenu') {
         if (key.key === 'text') {
           this.editor.commands.setTitleId(key.key)
           this.editor.commands.unsetSignId()
-          this.editor.chain().focus().unsetBold().run()
+          this.editor.chain().focus().unsetBold().setTextAlign('left').run()
         }else {
           const t = key.key.split('-')[0]
           this.editor.commands.setSignId(key.key)
           this.editor.commands.setTitleId(`${t} ${this.randomId()}`)
-          this.editor.chain().focus().setBold().run()
+          this.editor.chain().focus().setBold().setTextAlign('left').run()
         }
       }
       // 作者

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

@@ -41,7 +41,12 @@
       <div class="enclosure" v-if="uploadAttData.length > 0 && enclosureShow">
         <p :style="enclosureStyle">{{ enclosureText }}</p>
         <div class="enclosure-list" v-for="(item,index) in uploadAttData">
-          <div class="enclosure-item">
+          <div class="enclosure-item" v-if="uploadAttData.length <= 1">
+            <span v-if="item.name">{{ item.name }}</span>
+            <span v-if="item.annexName">{{ item.annexName }}</span>
+            <span v-if="item.fileName">{{ item.fileName }}</span>
+          </div>
+          <div class="enclosure-item" v-else>
             <span v-if="item.name">{{ numberStyle? `【${index + 1}】`: `${index + 1}.` }} {{ item.name }}</span>
             <span v-if="item.annexName">{{ numberStyle? `【${index + 1}】`: `${index + 1}.` }} {{ item.annexName }}</span>
             <span v-if="item.fileName">{{ numberStyle? `【${index + 1}】`: `${index + 1}.` }} {{ item.fileName }}</span>
@@ -107,6 +112,7 @@ import {FontSize} from "./font-size";
 import {titleId} from "./title-id";
 import {Contenteditable} from "./contenteditable";
 import svgs from "./level";
+import Mess from '../../tipBox/index'
 
 export default {
   name: 'zydx-xiao-editor',
@@ -429,7 +435,7 @@ export default {
           this.voiceShows = this.voiceStatus
           this.appID()
         }, () => {
-          this.$message({
+          Mess({
             type: 'text',
             cancelShow: false,
             promptContent: '录音失败，请检查麦克风是否可用'
@@ -571,7 +577,16 @@ export default {
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4) {
             if (xhr.status === 200) {
-              rl(JSON.parse(xhr.responseText))
+              const text = JSON.parse(xhr.responseText)
+              if(text.code === '200') {
+                rl(text)
+              }else {
+                Mess({
+                  type: 'text',
+                  cancelShow: false,
+                  promptContent: text.msg
+                })
+              }
             }
           }
         }

package/src/components/flip/src/flip.vue

@@ -3,13 +3,14 @@
     <div>
       <div class="book">
         <div class="pages">
-          <div class="wrap">
-            <div class="wrap-one" :class="{'flip-animation-start': flipRights, 'flip-animation-end': flipLefts}"
-                 v-if="oneShow" :style="canvasStyle">
-              <img :src="imgArr[(oneIndex === 'right')? pageIndex-1: pageIndex]" alt=""/>
-            </div>
+          <div class="wrap" ref="wrap">
+<!--            <div class="wrap-one" :class="{'flip-animation-start': flipRights, 'flip-animation-end': flipLefts}"-->
+<!--                 v-if="oneShow" :style="canvasStyle">-->
+<!--              <img :src="imgArr[(oneIndex === 'right')? pageIndex-1: pageIndex]" alt=""/>-->
+<!--            </div>-->
             <div class="wrap-can" ref="wrapCan">
               <canvas @click.stop="turnText" class="wrap-can-one" @mousedown.stop="mouseDown" @mousemove.stop="mouseMove" :id="id"></canvas>
+<!--              <img v-if="imgArr !== ''" :src="imgArr" alt="" />-->
               <canvas :id="`${id}2`"></canvas>
               <div
                   v-show="state === 'text'&&textY2>0&&textX2>0"
@@ -138,7 +139,7 @@ export default {
   data() {
     return {
       pdfPages: 0,
-      imgArr: {},
+      imgArr: '',
       hei: 0,
       pageIndex: this.page,
       show: false,
@@ -1001,14 +1002,17 @@ export default {
         that.ctx = canvas.getContext('2d');
         let ctx2 = canvas2.getContext('2d');
         let viewport = page.getViewport({scale: that.scales})
-        canvas.width = viewport.width * that.sratio
-        canvas.height = viewport.height * that.sratio
-        canvas.style.width = viewport.width + 'px'
-        canvas.style.height = viewport.height + 'px'
+        const sc = viewport.width / viewport.height
+        const wid = that.$refs.wrap.offsetWidth
+        const hei = wid / sc
+        canvas.width = wid * that.sratio
+        canvas.height = hei * that.sratio
+        canvas.style.width = wid + 'px'
+        canvas.style.height = hei + 'px'
         canvas2.width = viewport.width * that.sratio
         canvas2.height = viewport.height * that.sratio
-        canvas2.style.width = viewport.width + 'px'
-        canvas2.style.height = viewport.height + 'px'
+        canvas2.style.width = wid + 'px'
+        canvas2.style.height = hei + 'px'
         that.canvasStyle = {
           width: viewport.width + 'px',
           height: viewport.height + 'px',
@@ -1035,7 +1039,7 @@ export default {
           that.flipRights = false
           that.flipLefts = false
           that.oneShow = false
-          that.imgArr[that.pageIndex] = canvas2.toDataURL('image/jpeg', 1)
+          that.imgArr = canvas2.toDataURL('image/jpeg', 1)
           that.processing()
         }, 1000)
       })
@@ -1266,6 +1270,11 @@ export default {
 //cursor: none;
 }
 
+.wrap-can img{
+  width: 100%;
+  height: 100%;
+}
+
 .but-wrap {
   text-align: center;
 }

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

@@ -30,7 +30,8 @@
               <input class="choice-input" style="display: none;" :disabled="disabled" :checked="ts.checked"
                      @change="answerChange($event,item,`${id}${index}`,ts)" :type="ques(item.quesType)? 'radio': 'checkbox'"
                      :name="`${id}${index}`"/>
-              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
+<!--              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>-->
+              <svgs v-if="chooseAnswer" :radio="false" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
               <span :class="{'choice-span': chooseAnswer}">{{
                   ts.index
                 }}. {{ ts.content[0] }}</span>

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="tabs cl">
+    <div class="tabs cl" ref="tabs" :style="{'text-align': heiStart? 'left': 'center'}">
         <div class="tabs-li" :class="{'tab-active': actives === index}" @click="listTap(index)"
              v-for="(item,index) in list" :key="index">{{ item[column[0]] }}
         </div>
@@ -13,7 +13,8 @@ export default {
     name: "zydx-tab",
     data() {
         return {
-            actives: 0
+            actives: 0,
+          heiStart: false
         }
     },
     props: {
@@ -67,6 +68,8 @@ export default {
                     this.actives = index
                 }
             })
+            this.heiStart = this.$refs.tabs.offsetHeight > 60
+
         },
         listTap(index) {
             this.actives = index
@@ -109,12 +112,12 @@ export default {
     background-size: 100%;
     cursor: pointer;
     margin: 3px 6px;
-    float: left;
     text-align: center;
     line-height: 26px;
     color: #333;
     font-size: 14px;
     user-select: none;
+  display: inline-block;
 }
 
 .tabs-li:hover {

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

@@ -75,7 +75,8 @@
               <input class="choice-input" style="display: none;" :disabled="disabled" :checked="ts.checked"
                      @change="answerChange($event,item,`${id}${index}`,ts)" :type="ques(item.quesType)? 'radio': 'checkbox'"
                      :name="`${id}${index}`"/>
-              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
+<!--              <svgs v-if="chooseAnswer" :radio="ques(item.quesType)" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>-->
+              <svgs v-if="chooseAnswer" :radio="false" :select="ts.checked" :disabled="disabled" :state="stateFun(ts,item)"></svgs>
               <span :class="{'choice-span': chooseAnswer}">{{
                   ts.index
                 }}. {{ ts.content[0] }}</span>

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.307',
+    version: '1.32.309',
     install,
     Calendar,
     Message,