resolver-egretimp-plus 0.1.59 → 0.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/components/packages-web/ElCheckbox.vue

@@ -4,6 +4,8 @@
       v-for="option in props.options"
       :key="option.columnValue"
       :value="option.columnValue"
+      :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
+
     >
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
       <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">

package/src/components/packages-web/ElDatePicker.vue

@@ -11,6 +11,7 @@ import { useAttrs, computed, watch, nextTick, useSlots } from 'vue'
 import { commonPropsType, formatDate, isDate, hasOwn } from '../../utils/index.js'
 import { useFormItem } from 'element-plus'
 import dateIcon from '../icons/date.vue'
+import dayjs from 'dayjs'
 
 const slots = useSlots()
 const { formItem: elFormItem } = useFormItem()
@@ -70,21 +71,17 @@ watch(value, () => {
 })
 
 const disabledDate = (date) => {
-  let dateTime = formatDate(date, 'yyyy-MM-dd')
-  const newDate = new Date(dateTime)
+  const currentDateStr = dayjs(date).format('YYYY-MM-DD')
+  const currentDateUnix = dayjs(currentDateStr).unix()
   if (props.min) {
-    if (isDate(props.min) && props.min.getTime() > newDate.getTime()) {
-      return true
-    }
-    if (typeof props.min === 'string' && new Date(props.min).getTime() > newDate.getTime()) {
+    const minUnix = dayjs(props.min).unix()
+    if (minUnix > currentDateUnix) {
       return true
     }
   }
   if (props.max) {
-    if (isDate(props.max) && props.max.getTime() < newDate.getTime()) {
-      return true
-    }
-    if (typeof props.max === 'string' && new Date(props.max).getTime() < newDate.getTime()) {
+    const maxUnix = dayjs(props.max).unix()
+    if (maxUnix < currentDateUnix) {
       return true
     }
   }