vxe-pc-ui 4.15.19 → 4.15.21

package/lib/index.umd.js

@@ -4657,7 +4657,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.15.19"}`;
+const uiVersion = `ui v${"4.15.21"}`;
 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.19";
+const ui_version = "4.15.21";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -18711,10 +18711,18 @@ const Cascader = VxeCascader;
 
 
 
+
+const {
+  warnLog: checkbox_warnLog
+} = createComponentLog('checkbox');
 /* harmony default export */ var src_checkbox = (defineVxeComponent({
   name: 'VxeCheckbox',
   props: {
     modelValue: [String, Number, Boolean],
+    /**
+     * 已废弃，被 checkedValue 替换
+     * @deprecated
+     */
     label: {
       type: [String, Number],
       default: null
@@ -18760,9 +18768,17 @@ const Cascader = VxeCascader;
     const {
       computeSize
     } = useSize(props);
+    const computeCheckValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        checkedValue,
+        label
+      } = props;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    });
     const computeIsChecked = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const checkValue = computeCheckValue.value;
       if ($xeCheckboxGroup) {
-        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes($xeCheckboxGroup.props.modelValue, props.label);
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes($xeCheckboxGroup.props.modelValue, checkValue);
       }
       return props.modelValue === props.checkedValue;
     });
@@ -18788,21 +18804,27 @@ const Cascader = VxeCascader;
     });
     const changeEvent = evnt => {
       const {
-        checkedValue,
         uncheckedValue
       } = props;
       const isDisabled = computeIsDisabled.value;
+      const checkValue = computeCheckValue.value;
       if (!isDisabled) {
         const checked = evnt.target.checked;
-        const value = checked ? checkedValue : uncheckedValue;
-        const params = {
-          checked,
-          value,
-          label: props.label
-        };
         if ($xeCheckboxGroup) {
+          const value = checkValue;
+          const params = {
+            checked,
+            value,
+            label: value
+          };
           $xeCheckboxGroup.handleChecked(params, evnt);
         } else {
+          const value = checked ? checkValue : uncheckedValue;
+          const params = {
+            checked,
+            value,
+            label: value
+          };
           emit('update:modelValue', value);
           checkboxMethods.dispatchEvent('change', params, evnt);
           // 自动更新校验状态
@@ -18823,12 +18845,12 @@ const Cascader = VxeCascader;
     Object.assign($xeCheckbox, checkboxMethods);
     const renderVN = () => {
       const {
-        label,
         content
       } = props;
       const vSize = computeSize.value;
       const isDisabled = computeIsDisabled.value;
       const isChecked = computeIsChecked.value;
+      const checkValue = computeCheckValue.value;
       const indeterminate = !isChecked && props.indeterminate;
       const defaultSlot = slots.default;
       if ($xeCheckboxGroup) {
@@ -18851,7 +18873,7 @@ const Cascader = VxeCascader;
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('label', {
-        key: label,
+        key: `${checkValue}`,
         class: ['vxe-checkbox vxe-checkbox--default', {
           [`size--${vSize}`]: vSize,
           'is--indeterminate': indeterminate,
@@ -18871,6 +18893,11 @@ const Cascader = VxeCascader;
         class: 'vxe-checkbox--label'
       }, defaultSlot ? defaultSlot({}) : getFuncText(content))]);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      if (props.label !== null) {
+        checkbox_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+      }
+    });
     $xeCheckbox.renderVN = renderVN;
     return $xeCheckbox;
   },
@@ -18898,12 +18925,17 @@ const Checkbox = VxeCheckbox;
 
 
 
+
+const {
+  warnLog: src_button_warnLog
+} = createComponentLog('checkbox-button');
 /* harmony default export */ var checkbox_src_button = (defineVxeComponent({
   name: 'VxeCheckboxButton',
   props: {
     modelValue: [String, Number, Boolean],
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -19084,6 +19116,11 @@ const Checkbox = VxeCheckbox;
         class: 'vxe-checkbox--button-content'
       }, getFuncText(content)) : renderEmptyElement($xeCheckboxButton)])]);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      if (props.label !== null) {
+        src_button_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+      }
+    });
     $xeCheckboxButton.renderVN = renderVN;
     return renderVN;
   }
