vxe-pc-ui 4.15.21 → 4.15.23

package/lib/index.umd.js

@@ -4657,7 +4657,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.15.21"}`;
+const uiVersion = `ui v${"4.15.23"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -4675,7 +4675,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.15.21";
+const ui_version = "4.15.23";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -27720,9 +27720,10 @@ const {
     const getRangeValue = (sValue, eValue) => {
       const {
         modelValue,
-        valueType
+        valueType,
+        valueFormat
       } = props;
-      let isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
+      let isArr = valueFormat === 'date' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(modelValue);
       if (valueType) {
         switch (valueType) {
           case 'array':
@@ -27734,7 +27735,7 @@ const {
         }
       }
       if (sValue || eValue) {
-        const rest = [sValue || '', eValue || ''];
+        const rest = [sValue || null, eValue || null];
         if (isArr) {
           return rest;
         }
@@ -27833,20 +27834,50 @@ const {
     };
     const handleChange = (sValue, eValue, evnt) => {
       const {
-        modelValue
+        type,
+        modelValue,
+        valueFormat
       } = props;
-      reactData.startValue = sValue;
-      reactData.endValue = eValue;
-      const value = getRangeValue(sValue, eValue);
-      const isFinish = sValue && eValue || !sValue && !eValue;
+      const dateValueFormat = computeDateValueFormat.value;
+      let startRest = sValue;
+      let endRest = eValue;
+      if (hasTimestampValueType(valueFormat)) {
+        if (startRest) {
+          const dateVal = parseDateValue(startRest, type, {
+            valueFormat: dateValueFormat
+          });
+          startRest = dateVal ? dateVal.getTime() : null;
+        }
+        if (endRest) {
+          const dateVal = parseDateValue(endRest, type, {
+            valueFormat: dateValueFormat
+          });
+          endRest = dateVal ? dateVal.getTime() : null;
+        }
+      } else if (hasDateValueType(valueFormat)) {
+        if (startRest) {
+          startRest = parseDateValue(startRest, type, {
+            valueFormat: dateValueFormat
+          });
+        }
+        if (endRest) {
+          endRest = parseDateValue(endRest, type, {
+            valueFormat: dateValueFormat
+          });
+        }
+      }
+      reactData.startValue = startRest;
+      reactData.endValue = endRest;
+      const value = getRangeValue(startRest, endRest);
+      const isFinish = startRest && endRest || !startRest && !endRest;
       emit('update:modelValue', value);
-      emit('update:startValue', sValue || '');
-      emit('update:endValue', eValue || '');
+      emit('update:startValue', startRest || '');
+      emit('update:endValue', endRest || '');
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(modelValue) !== value) {
         dispatchEvent('change', {
           value,
-          startValue: sValue,
-          endValue: eValue,
+          startValue: startRest,
+          endValue: endRest,
           isFinish
         }, evnt);
         // 自动更新校验状态
@@ -54412,8 +54443,14 @@ function upload_createInternalData() {
           if (cacheItem) {
             cacheItem.loading = false;
           }
+          const result = {
+            option: item,
+            status: cacheItem ? cacheItem.status : null,
+            response: cacheItem ? cacheItem.response : null
+          };
           dispatchEvent('upload-end', {
-            option: item
+            option: item,
+            result
           }, null);
         });
       } else {
@@ -54590,7 +54627,7 @@ function upload_createInternalData() {
           fileCacheMaps
         } = reactData;
         const restFileList = reactData.fileList;
-        const uploadResults = restFileList.map(option => {
+        const uploadResults = newFileList.map(option => {
           const fileKey = getFieldKey(option);
           const cacheItem = fileCacheMaps[fileKey];
           return {
@@ -54608,7 +54645,7 @@ function upload_createInternalData() {
         }, evnt);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
-          $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, restFileList);
+          $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value);
         }
       });
     };