resolver-egretimp-plus 0.1.60 → 0.1.62

package/package.json

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

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

@@ -89,7 +89,16 @@ const value = computed(() => {
       if (!modelValue.value) {
         return ''
       }
-      const val = isNaN(Number(modelValue.value)) ? modelValue.value : Number(modelValue.value)
+      let val = ''
+      if (isNaN(Number(modelValue.value))) {
+        val = modelValue.value
+      } else {
+        if (props.config?.valueFormat === 'timestamp') {
+          val = Number(modelValue.value)
+        } else {
+          val = modelValue.value
+        }
+      }
       return dayjs(val).format(props?.config?.format || 'YYYY-MM-DD')
     }
     if (props.showMoney == '1') {

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
     }
   }

package/src/utils/defaultVal.js

@@ -4,7 +4,11 @@ import { ARG_FLAGS, isHidden, VALUE_TYPES } from './const'
 import { isArray, isNumber, isString } from './is'
 
 export default function defaultVal(config) {
-  if ((config.defaultVal || config.defaultValue) && !config.bindValue && config.bindValue !== 0) {
+  if (
+    (config.defaultVal || config.defaultValue) &&
+    !config.bindValue && config.bindValue !== 0 &&
+    !(isArray(config.bindValue) && config.bindValue.length) // 数组等于空的数组的时候
+  ) {
     const configDefaultVal = config.defaultVal || config.defaultValue
     let defaultVal = null
     try {