zydx-plus 1.32.306 → 1.32.308

package/package.json

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

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

@@ -16,7 +16,7 @@
     <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>
+                <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">

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

@@ -2391,7 +2391,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '项目要求',
-                                resourceIndex: '项目主题',
+                                resourceIndex: '学习项目',
                                 guideIndex: '指导意见',
                                 review: '项目点评',
                                 analyse: '项目分析',
@@ -2419,7 +2419,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '创新要求',
-                                resourceIndex: '创新任务',
+                                resourceIndex: '创新主题',
                                 guideIndex: '指导意见',
                                 review: '创新点评',
                                 analyse: '创新分析',
@@ -2427,8 +2427,8 @@ let buttonNames = {
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
-                                allClass: this.getPrefix(item) + '项目'
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
+                                allClass: this.getPrefix(item) + '主题'
                             },
                             lowLevel: {
                                 default: "singletonClass",
@@ -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/biz_taskInfo/src/bizTaskInfo.vue

@@ -15,7 +15,7 @@
                             <template v-if="!readonly">
                                 <zydx-input v-model:value="info.examJoinTime"
                                             :readonly="readonly"
-                                            :placeholder="'不限制'"
+                                            :placeholder="'请输入时长'"
                                             :border="!readonly"
                                             :type="'number'">
                                     <template #suffix>
@@ -43,7 +43,7 @@
                             </template>
                             <template v-else>
                                 <zydx-input :value="dateFormat(info.endTime)"
-                                            :placeholder="'不限制'"
+                                            :placeholder="'请选择日期'"
                                             :readonly="readonly"
                                             :border="!readonly"
                                             :key="JSON.stringify(info.endTime)"
@@ -92,8 +92,8 @@
             </div>
             <div v-if="actionConfig[actionId].isShowVirtualScore" class="task_item_main" style="z-index: 1">
                 <div class="task_text_desc">虚仿成绩：</div>
-                <div class="width250">
-                    <zydxSelect :color="'#000000'" :readonly="readonly" :options="virtualScoreOptions" v-model:value="virtualScore"></zydxSelect>
+                <div class="width250" title="操作虚仿软件所得成绩在该题总得分占比">
+                    <zydxSelect :color="'#000000'" :readonly="readonly" :placeholder="'操作虚仿软件所得成绩在该题...'" :options="virtualScoreOptions" v-model:value="virtualScore"></zydxSelect>
                 </div>
             </div>
             <div class="default_item_main width100" >
@@ -765,7 +765,7 @@
                                     screenLimit: '0',
                                     funDisable: '0',
                                     round: 1,
-                                    virtualScore: '0'
+                                    virtualScore: ''
                                 }
                             ]
                         }
@@ -818,6 +818,10 @@
                     if(item.endTime != null) {
                         item.endTime = new Date(item.endTime);
                     }
+                    // 设置虚仿默认值
+                    if(item.virtualScore == '') {
+                        item.virtualScore = "0";
+                    }
                     Object.keys(item).forEach(key=>{
                         if(!that.keysArr.includes(key) || item[key] == null) {
                             delete item[key];

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

@@ -30,8 +30,8 @@
    <div v-else>
         <div class="choice-list">
             <div class="list-title">
-                <span><i>*</i>试题选项：</span>
-                <button class="but" @click="addOption">增加选项</button>
+              <span>试题选项：<em>(必选项)</em></span>
+              <button class="but" @click="addOption">增加选项</button>
             </div>
             <div class="list-cont">
                 <div class="list-cont-li" v-for="(item,index) in list">
@@ -249,7 +249,7 @@ export default {
     line-height: 30px;
 }
 .list-cont{
-    padding: 0 0 8px 30px;
+    padding: 0 0 8px 0;
 }
 .lv-color span{
     color: #13BF6C;
@@ -272,6 +272,11 @@ export default {
     margin-right: 2px;
     font-style: normal;
 }
+.list-title em{
+  font-weight: normal;
+  font-style: normal;
+  font-size: 12px;
+}
 .choice-title{
     display: flex;
     justify-content: center;

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>

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/menu/index.js

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

package/src/components/menu/src/menu.vue

@@ -0,0 +1,140 @@
+<template>
+  <div class="menu-container">
+    <menu-list-item
+      v-for="(value, idx) in list"
+      :key="idx"
+      :value="value"
+      @trigger:click="click"
+    >
+      <template #default="{ item }">
+        <div
+          class="title"
+          :class="{
+            green: handleActive(item, 'green'),
+            red: handleActive(item, 'red'),
+          }"
+          :title="item.title"
+        >
+          {{ idx + 1 }}.{{ item.title }}
+        </div>
+        <div
+          class="detail"
+          :class="{
+            green: handleActive(item, 'green'),
+            red: handleActive(item, 'red'),
+          }"
+        >
+          <div
+            class="detail-item"
+            :title="item.detail[idx].value"
+            v-for="({ name, value }, idx) in item.detail"
+            :key="idx"
+          >
+            {{ name }}:
+            {{ value }}
+          </div>
+        </div>
+      </template>
+    </menu-list-item>
+  </div>
+</template>
+
+<script>
+import menuListItem from "./menuList.vue";
+export default {
+  name: "zydx-menu",
+  components: {
+    menuListItem,
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => [],
+    },
+    styleConfig: {
+      type: Object,
+      default: () => {
+        return {
+          activeColor: "green",
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      activeIndex: -1,
+    };
+  },
+  methods: {
+    click: function (item) {
+      const idx = this.list.findIndex(({ id }) => id === item.id);
+      this.activeIndex = idx;
+      this.$emit("trigger:click", item);
+    },
+    handleActive: function (item, color) {
+      const idx = this.list.findIndex(({ id }) => id === item.id);
+      return this.activeIndex === idx
+        ? this.checkColor(this.styleConfig.activeColor, color)
+          ? true
+          : false
+        : false;
+    },
+    checkColor: function (activeColor, color) {
+      switch (color) {
+        case "green":
+          return activeColor === color;
+        case "red":
+          return activeColor === color;
+        default:
+          return false;
+      }
+    },
+  },
+  computed: {
+    activeColor: function () {
+      return this.styleConfig.activeColor;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.menu-container {
+  width: 100%;
+  height: auto;
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 10px;
+  padding: 15px;
+  font-size: 14px;
+  line-height: 30px;
+  letter-spacing: 1px;
+}
+.title {
+  width: 100%;
+  font-size: 16px;
+}
+.title.red {
+  color:red
+}
+.title.green {
+  color:#00ff00
+}
+.detail {
+  width: 100%;
+  text-indent: 28px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.detail.red {
+  color:red
+}
+.detail.green {
+  color:#00ff00
+}
+</style>
+

package/src/components/menu/src/menuList.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="menu-list-item" @click="click">
+    <slot v-bind="{ item: value }"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "menuListItem",
+  props: {
+    value: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  methods: {
+    click() {
+      this.$emit("trigger:click", this.value);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.menu-list-item {
+  width: 100%;
+  height: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  min-height: 60px;
+  cursor: pointer;
+}
+</style>

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

@@ -146,6 +146,9 @@
     cursor: pointer;
     min-width: 60px;
     height: 21px;
+    text-align-last: justify;
+    word-break: break-all;
+    text-justify: distribute;
 }
 .buts-actives{
     color: #00ff00 !important;

package/src/index.js

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