vxe-pc-ui 4.15.18 → 4.15.20

package/dist/all.esm.js

@@ -81,7 +81,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.18"}`;
+const uiVersion = `ui v${"4.15.20"}`;
 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$c = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.15.18";
+const version = "4.15.20";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -960,10 +960,16 @@ var zhCN = {
                 colResizable: '列宽（像素）',
                 colVisible: '是否显示',
                 colFixed: '冻结列',
-                colFixedMax: '冻结列（最多 {0} 列）',
-                fixedLeft: '左侧',
-                fixedUnset: '不设置',
-                fixedRight: '右侧',
+                colFixedMax: '冻结列（{0}）',
+                colAlign: '对齐方式',
+                colHeadAlign: '表头对齐方式',
+                colFootAlign: '表尾对齐方式',
+                fixedLeft: '左',
+                fixedUnset: '无',
+                fixedRight: '右',
+                alignLeft: '左',
+                alignCenter: '中',
+                alignRight: '右',
                 moveUp: '上移',
                 moveDn: '下移',
                 putTop: '置顶',
@@ -971,7 +977,10 @@ var zhCN = {
                 moveUpTitle: '点击向上移动',
                 moveDnTitle: '点击向下移动',
                 putTopTitle: '点击置顶',
-                putBottomTitle: '点击置尾'
+                putBottomTitle: '点击置尾',
+                anLeftTitle: '左对齐',
+                anCenterTitle: '居中',
+                anRightTitle: '右对齐'
             }
         },
         import: {
@@ -12979,6 +12988,9 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
     name: 'VxeCheckboxButton',
     props: {
         modelValue: [String, Number, Boolean],
+        /**
+         * 已废弃，被 checkedValue 替换
+         */
         label: {
             type: [String, Number, Boolean],
             default: null
@@ -12986,13 +12998,14 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
         title: [String, Number],
         checkedValue: {
             type: [String, Number, Boolean],
-            default: true
+            default: undefined
         },
         uncheckedValue: {
             type: [String, Number, Boolean],
             default: false
         },
         content: [String, Number],
+        icon: [String, Number],
         disabled: {
             type: Boolean,
             default: null
@@ -13020,11 +13033,16 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
             context,
             reactData
         };
+        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;
+            return props.modelValue === checkValue;
         });
         const computeIsDisabled = computed(() => {
             const { disabled } = props;
@@ -13041,16 +13059,19 @@ var VxeCheckboxButtonComponent = 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);
                     $xeCheckboxButton.dispatchEvent('change', params, evnt);
                     // 自动更新校验状态
@@ -13068,10 +13089,11 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
         const checkboxButtonPrivateMethods = {};
         Object.assign($xeCheckboxButton, checkboxButtonMethods, checkboxButtonPrivateMethods);
         const renderVN = () => {
-            const { label, content } = props;
+            const { icon, content } = props;
             const vSize = computeSize.value;
             const isDisabled = computeIsDisabled.value;
             const isChecked = computeIsChecked.value;
+            const checkValue = computeCheckValue.value;
             const defaultSlot = slots.default;
             if ($xeCheckboxGroup) {
                 const { computeIsReadonly: computeIsGroupReadonly } = $xeCheckboxGroup.getComputeMaps();
@@ -13086,14 +13108,29 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
                         }, [
                             h('span', {
                                 class: 'vxe-checkbox--label'
-                            }, defaultSlot ? defaultSlot({}) : getFuncText(content))
+                            }, defaultSlot
+                                ? defaultSlot({})
+                                : [
+                                    icon
+                                        ? h('span', {
+                                            class: 'vxe-checkbox--button-icon'
+                                        }, [
+                                            h('i', { class: icon })
+                                        ])
+                                        : renderEmptyElement($xeCheckboxButton),
+                                    content
+                                        ? h('span', {
+                                            class: 'vxe-checkbox--button-content'
+                                        }, getFuncText(content))
+                                        : renderEmptyElement($xeCheckboxButton)
+                                ])
                         ]);
                     }
                     return renderEmptyElement($xeCheckboxButton);
                 }
             }
             return h('label', {
-                key: label,
+                key: `${checkValue}`,
                 class: ['vxe-checkbox vxe-checkbox--button', {
                         [`size--${vSize}`]: vSize,
                         'is--disabled': isDisabled
@@ -13111,7 +13148,22 @@ var VxeCheckboxButtonComponent = defineVxeComponent({
                     class: ['vxe-checkbox--label', {
                             'is--disabled': isDisabled
                         }]
-                }, slots.default ? slots.default({}) : getFuncText(content))
+                }, defaultSlot
+                    ? defaultSlot({})
+                    : [
+                        icon
+                            ? h('span', {
+                                class: 'vxe-checkbox--button-icon'
+                            }, [
+                                h('i', { class: icon })
+                            ])
+                            : renderEmptyElement($xeCheckboxButton),
+                        content
+                            ? h('span', {
+                                class: 'vxe-checkbox--button-content'
+                            }, getFuncText(content))
+                            : renderEmptyElement($xeCheckboxButton)
+                    ])
             ]);
         };
         $xeCheckboxButton.renderVN = renderVN;
