vxe-pc-ui 4.15.21 → 4.15.23

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { 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}` : '';
@@ -95,7 +95,7 @@ function createComponentLog(name) {
 const warnLog$g = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.15.21";
+const version = "4.15.23";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -21094,8 +21094,8 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             };
         };
         const getRangeValue = (sValue, eValue) => {
-            const { modelValue, valueType } = props;
-            let isArr = XEUtils.isArray(modelValue);
+            const { modelValue, valueType, valueFormat } = props;
+            let isArr = valueFormat === 'date' || XEUtils.isArray(modelValue);
             if (valueType) {
                 switch (valueType) {
                     case 'array':
@@ -21107,7 +21107,7 @@ var VxeDateRangePickerComponent = defineVxeComponent({
                 }
             }
             if (sValue || eValue) {
-                const rest = [sValue || '', eValue || ''];
+                const rest = [sValue || null, eValue || null];
                 if (isArr) {
                     return rest;
                 }
@@ -21183,16 +21183,37 @@ var VxeDateRangePickerComponent = defineVxeComponent({
             dispatchEvent(evnt.type, { value, startValue, endValue }, evnt);
         };
         const handleChange = (sValue, eValue, evnt) => {
-            const { modelValue } = props;
-            reactData.startValue = sValue;
-            reactData.endValue = eValue;
-            const value = getRangeValue(sValue, eValue);
-            const isFinish = (sValue && eValue) || (!sValue && !eValue);
+            const { type, modelValue, valueFormat } = props;
+            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 (XEUtils.toValueString(modelValue) !== value) {
-                dispatchEvent('change', { value, startValue: sValue, endValue: eValue, isFinish }, evnt);
+                dispatchEvent('change', { value, startValue: startRest, endValue: endRest, isFinish }, evnt);
                 // 自动更新校验状态
                 if ($xeForm && formItemInfo) {
                     $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value);
@@ -44710,7 +44731,12 @@ var VxeUploadComponent = defineVxeComponent({
                     if (cacheItem) {
                         cacheItem.loading = false;
                     }
-                    dispatchEvent('upload-end', { option: item }, null);
+                    const result = {
+                        option: item,
+                        status: cacheItem ? cacheItem.status : null,
+                        response: cacheItem ? cacheItem.response : null
+                    };
+                    dispatchEvent('upload-end', { option: item, result }, null);
                 });
             }
             else {
@@ -44858,7 +44884,7 @@ var VxeUploadComponent = defineVxeComponent({
             Promise.all(uploadPromiseRests).then(() => {
                 const { 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 {
@@ -44871,7 +44897,7 @@ var VxeUploadComponent = defineVxeComponent({
                 dispatchEvent('upload-queue-end', { value, options: restFileList, results: uploadResults, files: selectFiles }, evnt);
                 // 自动更新校验状态
                 if ($xeForm && formItemInfo) {
-                    $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, restFileList);
+                    $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value);
                 }
             });
         };