@@ -41922,6 +41959,10 @@ const Pulldown = VxePulldown;
 
 
 
+
+const {
+  warnLog: radio_warnLog
+} = createComponentLog('radio');
 /* harmony default export */ var src_radio = (defineVxeComponent({
   name: 'VxeRadio',
   props: {
@@ -41947,6 +41988,7 @@ const Pulldown = VxePulldown;
     },
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -41973,6 +42015,13 @@ const Pulldown = VxePulldown;
     const {
       computeSize
     } = useSize(props);
+    const computeCheckValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        checkedValue,
+        label
+      } = props;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    });
     const computeIsDisabled = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         disabled
@@ -41996,13 +42045,12 @@ const Pulldown = VxePulldown;
     const computeStrict = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict;
     });
-    const computeChecked = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      const {
-        label,
-        checkedValue
-      } = props;
-      const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-      return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
+    const computeIsChecked = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const checkValue = computeCheckValue.value;
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.props.modelValue === checkValue;
+      }
+      return props.modelValue === checkValue;
     });
     const handleValue = (checkedValue, evnt) => {
       const {
@@ -42031,24 +42079,16 @@ const Pulldown = VxePulldown;
     const changeEvent = evnt => {
       const isDisabled = computeIsDisabled.value;
       if (!isDisabled) {
-        const {
-          label,
-          checkedValue
-        } = props;
-        const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        handleValue(radioValue, evnt);
+        const checkValue = computeCheckValue.value;
+        handleValue(checkValue, evnt);
       }
     };
     const clickEvent = evnt => {
       const isDisabled = computeIsDisabled.value;
       const isStrict = computeStrict.value;
       if (!isDisabled && !isStrict) {
-        const {
-          label,
-          checkedValue
-        } = props;
-        const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.props.modelValue : props.modelValue)) {
+        const isChecked = computeIsChecked.value;
+        if (isChecked) {
           handleValue(null, evnt);
         }
       }
@@ -42065,15 +42105,13 @@ const Pulldown = VxePulldown;
     Object.assign($xeRadio, radioMethods, radioPrivateMethods);
     const renderVN = () => {
       const {
-        label,
-        content,
-        checkedValue
+        content
       } = props;
-      const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
       const vSize = computeSize.value;
       const isDisabled = computeIsDisabled.value;
       const name = computeName.value;
-      const isChecked = computeChecked.value;
+      const isChecked = computeIsChecked.value;
+      const checkValue = computeCheckValue.value;
       const defaultSlot = slots.default;
       if ($xeRadioGroup) {
         const {
@@ -42095,7 +42133,7 @@ const Pulldown = VxePulldown;
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--default', {
           [`size--${vSize}`]: vSize,
           'is--checked': isChecked,
@@ -42116,6 +42154,11 @@ const Pulldown = VxePulldown;
         class: 'vxe-radio--label'
       }, defaultSlot ? defaultSlot({}) : getFuncText(content))]);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      if (props.label !== null) {
+        radio_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+      }
+    });
     $xeRadio.renderVN = renderVN;
     return $xeRadio;
   },
@@ -42142,6 +42185,10 @@ const Radio = VxeRadio;
 
 
 
+
+const {
+  warnLog: radio_src_button_warnLog
+} = createComponentLog('radio-button');
 /* harmony default export */ var radio_src_button = (defineVxeComponent({
   name: 'VxeRadioButton',
   props: {
@@ -42167,6 +42214,7 @@ const Radio = VxeRadio;
     },
     /**
      * 已废弃，被 checkedValue 替换
+     * @deprecated
      */
     label: {
       type: [String, Number, Boolean],
@@ -42193,6 +42241,13 @@ const Radio = VxeRadio;
       context,
       reactData
     };
+    const computeCheckValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        checkedValue,
+        label
+      } = props;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
+    });
     const computeIsDisabled = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         disabled
