vxe-pc-ui 3.15.19 → 3.15.21

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.21");
 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.21";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -28483,11 +28483,18 @@ var Cascader = VxeCascader;
 
 
 
+
+var checkbox_createComponentLog = createComponentLog('checkbox'),
+  checkbox_warnLog = checkbox_createComponentLog.warnLog;
 /* harmony default export */ var src_checkbox = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCheckbox',
   mixins: [globalMixins.sizeMixin],
   props: {
     value: [String, Number, Boolean],
+    /**
+     * 已废弃，被 checkedValue 替换
+     * @deprecated
+     */
     label: {
       type: [String, Number],
       default: null
@@ -28534,12 +28541,20 @@ var Cascader = VxeCascader;
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
+    computeCheckValue: function computeCheckValue() {
+      var $xeCheckbox = this;
+      var props = $xeCheckbox;
+      var checkedValue = props.checkedValue,
+        label = props.label;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    },
     computeIsChecked: function computeIsChecked() {
       var $xeCheckbox = this;
       var props = $xeCheckbox;
       var $xeCheckboxGroup = $xeCheckbox.$xeCheckboxGroup;
+      var checkValue = $xeCheckbox.computeCheckValue;
       if ($xeCheckboxGroup) {
-        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes($xeCheckboxGroup.value, props.label);
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes($xeCheckboxGroup.value, checkValue);
       }
       return props.value === props.checkedValue;
     },
@@ -28586,25 +28601,31 @@ var Cascader = VxeCascader;
       var $xeCheckboxGroup = $xeCheckbox.$xeCheckboxGroup;
       var $xeForm = $xeCheckbox.$xeForm;
       var formItemInfo = $xeCheckbox.formItemInfo;
-      var checkedValue = props.checkedValue,
-        uncheckedValue = props.uncheckedValue;
+      var uncheckedValue = props.uncheckedValue;
       var isDisabled = $xeCheckbox.computeIsDisabled;
+      var checkValue = $xeCheckbox.computeCheckValue;
       if (!isDisabled) {
         var checked = evnt.target.checked;
-        var value = checked ? checkedValue : uncheckedValue;
-        var params = {
-          checked: checked,
-          value: value,
-          label: props.label
-        };
         if ($xeCheckboxGroup) {
+          var value = checkValue;
+          var params = {
+            checked: checked,
+            value: value,
+            label: value
+          };
           $xeCheckboxGroup.handleChecked(params, evnt);
         } else {
-          $xeCheckbox.emitModel(value);
-          $xeCheckbox.dispatchEvent('change', params, evnt);
+          var _value = checked ? checkValue : uncheckedValue;
+          var _params = {
+            checked: checked,
+            value: _value,
+            label: _value
+          };
+          $xeCheckbox.emitModel(_value);
+          $xeCheckbox.dispatchEvent('change', _params, evnt);
           // 自动更新校验状态
           if ($xeForm && formItemInfo) {
-            $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value);
+            $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, _value);
           }
         }
       }
@@ -28617,11 +28638,11 @@ var Cascader = VxeCascader;
       var props = $xeCheckbox;
       var slots = $xeCheckbox.$scopedSlots;
       var $xeCheckboxGroup = $xeCheckbox.$xeCheckboxGroup;
-      var label = props.label,
-        content = props.content;
+      var content = props.content;
       var vSize = $xeCheckbox.computeSize;
       var isDisabled = $xeCheckbox.computeIsDisabled;
       var isChecked = $xeCheckbox.computeIsChecked;
+      var checkValue = $xeCheckbox.computeCheckValue;
       var indeterminate = !isChecked && props.indeterminate;
       var defaultSlot = slots.default;
       if ($xeCheckboxGroup) {
@@ -28638,7 +28659,7 @@ var Cascader = VxeCascader;
         }
       }
       return h('label', {
-        key: label,
+        key: "".concat(checkValue),
         class: ['vxe-checkbox vxe-checkbox--default', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--indeterminate', indeterminate), 'is--disabled', isDisabled), 'is--checked', isChecked)],
         attrs: {
           title: props.title
@@ -28662,6 +28683,13 @@ var Cascader = VxeCascader;
       }, defaultSlot ? defaultSlot({}) : getFuncText(content))]);
     }
   },
+  mounted: function mounted() {
+    var $xeCheckbox = this;
+    var props = $xeCheckbox;
+    if (props.label !== null) {
+      checkbox_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }
@@ -28691,6 +28719,9 @@ var Checkbox = VxeCheckbox;
 
 
 
+
+var button_createComponentLog = createComponentLog('checkbox-button'),
+  src_button_warnLog = button_createComponentLog.warnLog;
 /* harmony default export */ var checkbox_src_button = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeCheckboxButton',
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
@@ -28698,6 +28729,7 @@ var Checkbox = VxeCheckbox;
     value: [String, Number, Boolean],
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -28899,6 +28931,13 @@ var Checkbox = VxeCheckbox;
       }, getFuncText(content)) : renderEmptyElement($xeCheckboxButton)])]);
     }
   },
