vxe-pc-ui 4.15.20 → 4.15.22

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.20"}`;
+const uiVersion = `ui v${"4.15.22"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -92,18 +92,18 @@ function createComponentLog(name) {
         errLog: log.create('error', versionInfo + '] [' + name)
     };
 }
-const warnLog$c = log.create('warn', uiVersion);
+const warnLog$g = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.15.20";
+const version = "4.15.22";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
-    warnLog$c('vxe.error.delFunc', ['config', 'setConfig']);
+    warnLog$g('vxe.error.delFunc', ['config', 'setConfig']);
     return setConfig$1(options);
 }
 function setup(options) {
-    warnLog$c('vxe.error.delFunc', ['setup', 'setConfig']);
+    warnLog$g('vxe.error.delFunc', ['setup', 'setConfig']);
     return setConfig$1(options);
 }
 VxeUI.config = config;
@@ -3108,7 +3108,7 @@ dynamicApp.use(VxeTooltip);
 VxeUI.component(VxeTooltipComponent);
 const Tooltip = VxeTooltip;
 
-const { warnLog: warnLog$b } = createComponentLog('button');
+const { warnLog: warnLog$f } = createComponentLog('button');
 const VxeButtonComponent = defineVxeComponent({
     name: 'VxeButton',
     props: {
@@ -3827,7 +3827,7 @@ const VxeButtonComponent = defineVxeComponent({
         $xeButton.renderVN = renderVN;
         onMounted(() => {
             if (props.type === 'text') {
-                warnLog$b('vxe.error.delProp', ['type=text', 'mode=text']);
+                warnLog$f('vxe.error.delProp', ['type=text', 'mode=text']);
             }
             globalEvents.on($xeButton, 'mousewheel', handleGlobalMousewheelEvent);
             globalEvents.on($xeButton, 'mousedown', handleGlobalMousedownEvent);
@@ -8389,7 +8389,7 @@ function toFloatValueFixed(inputValue, type, digitsValue, roundingMode) {
     }
 }
 
-const { warnLog: warnLog$a } = createComponentLog('input');
+const { warnLog: warnLog$e } = createComponentLog('input');
 var VxeInputComponent = defineVxeComponent({
     name: 'VxeInput',
     props: {
@@ -11026,13 +11026,13 @@ var VxeInputComponent = defineVxeComponent({
         onMounted(() => {
             const { type } = props;
             if (['date', 'time', 'datetime', 'week', 'month', 'quarter', 'year'].includes(type)) {
-                warnLog$a('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, `<vxe-date-picker type="${type}" ... />`]);
+                warnLog$e('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, `<vxe-date-picker type="${type}" ... />`]);
             }
             else if (['number', 'integer', 'float'].includes(type)) {
-                warnLog$a('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, `<vxe-number-input type="${type}" ... />`]);
+                warnLog$e('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, `<vxe-number-input type="${type}" ... />`]);
             }
             else if (['password'].includes(type)) {
-                warnLog$a('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, '<vxe-password-input ... />']);
+                warnLog$e('vxe.error.useNew', [`<vxe-input type="${type}" ... />`, '<vxe-password-input ... />']);
             }
             const inputElem = refInputTarget.value;
             if (inputElem) {
@@ -12822,10 +12822,15 @@ dynamicApp.use(VxeCascader);
 VxeUI.component(VxeCascaderComponent);
 const Cascader = VxeCascader;
 
+const { warnLog: warnLog$d } = createComponentLog('checkbox');
 var VxeCheckboxComponent = defineVxeComponent({
     name: 'VxeCheckbox',
     props: {
         modelValue: [String, Number, Boolean],
+        /**
+         * 已废弃，被 checkedValue 替换
+         * @deprecated
+         */
         label: {
             type: [String, Number],
             default: null
@@ -12869,9 +12874,14 @@ var VxeCheckboxComponent = defineVxeComponent({
         };
         let checkboxMethods = {};
         const { computeSize } = useSize(props);
+        const computeCheckValue = computed(() => {
+            const { checkedValue, label } = props;
+            return XEUtils.isUndefined(checkedValue) ? label : checkedValue;
+        });
         const computeIsChecked = computed(() => {
+            const checkValue = computeCheckValue.value;
             if ($xeCheckboxGroup) {
-                return XEUtils.includes($xeCheckboxGroup.props.modelValue, props.label);
+                return XEUtils.includes($xeCheckboxGroup.props.modelValue, checkValue);
             }
             return props.modelValue === props.checkedValue;
         });
@@ -12890,16 +12900,19 @@ var VxeCheckboxComponent = defineVxeComponent({
             return disabled;
         });
         const changeEvent = (evnt) => {
-            const { checkedValue, uncheckedValue } = props;
+            const { 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);
                     // 自动更新校验状态
@@ -12917,10 +12930,11 @@ var VxeCheckboxComponent = defineVxeComponent({
         };
         Object.assign($xeCheckbox, checkboxMethods);
         const renderVN = () => {
-            const { label, content } = props;
+            const { 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) {
@@ -12943,7 +12957,7 @@ var VxeCheckboxComponent = defineVxeComponent({
                 }
             }
             return h('label', {
-                key: label,
+                key: `${checkValue}`,
                 class: ['vxe-checkbox vxe-checkbox--default', {
                         [`size--${vSize}`]: vSize,
                         'is--indeterminate': indeterminate,
@@ -12967,6 +12981,11 @@ var VxeCheckboxComponent = defineVxeComponent({
                 }, defaultSlot ? defaultSlot({}) : getFuncText(content))
             ]);
         };
+        onMounted(() => {
+            if (props.label !== null) {
+                warnLog$d('vxe.error.delProp', ['label', 'checked-value']);
+            }
+        });
         $xeCheckbox.renderVN = renderVN;
         return $xeCheckbox;
     },
@@ -12984,12 +13003,14 @@ dynamicApp.use(VxeCheckbox);
 VxeUI.component(VxeCheckboxComponent);
 const Checkbox = VxeCheckbox;
 
+const { warnLog: warnLog$c } = createComponentLog('checkbox-button');
 var VxeCheckboxButtonComponent = defineVxeComponent({
     name: 'VxeCheckboxButton',
     props: {
         modelValue: [String, Number, Boolean],
         /**
          * 已废弃，被 checkedValue 替换
+         * @deprecated
          */
         label: {
             type: [String, Number, Boolean],
@@ -13166,6 +13187,11 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
                     ])
             ]);
         };
+        onMounted(() => {
+            if (props.label !== null) {
+                warnLog$c('vxe.error.delProp', ['label', 'checked-value']);
+            }
+        });
         $xeCheckboxButton.renderVN = renderVN;
         return renderVN;
     }
@@ -19127,7 +19153,7 @@ dynamicApp.use(VxeDatePanel);
 VxeUI.component(VxeDatePanelComponent);
 const DatePanel = VxeDatePanel;
 
-const { warnLog: warnLog$9, errLog: errLog$e } = createComponentLog('date-picker');
+const { warnLog: warnLog$b, errLog: errLog$e } = createComponentLog('date-picker');
 const defaultMaskPlaceholder = '_';
 const maskedTypes = ['year', 'month', 'date', 'datetime', 'time'];
 const inputMaskedKeys = ['y', 'M', 'd', 'H', 'm', 'n', 's'];
@@ -20705,7 +20731,7 @@ var VxeDatePickerComponent = defineVxeComponent({
                     errLog$e('vxe.error.notSupportProp', ['multiple', 'control-config.enabled=true', 'control-config.enabled=false']);
                 }
                 if (!maskedTypes.includes(type)) {
-                    warnLog$9('vxe.error.notSupportProp', ['control-config.enabled=true', `type=${type}`, `type=${maskedTypes.join('|')}`]);
+                    warnLog$b('vxe.error.notSupportProp', ['control-config.enabled=true', `type=${type}`, `type=${maskedTypes.join('|')}`]);
                 }
             }
         });
@@ -24088,7 +24114,7 @@ renderer.mixin({
     // 以上已废弃
 });
 
-const { warnLog: warnLog$8, errLog: errLog$a } = createComponentLog('form');
+const { warnLog: warnLog$a, errLog: errLog$a } = createComponentLog('form');
 class Rule {
     constructor(rule) {
         Object.assign(this, {
@@ -24620,7 +24646,7 @@ var VxeFormComponent = defineVxeComponent({
                                                 customValid = validatorMethod(validParams);
                                             }
                                             else {
-                                                warnLog$8('vxe.error.notValidators', [validator]);
+                                                warnLog$a('vxe.error.notValidators', [validator]);
                                             }
                                         }
                                         else {
@@ -28028,7 +28054,7 @@ dynamicApp.use(VxeMenu);
 VxeUI.component(VxeMenuComponent);
 const Menu = VxeMenu;
 
-const { warnLog: warnLog$7, errLog: errLog$8 } = createComponentLog('modal');
+const { warnLog: warnLog$9, errLog: errLog$8 } = createComponentLog('modal');
 const allActiveModals = [];
 const msgQueue = [];
 const notifyQueue = [];
@@ -29415,7 +29441,7 @@ var VxeModalComponent = defineVxeComponent({
         });
         onMounted(() => {
             if (props.type === 'modal' && props.showFooter && !(props.showConfirmButton || props.showCancelButton || slots.footer)) {
-                warnLog$7('vxe.modal.footPropErr');
+                warnLog$9('vxe.modal.footPropErr');
             }
             reactData.initialized = !!props.preload;
             nextTick(() => {
@@ -31609,7 +31635,7 @@ dynamicApp.use(VxeSelect);
 VxeUI.component(VxeSelectComponent);
 const Select = VxeSelect;
 
-const { warnLog: warnLog$6, errLog: errLog$6 } = createComponentLog('pager');
+const { warnLog: warnLog$8, errLog: errLog$6 } = createComponentLog('pager');
 var VxePagerComponent = defineVxeComponent({
     name: 'VxePager',
     props: {
@@ -32211,7 +32237,7 @@ var VxePagerComponent = defineVxeComponent({
              * @deprecated
              */
             jumpPage(currentPage) {
-                warnLog$6('vxe.error.delFunc', ['jumpPage', 'setCurrentPage']);
+                warnLog$8('vxe.error.delFunc', ['jumpPage', 'setCurrentPage']);
                 return $xePager.setCurrentPage(currentPage);
             }
         };
@@ -32808,7 +32834,7 @@ function handlePrint(opts, printHtml = '') {
     if (styleUrls && styleUrls.length) {
         styleUrls.forEach(url => {
             if (!/.css$/.test(url)) {
-                warnLog$c('vxe.error.errProp', [url, `${url}.css`]);
+                warnLog$g('vxe.error.errProp', [url, `${url}.css`]);
             }
         });
     }
@@ -33679,6 +33705,7 @@ dynamicApp.use(VxePulldown);
 VxeUI.component(VxePulldownComponent);
 const Pulldown = VxePulldown;
 
+const { warnLog: warnLog$7 } = createComponentLog('radio');
 var VxeRadioComponent = defineVxeComponent({
     name: 'VxeRadio',
     props: {
@@ -33704,6 +33731,7 @@ var VxeRadioComponent = defineVxeComponent({
         },
         /**
          * 已废弃，被 checkedValue 替换
+         * @deprecated
          */
         label: {
             type: [String, Number, Boolean],
@@ -33728,6 +33756,10 @@ var VxeRadioComponent = defineVxeComponent({
             reactData
         };
         const { computeSize } = useSize(props);
+        const computeCheckValue = computed(() => {
+            const { checkedValue, label } = props;
+            return XEUtils.isUndefined(checkedValue) ? label : checkedValue;
+        });
         const computeIsDisabled = computed(() => {
             const { disabled } = props;
             if (disabled === null) {
@@ -33746,10 +33778,12 @@ var VxeRadioComponent = defineVxeComponent({
         const computeStrict = computed(() => {
             return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict;
         });
-        const computeChecked = computed(() => {
-            const { label, checkedValue } = props;
-            const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
-            return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
+        const computeIsChecked = computed(() => {
+            const checkValue = computeCheckValue.value;
+            if ($xeRadioGroup) {
+                return $xeRadioGroup.props.modelValue === checkValue;
+            }
+            return props.modelValue === checkValue;
         });
         const handleValue = (checkedValue, evnt) => {
             const { content } = props;
@@ -33768,18 +33802,16 @@ var VxeRadioComponent = defineVxeComponent({
         const changeEvent = (evnt) => {
             const isDisabled = computeIsDisabled.value;
             if (!isDisabled) {
-                const { label, checkedValue } = props;
-                const radioValue = XEUtils.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 = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
-                if (radioValue === ($xeRadioGroup ? $xeRadioGroup.props.modelValue : props.modelValue)) {
+                const isChecked = computeIsChecked.value;
+                if (isChecked) {
                     handleValue(null, evnt);
                 }
             }
@@ -33793,12 +33825,12 @@ var VxeRadioComponent = defineVxeComponent({
         const radioPrivateMethods = {};
         Object.assign($xeRadio, radioMethods, radioPrivateMethods);
         const renderVN = () => {
-            const { label, content, checkedValue } = props;
-            const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
+            const { content } = props;
             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 { computeIsReadonly: computeIsGroupReadonly } = $xeRadioGroup.getComputeMaps();
@@ -33820,7 +33852,7 @@ var VxeRadioComponent = defineVxeComponent({
                 }
             }
             return h('label', {
-                key: radioValue,
+                key: `${checkValue}`,
                 class: ['vxe-radio vxe-radio--default', {
                         [`size--${vSize}`]: vSize,
                         'is--checked': isChecked,
@@ -33845,6 +33877,11 @@ var VxeRadioComponent = defineVxeComponent({
                 }, defaultSlot ? defaultSlot({}) : getFuncText(content))
             ]);
         };
+        onMounted(() => {
+            if (props.label !== null) {
+                warnLog$7('vxe.error.delProp', ['label', 'checked-value']);
+            }
+        });
         $xeRadio.renderVN = renderVN;
         return $xeRadio;
     },
@@ -33862,6 +33899,7 @@ dynamicApp.use(VxeRadio);
 VxeUI.component(VxeRadioComponent);
 const Radio = VxeRadio;
 
+const { warnLog: warnLog$6 } = createComponentLog('radio-button');
 var VxeRadioButtonComponent = defineVxeComponent({
     name: 'VxeRadioButton',
     props: {
@@ -33887,6 +33925,7 @@ var VxeRadioButtonComponent = defineVxeComponent({
         },
         /**
          * 已废弃，被 checkedValue 替换
+         * @deprecated
          */
         label: {
             type: [String, Number, Boolean],
@@ -33911,6 +33950,10 @@ var VxeRadioButtonComponent = defineVxeComponent({
             context,
             reactData
         };
+        const computeCheckValue = computed(() => {
+            const { checkedValue, label } = props;
+            return XEUtils.isUndefined(checkedValue) ? label : checkedValue;
+        });
         const computeIsDisabled = computed(() => {
             const { disabled } = props;
             if (disabled === null) {
@@ -33929,10 +33972,12 @@ var VxeRadioButtonComponent = defineVxeComponent({
         const computeStrict = computed(() => {
             return $xeRadioGroup ? $xeRadioGroup.props.strict : props.strict;
         });
-        const computeChecked = computed(() => {
-            const { label, checkedValue } = props;
-            const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
-            return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
+        const computeIsChecked = 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, { $radioGroup: $xeRadioGroup }, params));
@@ -33959,29 +34004,27 @@ var VxeRadioButtonComponent = defineVxeComponent({
         const changeEvent = (evnt) => {
             const isDisabled = computeIsDisabled.value;
             if (!isDisabled) {
-                const { label, checkedValue } = props;
-                const radioValue = XEUtils.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 = XEUtils.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 } = props;
-            const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
+            const { icon, content } = props;
             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 { computeIsReadonly: computeIsGroupReadonly } = $xeRadioGroup.getComputeMaps();
@@ -34018,7 +34061,7 @@ var VxeRadioButtonComponent = defineVxeComponent({
                 }
             }
             return h('label', {
-                key: radioValue,
+                key: `${checkValue}`,
                 class: ['vxe-radio vxe-radio--button', {
                         [`size--${vSize}`]: vSize,
                         'is--disabled': isDisabled
@@ -34056,6 +34099,11 @@ var VxeRadioButtonComponent = defineVxeComponent({
                     ])
             ]);
         };
+        onMounted(() => {
+            if (props.label !== null) {
+                warnLog$6('vxe.error.delProp', ['label', 'checked-value']);
+            }
+        });
         $xeRadioButton.renderVN = renderVN;
         return renderVN;
     }
@@ -44662,7 +44710,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 {
@@ -44810,7 +44863,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 {
@@ -44823,7 +44876,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);
                 }
             });
         };