@@ -42216,13 +42271,12 @@ const Radio = VxeRadio;
     const computeStrict = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict;
     });
-    const computeChecked = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      const {
-        label,
-        checkedValue
-      } = props;
-      const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-      return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
+    const computeIsChecked = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const checkValue = computeCheckValue.value;
+      if ($xeRadioGroup) {
+        return $xeRadioGroup.props.modelValue === checkValue;
+      }
+      return props.modelValue === checkValue;
     });
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, {
@@ -42261,40 +42315,30 @@ const Radio = VxeRadio;
     const changeEvent = evnt => {
       const isDisabled = computeIsDisabled.value;
       if (!isDisabled) {
-        const {
-          label,
-          checkedValue
-        } = props;
-        const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        handleValue(radioValue, evnt);
+        const checkValue = computeCheckValue.value;
+        handleValue(checkValue, evnt);
       }
     };
     const clickEvent = evnt => {
       const isDisabled = computeIsDisabled.value;
       const isStrict = computeStrict.value;
       if (!isDisabled && !isStrict) {
-        const {
-          label,
-          checkedValue
-        } = props;
-        const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
-        if (radioValue === ($xeRadioGroup ? $xeRadioGroup.props.modelValue : props.modelValue)) {
+        const isChecked = computeIsChecked.value;
+        if (isChecked) {
           handleValue(null, evnt);
         }
       }
     };
     const renderVN = () => {
       const {
-        label,
         icon,
-        content,
-        checkedValue
+        content
       } = props;
-      const radioValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(checkedValue) ? label : checkedValue;
       const vSize = computeSize.value;
       const isDisabled = computeIsDisabled.value;
       const name = computeName.value;
-      const isChecked = computeChecked.value;
+      const isChecked = computeIsChecked.value;
+      const checkValue = computeCheckValue.value;
       const defaultSlot = slots.default;
       if ($xeRadioGroup) {
         const {
@@ -42322,7 +42366,7 @@ const Radio = VxeRadio;
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('label', {
-        key: radioValue,
+        key: `${checkValue}`,
         class: ['vxe-radio vxe-radio--button', {
           [`size--${vSize}`]: vSize,
           'is--disabled': isDisabled
@@ -42348,6 +42392,11 @@ const Radio = VxeRadio;
         class: 'vxe-radio--button-content'
       }, getFuncText(content)) : renderEmptyElement($xeRadioButton)])]);
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      if (props.label !== null) {
+        radio_src_button_warnLog('vxe.error.delProp', ['label', 'checked-value']);
+      }
+    });
     $xeRadioButton.renderVN = renderVN;
     return renderVN;
   }
@@ -53919,7 +53968,7 @@ function upload_createInternalData() {
       default: () => getConfig().upload.size || getConfig().size
     }
   },