+  mounted: function mounted() {
+    var $xeCheckboxButton = this;
+    var props = $xeCheckboxButton;
+    if (props.label !== null) {
+      src_button_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }
@@ -53800,6 +53839,9 @@ var Pulldown = VxePulldown;
 
 
 
+
+var radio_createComponentLog = createComponentLog('radio'),
+  radio_warnLog = radio_createComponentLog.warnLog;
 /* harmony default export */ var src_radio = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeRadio',
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
@@ -53830,6 +53872,7 @@ var Pulldown = VxePulldown;
     },
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -53856,6 +53899,13 @@ var Pulldown = VxePulldown;
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
+    computeCheckValue: function computeCheckValue() {
+      var $xeRadio = this;
+      var props = $xeRadio;
+      var checkedValue = props.checkedValue,
+        label = props.label;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    },
     computeIsDisabled: function computeIsDisabled() {
       var $xeRadio = this;
       var $xeRadioGroup = $xeRadio.$xeRadioGroup;
@@ -53881,14 +53931,15 @@ var Pulldown = VxePulldown;
       var $xeRadioGroup = $xeRadio.$xeRadioGroup;
       return $xeRadioGroup ? $xeRadioGroup.strict : props.strict;
     },
-    computeChecked: function computeChecked() {
+    computeIsChecked: function computeIsChecked() {
       var $xeRadio = this;
       var props = $xeRadio;
       var $xeRadioGroup = $xeRadio.$xeRadioGroup;
-      var label = props.label,
-        checkedValue = props.checkedValue;
-      var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-      return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue;
+      var checkValue = $xeRadio.computeCheckValue;
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.value === checkValue;
+      }
+      return props.value === checkValue;
     }
   }),
   methods: {
@@ -53940,26 +53991,19 @@ var Pulldown = VxePulldown;
     },
     changeEvent: function changeEvent(evnt) {
       var $xeRadio = this;
-      var props = $xeRadio;
       var isDisabled = $xeRadio.computeIsDisabled;
       if (!isDisabled) {
-        var label = props.label,
-          checkedValue = props.checkedValue;
-        var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        $xeRadio.handleValue(radioValue, evnt);
+        var checkValue = $xeRadio.computeCheckValue;
+        $xeRadio.handleValue(checkValue, evnt);
       }
     },
     clickEvent: function clickEvent(evnt) {
       var $xeRadio = this;
-      var props = $xeRadio;
-      var $xeRadioGroup = $xeRadio.$xeRadioGroup;
       var isDisabled = $xeRadio.computeIsDisabled;
       var isStrict = $xeRadio.computeStrict;
       if (!isDisabled && !isStrict) {
-        var label = props.label,
-          checkedValue = props.checkedValue;
-        var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
+        var isChecked = $xeRadio.computeIsChecked;
+        if (isChecked) {
           $xeRadio.handleValue(null, evnt);
         }
       }
@@ -53972,15 +54016,13 @@ var Pulldown = VxePulldown;
       var $xeRadio = this;
       var props = $xeRadio;
       var $xeRadioGroup = $xeRadio.$xeRadioGroup;
-      var label = props.label,
-        content = props.content,
-        checkedValue = props.checkedValue;
-      var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+      var content = props.content;
       var slots = $xeRadio.$scopedSlots;
       var vSize = $xeRadio.computeSize;
       var isDisabled = $xeRadio.computeIsDisabled;
       var name = $xeRadio.computeName;
-      var isChecked = $xeRadio.computeChecked;
+      var isChecked = $xeRadio.computeIsChecked;
+      var checkValue = $xeRadio.computeCheckValue;
       var defaultSlot = slots.default;
       if ($xeRadioGroup) {
         var isGroupReadonly = $xeRadioGroup.computeIsReadonly;
@@ -53996,7 +54038,7 @@ var Pulldown = VxePulldown;
         }
       }
       return h('label', {
-        key: radioValue,
+        key: "".concat(checkValue),
         class: ['vxe-radio vxe-radio--default', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--checked', isChecked), 'is--disabled', isDisabled)],
         attrs: {
           title: props.title
@@ -54022,6 +54064,13 @@ var Pulldown = VxePulldown;
       }, defaultSlot ? defaultSlot({}) : getFuncText(content))]);
     }
   },
