zydx-plus 1.32.300 → 1.32.302

package/package.json

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

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

@@ -509,6 +509,11 @@
                     {
                         value: '2',
                         label: '同学互评'
+                    },
+                    {
+                        disable: true,
+                        value: '3',
+                        label: '系统评价'
                     }
                 ],
                 reviewDemandOptions : [

package/src/components/select/src/select.vue

@@ -33,6 +33,7 @@
                   :class="{ 'custom-select-options': true, 'scroll': maxHeight > 0 }">
                 <li v-for="(option, idx) in options"
                     :key="idx"
+                    :class="option.disable ? 'disable': ''"
                     @click="handleClick(option)">{{ option.label }}</li>
               </ul>
             </template>
@@ -93,6 +94,9 @@ export default defineComponent({
       this.isOpen = !this.isOpen
     },
     handleClick: function (option) {
+      if(option.disable) {
+          return
+      }
       this.$emit('update:value', option.value)
       this.$emit('select', option)
       this.selected = option.label
@@ -260,4 +264,8 @@ export default defineComponent({
 .custom-select-options li:focus {
   color: v-bind(hover);
 }
+
+.disable {
+  color: gray !important;
+}
 </style>

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr }) => {
+const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr, countdown }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -49,7 +49,7 @@ const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,c
             render(null, container)
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel, close })
+        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr,countdown, submit, cancel, close })
         render(VNode, container)
     })
 }

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

@@ -9,7 +9,7 @@
                 <div class="tip-boxContent">
                     <div class="tap-p" ref="tapP">
                         <div class="tip-title2" ref="tipTitle" v-if="type === 'text'"
-                             :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }" v-html="promptContent"></div>
+                             :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }">{{ promptContent }} {{ countdown === 0?'':`(${timeo}s)` }}</div>
                         <div class="tip-img" v-if="type === 'img'">
                             <img :src="url" alt=""/>
                         </div>
@@ -94,6 +94,8 @@ import Select from '../../select/src/select.vue'
 import Calendar from '../../calendar/src/Calendar'
 import Year from '../../year/src/year'
 
+let timeStop = null
+
 export default {
     name: 'zydx-tip-box',
     components: {Select, Calendar,Year},
@@ -103,7 +105,8 @@ export default {
             tipYear: false,
             fileName: '',
             middles: this.middle,
-            indent: false
+            indent: false,
+            timeo: 0
         }
     },
     props: {
@@ -123,6 +126,10 @@ export default {
             type: String,
             default: '默认文字'
         },
+      countdown: {  // 倒计时
+        type: Number,
+        default: 0
+      },
         middle: { // 弹窗中间的文字内容是居中 还是居左 默认居中
             type: Boolean,
             default: true
@@ -180,9 +187,26 @@ export default {
                     this.indent = true
                 }
             }
+            if(this.countdown > 0) {
+              this.timeo = this.countdown
+              this.countdownFun()
+            }
         })
     },
+  beforeUnmount() {
+    clearInterval(timeStop)
+  },
     methods: {
+      countdownFun() {
+        let that = this
+        timeStop = setInterval(function(){
+          that.timeo--;
+          if (that.timeo <= 0) {
+            clearInterval(timeStop)
+            that.cancel()
+          }
+        },1000)
+      },
         checkboxTao(index) {
             this.checkboxArr[index].checked = !this.checkboxArr[index].checked
         },

package/src/index.js

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