-  emits: ['update:modelValue', 'add', 'remove', 'remove-fail', 'download', 'download-fail', 'upload-start', 'upload-success', 'upload-error', 'upload-end', 'upload-queue-start', 'upload-queue-end', 'sort-dragend', 'more-visible'],
+  emits: ['update:modelValue', 'change', 'add', 'remove', 'remove-fail', 'download', 'download-fail', 'upload-start', 'upload-success', 'upload-error', 'upload-end', 'upload-queue-start', 'upload-queue-end', 'sort-dragend', 'more-visible'],
   setup(props, context) {
     const {
       emit,
@@ -54175,7 +54224,7 @@ function upload_createInternalData() {
     const emitModel = value => {
       emit('update:modelValue', value);
     };
-    const handleChange = value => {
+    const handleChangeEvent = (evnt, vals) => {
       const {
         singleMode,
         urlMode,
@@ -54183,7 +54232,7 @@ function upload_createInternalData() {
       } = props;
       const urlProp = computeUrlProp.value;
       const nameProp = computeNameProp.value;
-      let restList = value ? value.slice(0) : [];
+      let restList = vals ? vals.slice(0) : [];
       if (urlMode) {
         restList = restList.map(item => {
           const url = item[urlProp];
@@ -54198,7 +54247,12 @@ function upload_createInternalData() {
           return url;
         });
       }
-      emitModel(singleMode ? restList[0] || null : restList);
+      const value = singleMode ? restList[0] || null : restList;
+      emitModel(value);
+      dispatchEvent('change', {
+        value
+      }, evnt);
+      return value;
     };
     const getThumbnailFileUrl = item => {
       const getThumbnailUrlFn = props.getThumbnailUrlMethod || getConfig().upload.getThumbnailUrlMethod;
@@ -54324,6 +54378,7 @@ function upload_createInternalData() {
           if (cacheItem) {
             cacheItem.percent = 100;
             cacheItem.status = 'success';
+            cacheItem.response = res;
           }
           Object.assign(item, res);
           dispatchEvent('upload-success', {
@@ -54337,6 +54392,7 @@ function upload_createInternalData() {
           const cacheItem = fileCacheMaps[fileKey];
           if (cacheItem) {
             cacheItem.status = 'error';
+            cacheItem.response = res;
           }
           if (showErrorStatus) {
             Object.assign(item, res);
@@ -54371,7 +54427,7 @@ function upload_createInternalData() {
       }
       return Promise.resolve();
     };
-    const handleReUpload = item => {
+    const handleReUploadEvent = (evnt, item) => {
       const {
         uploadMethod,
         urlMode
@@ -54389,7 +54445,7 @@ function upload_createInternalData() {
         cacheItem.percent = 0;
         handleUploadResult(item, file).then(() => {
           if (urlMode) {
-            handleChange(reactData.fileList);
+            handleChangeEvent(evnt, reactData.fileList);
           }
         });
       }
@@ -54507,7 +54563,8 @@ function upload_createInternalData() {
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           };
         }
         const item = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(fileObj);
@@ -54529,12 +54586,26 @@ function upload_createInternalData() {
         }, evnt);
       });
       Promise.all(uploadPromiseRests).then(() => {
+        const {
+          fileCacheMaps
+        } = reactData;
         const restFileList = reactData.fileList;
+        const uploadResults = restFileList.map(option => {
+          const fileKey = getFieldKey(option);
+          const cacheItem = fileCacheMaps[fileKey];
+          return {
+            option,
+            status: cacheItem ? cacheItem.status : null,
+            response: cacheItem ? cacheItem.response : null
+          };
+        });
+        const value = handleChangeEvent(evnt, restFileList);
         dispatchEvent('upload-queue-end', {
+          value,
           options: restFileList,
+          results: uploadResults,
           files: selectFiles
         }, evnt);
-        handleChange(restFileList);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {
           $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, restFileList);
@@ -54574,7 +54645,7 @@ function upload_createInternalData() {
         fileList
       } = reactData;
       fileList.splice(index, 1);
-      handleChange(fileList);
+      handleChangeEvent(evnt, fileList);
       // 自动更新校验状态
       if ($xeForm && formItemInfo) {
         $xeForm.triggerItemEvent(evnt || {
@@ -55231,8 +55302,8 @@ function upload_createInternalData() {
           mode: 'text',
           status: 'primary',
           content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
-          onClick() {
-            handleReUpload(item);
+          onClick(evnt) {
+            handleReUploadEvent(evnt, item);
           }
         })]) : renderEmptyElement($xeUpload), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--file-item-btn-wrapper'
@@ -55455,8 +55526,8 @@ function upload_createInternalData() {
           mode: 'text',
           status: 'primary',
           content: isError ? getI18n('vxe.upload.reUpload') : getI18n('vxe.upload.manualUpload'),
-          onClick() {
-            handleReUpload(item);
+          onClick(evnt) {
+            handleReUploadEvent(evnt, item);
           }
         })]) : renderEmptyElement($xeUpload), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           class: 'vxe-upload--image-item-btn-wrapper',