+  mounted: function mounted() {
+    var $xeRadio = this;
+    var props = $xeRadio;
+    if (props.label !== null) {
+      radio_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }
@@ -54050,6 +54099,9 @@ var Radio = VxeRadio;
 
 
 
+
+var src_button_createComponentLog = createComponentLog('radio-button'),
+  radio_src_button_warnLog = src_button_createComponentLog.warnLog;
 /* harmony default export */ var radio_src_button = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeRadioButton',
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
@@ -54080,6 +54132,7 @@ var Radio = VxeRadio;
     },
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -54106,6 +54159,13 @@ var Radio = VxeRadio;
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
+    computeCheckValue: function computeCheckValue() {
+      var $xeRadioButton = this;
+      var props = $xeRadioButton;
+      var checkedValue = props.checkedValue,
+        label = props.label;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    },
     computeIsDisabled: function computeIsDisabled() {
       var $xeRadioButton = this;
       var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
@@ -54130,14 +54190,15 @@ var Radio = VxeRadio;
       var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
       return $xeRadioGroup ? $xeRadioGroup.strict : props.strict;
     },
-    computeChecked: function computeChecked() {
+    computeIsChecked: function computeIsChecked() {
       var $xeRadioButton = this;
       var props = $xeRadioButton;
       var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
-      var label = props.label,
-        checkedValue = props.checkedValue;
-      var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-      return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue;
+      var checkValue = $xeRadioButton.computeCheckValue;
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.value === checkValue;
+      }
+      return props.value === checkValue;
     }
   }),
   methods: {
@@ -54189,26 +54250,19 @@ var Radio = VxeRadio;
     },
     changeEvent: function changeEvent(evnt) {
       var $xeRadioButton = this;
-      var props = $xeRadioButton;
       var isDisabled = $xeRadioButton.computeIsDisabled;
       if (!isDisabled) {
-        var label = props.label,
-          checkedValue = props.checkedValue;
-        var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        $xeRadioButton.handleValue(radioValue, evnt);
+        var checkValue = $xeRadioButton.computeCheckValue;
+        $xeRadioButton.handleValue(checkValue, evnt);
       }
     },
     clickEvent: function clickEvent(evnt) {
       var $xeRadioButton = this;
-      var props = $xeRadioButton;
-      var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
       var isDisabled = $xeRadioButton.computeIsDisabled;
       var isStrict = $xeRadioButton.computeStrict;
       if (!isDisabled && !isStrict) {
-        var label = props.label,
-          checkedValue = props.checkedValue;
-        var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
+        var isChecked = $xeRadioButton.computeIsChecked;
+        if (isChecked) {
           $xeRadioButton.handleValue(null, evnt);
         }
       }
@@ -54221,15 +54275,13 @@ var Radio = VxeRadio;
       var props = $xeRadioButton;
       var slots = $xeRadioButton.$scopedSlots;
       var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
-      var label = props.label,
-        icon = props.icon,
-        content = props.content,
-        checkedValue = props.checkedValue;
-      var radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+      var icon = props.icon,
+        content = props.content;
       var vSize = $xeRadioButton.computeSize;
       var isDisabled = $xeRadioButton.computeIsDisabled;
       var name = $xeRadioButton.computeName;
-      var isChecked = $xeRadioButton.computeChecked;
+      var isChecked = $xeRadioButton.computeIsChecked;
+      var checkValue = $xeRadioButton.computeCheckValue;
       var defaultSlot = slots.default;
       if ($xeRadioGroup) {
         var isGroupReadonly = $xeRadioGroup.computeIsReadonly;
@@ -54251,7 +54303,7 @@ var Radio = VxeRadio;
         }
       }
       return h('label', {
-        key: radioValue,
+        key: "".concat(checkValue),
         class: ['vxe-radio vxe-radio--button', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--disabled', isDisabled)],
         attrs: {
           title: props.title
@@ -54283,6 +54335,13 @@ var Radio = VxeRadio;
       }, getFuncText(content)) : renderEmptyElement($xeRadioButton)])]);
     }
   },
+  mounted: function mounted() {
+    var $xeRadioButton = this;
+    var props = $xeRadioButton;
+    if (props.label !== null) {
+      radio_src_button_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+    }
+  },
   render: function render(h) {
     return this.renderVN(h);
   }
@@ -67010,7 +67069,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 +67077,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 +67092,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 +67221,7 @@ function upload_createInternalData() {
           if (cacheItem) {
             cacheItem.percent = 100;
             cacheItem.status = 'success';
+            cacheItem.response = res;
           }
           // 处理动态字段双向绑定问题
           // Object.assign(item, res)
@@ -67172,6 +67237,7 @@ function upload_createInternalData() {
           var cacheItem = fileCacheMaps[fileKey];
           if (cacheItem) {
             cacheItem.status = 'error';
+            cacheItem.response = res;
           }
           if (showErrorStatus) {
             // 处理动态字段双向绑定问题
@@ -67208,7 +67274,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 +67291,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 +67401,8 @@ function upload_createInternalData() {
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           };
         }
         var item = fileObj;
@@ -67357,12 +67424,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 +67484,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 +67999,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 +68243,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', {