vxe-pc-ui 3.15.19 → 3.15.20

package/lib/index.umd.js

@@ -11650,7 +11650,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.14";
+var coreVersion = "3.4.15";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12410,7 +12410,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.14";
+var version = "3.4.15";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13226,7 +13226,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.15.19");
+var uiVersion = "ui v".concat("3.15.20");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13244,7 +13244,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.15.19";
+var ui_version = "3.15.20";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -67010,7 +67010,7 @@ function upload_createInternalData() {
       }
       return '';
     },
-    handleChange: function handleChange(value) {
+    handleChangeEvent: function handleChangeEvent(evnt, vals) {
       var $xeUpload = this;
       var props = $xeUpload;
       var singleMode = props.singleMode,
@@ -67018,7 +67018,7 @@ function upload_createInternalData() {
         urlArgs = props.urlArgs;
       var urlProp = $xeUpload.computeUrlProp;
       var nameProp = $xeUpload.computeNameProp;
-      var restList = value ? value.slice(0) : [];
+      var restList = vals ? vals.slice(0) : [];
       if (urlMode) {
         restList = restList.map(function (item) {
           var url = item[urlProp];
@@ -67033,7 +67033,12 @@ function upload_createInternalData() {
           return url;
         });
       }
-      $xeUpload.emitModel(singleMode ? restList[0] || null : restList);
+      var value = singleMode ? restList[0] || null : restList;
+      $xeUpload.emitModel(value);
+      $xeUpload.dispatchEvent('change', {
+        value: value
+      }, evnt);
+      return value;
     },
     getThumbnailFileUrl: function getThumbnailFileUrl(item) {
       var $xeUpload = this;
@@ -67157,6 +67162,7 @@ function upload_createInternalData() {
           if (cacheItem) {
             cacheItem.percent = 100;
             cacheItem.status = 'success';
+            cacheItem.response = res;
           }
           // 处理动态字段双向绑定问题
           // Object.assign(item, res)
@@ -67172,6 +67178,7 @@ function upload_createInternalData() {
           var cacheItem = fileCacheMaps[fileKey];
           if (cacheItem) {
             cacheItem.status = 'error';
+            cacheItem.response = res;
           }
           if (showErrorStatus) {
             // 处理动态字段双向绑定问题
@@ -67208,7 +67215,7 @@ function upload_createInternalData() {
       }
       return Promise.resolve();
     },
-    handleReUpload: function handleReUpload(item) {
+    handleReUploadEvent: function handleReUploadEvent(evnt, item) {
       var $xeUpload = this;
       var props = $xeUpload;
       var reactData = $xeUpload.reactData;
@@ -67225,7 +67232,7 @@ function upload_createInternalData() {
         cacheItem.percent = 0;
         $xeUpload.handleUploadResult(item, file).then(function () {
           if (urlMode) {
-            $xeUpload.handleChange(reactData.fileList);
+            $xeUpload.handleChangeEvent(evnt, reactData.fileList);
           }
         });
       }
@@ -67335,7 +67342,8 @@ function upload_createInternalData() {
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           };
         }
         var item = fileObj;
@@ -67357,12 +67365,24 @@ function upload_createInternalData() {
         }, evnt);
       });
       Promise.all(uploadPromiseRests).then(function () {
+        var fileCacheMaps = reactData.fileCacheMaps;
         var restFileList = reactData.fileList;
+        var uploadResults = restFileList.map(function (option) {
+          var fileKey = $xeUpload.getFieldKey(option);
+          var cacheItem = fileCacheMaps[fileKey];
+          return {
+            option: option,
+            status: cacheItem ? cacheItem.status : null,
+            response: cacheItem ? cacheItem.response : null
+          };
+        });
+        var value = $xeUpload.handleChangeEvent(evnt, restFileList);
         $xeUpload.dispatchEvent('upload-queue-end', {
+          value: value,
           options: restFileList,
+          results: uploadResults,
           files: selectFiles
         }, evnt);
-        $xeUpload.handleChange(restFileList);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, restFileList);
@@ -67405,7 +67425,7 @@ function upload_createInternalData() {
       var formItemInfo = $xeUpload.formItemInfo;
       var fileList = reactData.fileList;
       fileList.splice(index, 1);
-      $xeUpload.handleChange(fileList);
+      $xeUpload.handleChangeEvent(evnt, fileList);
       // 自动更新校验状态
       if ($xeForm && formItemInfo) {
         $xeForm.triggerItemEvent(evnt || {
@@ -67920,8 +67940,8 @@ function upload_createInternalData() {
             content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload')
           },
           on: {
-            click: function click() {
-              $xeUpload.handleReUpload(item);
+            click: function click(evnt) {
+              $xeUpload.handleReUploadEvent(evnt, item);
             }
           }
         })]) : renderEmptyElement($xeUpload), h('div', {
@@ -68164,8 +68184,8 @@ function upload_createInternalData() {
             content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload')
           },
           on: {
-            click: function click() {
-              $xeUpload.handleReUpload(item);
+            click: function click(evnt) {
+              $xeUpload.handleReUploadEvent(evnt, item);
             }
           }
         })]) : renderEmptyElement($xeUpload), h('div', {