@@ -13217,6 +13269,14 @@ var VxeCheckboxGroupComponent = defineVxeComponent({
             const propsOpts = computePropsOpts.value;
             return propsOpts.value || 'value';
         });
+        const computeIconField = computed(() => {
+            const propsOpts = computePropsOpts.value;
+            return propsOpts.icon || 'icon';
+        });
+        const computeTitleField = computed(() => {
+            const propsOpts = computePropsOpts.value;
+            return propsOpts.title || 'title';
+        });
         const computeDisabledField = computed(() => {
             const propsOpts = computePropsOpts.value;
             return propsOpts.disabled || 'disabled';
@@ -13302,6 +13362,8 @@ var VxeCheckboxGroupComponent = defineVxeComponent({
             const valueField = computeValueField.value;
             const labelField = computeLabelField.value;
             const disabledField = computeDisabledField.value;
+            const iconField = computeIconField.value;
+            const titleField = computeTitleField.value;
             const isReadonly = computeIsReadonly.value;
             const isDisabled = computeIsDisabled.value;
             return h('div', {
@@ -13316,8 +13378,10 @@ var VxeCheckboxGroupComponent = defineVxeComponent({
                     ? options.map(item => {
                         return h(VxeCheckboxComponent, {
                             key: item[valueField],
-                            label: item[valueField],
+                            checkedValue: item[valueField],
                             content: item[labelField],
+                            icon: item[iconField],
+                            title: item[titleField],
                             disabled: item[disabledField]
                         });
                     })
@@ -33808,6 +33872,7 @@ var VxeRadioButtonComponent = defineVxeComponent({
         },
         title: [String, Number],
         content: [String, Number],
+        icon: String,
         disabled: {
             type: Boolean,
             default: null
@@ -33911,7 +33976,7 @@ var VxeRadioButtonComponent = defineVxeComponent({
             }
         };
         const renderVN = () => {
-            const { label, content, checkedValue } = props;
+            const { label, icon, content, checkedValue } = props;
             const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue;
             const vSize = computeSize.value;
             const isDisabled = computeIsDisabled.value;
@@ -33930,8 +33995,23 @@ var VxeRadioButtonComponent = defineVxeComponent({
                                 }]
                         }, [
                             h('span', {
-                                class: 'vxe-checkbox--label'
-                            }, defaultSlot ? defaultSlot({}) : getFuncText(content))
+                                class: 'vxe-radio--label'
+                            }, defaultSlot
+                                ? defaultSlot({})
+                                : [
+                                    icon
+                                        ? h('span', {
+                                            class: 'vxe-radio--button-icon'
+                                        }, [
+                                            h('i', { class: icon })
+                                        ])
+                                        : renderEmptyElement($xeRadioButton),
+                                    content
+                                        ? h('span', {
+                                            class: 'vxe-radio--button-content'
+                                        }, getFuncText(content))
+                                        : renderEmptyElement($xeRadioButton)
+                                ])
                         ]);
                     }
                     return renderEmptyElement($xeRadioButton);
@@ -33958,7 +34038,22 @@ var VxeRadioButtonComponent = defineVxeComponent({
                     class: ['vxe-radio--label', {
                             'is--disabled': isDisabled
                         }]
-                }, defaultSlot ? defaultSlot({}) : getFuncText(content))
+                }, defaultSlot
+                    ? defaultSlot({})
+                    : [
+                        icon
+                            ? h('span', {
+                                class: 'vxe-radio--button-icon'
+                            }, [
+                                h('i', { class: icon })
+                            ])
+                            : renderEmptyElement($xeRadioButton),
+                        content
+                            ? h('span', {
+                                class: 'vxe-radio--button-content'
+                            }, getFuncText(content))
+                            : renderEmptyElement($xeRadioButton)
+                    ])
             ]);
         };
         $xeRadioButton.renderVN = renderVN;
@@ -34075,6 +34170,14 @@ var VxeRadioGroupComponent = defineVxeComponent({
             const propsOpts = computePropsOpts.value;
             return propsOpts.disabled || 'disabled';
         });
+        const computeIconField = computed(() => {
+            const propsOpts = computePropsOpts.value;
+            return propsOpts.icon || 'icon';
+        });
+        const computeTitleField = computed(() => {
+            const propsOpts = computePropsOpts.value;
+            return propsOpts.title || 'title';
+        });
         const emitModel = (value) => {
             emit('update:modelValue', value);
         };
@@ -34130,6 +34233,8 @@ var VxeRadioGroupComponent = defineVxeComponent({
             const valueField = computeValueField.value;
             const labelField = computeLabelField.value;
             const disabledField = computeDisabledField.value;
+            const iconField = computeIconField.value;
+            const titleField = computeTitleField.value;
             const btnComp = type === 'button' ? VxeRadioButtonComponent : VxeRadioComponent;
             return h('div', {
                 class: ['vxe-radio-group', {
@@ -34144,6 +34249,8 @@ var VxeRadioGroupComponent = defineVxeComponent({
                             key: item[valueField],
                             checkedValue: item[valueField],
                             content: item[labelField],
+                            icon: item[iconField],
+                            title: item[titleField],
                             disabled: item[disabledField]
                         });
                     })
@@ -44164,6 +44271,7 @@ var VxeUploadComponent = defineVxeComponent({
     },
     emits: [
         'update:modelValue',
+        'change',
         'add',
         'remove',
         'remove-fail',
@@ -44403,11 +44511,11 @@ var VxeUploadComponent = defineVxeComponent({
         const emitModel = (value) => {
             emit('update:modelValue', value);
         };
-        const handleChange = (value) => {
+        const handleChangeEvent = (evnt, vals) => {
             const { singleMode, urlMode, urlArgs } = 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];
@@ -44422,7 +44530,10 @@ var VxeUploadComponent = defineVxeComponent({
                     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$3().upload.getThumbnailUrlMethod;
@@ -44526,6 +44637,7 @@ var VxeUploadComponent = defineVxeComponent({
                     if (cacheItem) {
                         cacheItem.percent = 100;
                         cacheItem.status = 'success';
+                        cacheItem.response = res;
                     }
                     Object.assign(item, res);
                     dispatchEvent('upload-success', { option: item, data: res }, null);
@@ -44534,6 +44646,7 @@ var VxeUploadComponent = defineVxeComponent({
                     const cacheItem = fileCacheMaps[fileKey];
                     if (cacheItem) {
                         cacheItem.status = 'error';
+                        cacheItem.response = res;
                     }
                     if (showErrorStatus) {
                         Object.assign(item, res);
@@ -44561,7 +44674,7 @@ var VxeUploadComponent = defineVxeComponent({
             }
             return Promise.resolve();
         };
-        const handleReUpload = (item) => {
+        const handleReUploadEvent = (evnt, item) => {
             const { uploadMethod, urlMode } = props;
             const { fileCacheMaps } = reactData;
             const fileKey = getFieldKey(item);
@@ -44574,7 +44687,7 @@ var VxeUploadComponent = defineVxeComponent({
                 cacheItem.percent = 0;
                 handleUploadResult(item, file).then(() => {
                     if (urlMode) {
-                        handleChange(reactData.fileList);
+                        handleChangeEvent(evnt, reactData.fileList);
                     }
                 });
             }
@@ -44677,7 +44790,8 @@ var VxeUploadComponent = defineVxeComponent({
                         file: file,
                         loading: !!autoSubmit,
                         status: 'pending',
-                        percent: 0
+                        percent: 0,
+                        response: null
                     };
                 }
                 const item = reactive(fileObj);
@@ -44694,9 +44808,19 @@ var VxeUploadComponent = defineVxeComponent({
                 dispatchEvent('add', { option: item }, evnt);
             });
             Promise.all(uploadPromiseRests).then(() => {
+                const { fileCacheMaps } = reactData;
                 const restFileList = reactData.fileList;
-                dispatchEvent('upload-queue-end', { options: restFileList, files: selectFiles }, evnt);
-                handleChange(restFileList);
+                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);
                 // 自动更新校验状态
                 if ($xeForm && formItemInfo) {
                     $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, restFileList);
@@ -44730,7 +44854,7 @@ var VxeUploadComponent = defineVxeComponent({
         const handleRemoveEvent = (evnt, item, index) => {
             const { fileList } = reactData;
             fileList.splice(index, 1);
-            handleChange(fileList);
+            handleChangeEvent(evnt, fileList);
             // 自动更新校验状态
             if ($xeForm && formItemInfo) {
                 $xeForm.triggerItemEvent(evnt || { type: 'remove' }, formItemInfo.itemConfig.field, fileList);
@@ -45315,8 +45439,8 @@ var VxeUploadComponent = defineVxeComponent({
                                     mode: 'text',
                                     status: 'primary',
                                     content: isError ? getI18n$2('vxe.upload.reUpload') : getI18n$2('vxe.upload.manualUpload'),
-                                    onClick() {
-                                        handleReUpload(item);
+                                    onClick(evnt) {
+                                        handleReUploadEvent(evnt, item);
                                     }
                                 })
                             ])
@@ -45546,8 +45670,8 @@ var VxeUploadComponent = defineVxeComponent({
                                         mode: 'text',
                                         status: 'primary',
                                         content: isError ? getI18n$2('vxe.upload.reUpload') : getI18n$2('vxe.upload.manualUpload'),
-                                        onClick() {
-                                            handleReUpload(item);
+                                        onClick(evnt) {
+                                            handleReUploadEvent(evnt, item);
                                         }
                                     })
                                 ])