vxe-pc-ui 3.15.18 → 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.18");
+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.18";
+var ui_version = "3.15.20";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -14111,10 +14111,16 @@ setIcon({
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
         colFixed: '冻结列',
-        colFixedMax: '冻结列（最多 {0} 列）',
-        fixedLeft: '左侧',
-        fixedUnset: '不设置',
-        fixedRight: '右侧',
+        colFixedMax: '冻结列（{0}）',
+        colAlign: '对齐方式',
+        colHeadAlign: '表头对齐方式',
+        colFootAlign: '表尾对齐方式',
+        fixedLeft: '左',
+        fixedUnset: '无',
+        fixedRight: '右',
+        alignLeft: '左',
+        alignCenter: '中',
+        alignRight: '右',
         moveUp: '上移',
         moveDn: '下移',
         putTop: '置顶',
@@ -14122,7 +14128,10 @@ setIcon({
         moveUpTitle: '点击向上移动',
         moveDnTitle: '点击向下移动',
         putTopTitle: '点击置顶',
-        putBottomTitle: '点击置尾'
+        putBottomTitle: '点击置尾',
+        anLeftTitle: '左对齐',
+        anCenterTitle: '居中',
+        anRightTitle: '右对齐'
       }
     },
     import: {
@@ -28687,6 +28696,9 @@ var Checkbox = VxeCheckbox;
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
   props: {
     value: [String, Number, Boolean],
+    /**
+     * 已废弃，被 checkedValue 替换
+     */
     label: {
       type: [String, Number, Boolean],
       default: null
@@ -28698,9 +28710,10 @@ var Checkbox = VxeCheckbox;
     },
     uncheckedValue: {
       type: [String, Number, Boolean],
-      default: false
+      default: undefined
     },
     content: [String, Number],
+    icon: [String, Number],
     disabled: {
       type: Boolean,
       default: null
@@ -28732,21 +28745,29 @@ var Checkbox = VxeCheckbox;
     };
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
+    computeCheckValue: function computeCheckValue() {
+      var $xeCheckboxButton = this;
+      var props = $xeCheckboxButton;
+      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 $xeCheckboxButton = this;
+      var props = $xeCheckboxButton;
+      var $xeCheckboxGroup = $xeCheckboxButton.$xeCheckboxGroup;
+      var checkValue = $xeCheckboxButton.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;
+      return props.value === checkValue;
     },
     computeIsDisabled: function computeIsDisabled() {
-      var $xeCheckbox = this;
-      var props = $xeCheckbox;
-      var $xeCheckboxGroup = $xeCheckbox.$xeCheckboxGroup;
+      var $xeCheckboxButton = this;
+      var props = $xeCheckboxButton;
+      var $xeCheckboxGroup = $xeCheckboxButton.$xeCheckboxGroup;
       var disabled = props.disabled;
-      var isChecked = $xeCheckbox.computeIsChecked;
+      var isChecked = $xeCheckboxButton.computeIsChecked;
       if (disabled === null) {
         if ($xeCheckboxGroup) {
           var isGroupDisabled = $xeCheckboxGroup.computeIsDisabled;
@@ -28763,46 +28784,52 @@ var Checkbox = VxeCheckbox;
     // Method
     //
     dispatchEvent: function dispatchEvent(type, params, evnt) {
-      var $xeCheckbox = this;
-      $xeCheckbox.$emit(type, createEvent(evnt, {
-        $checkbox: $xeCheckbox
+      var $xeCheckboxButton = this;
+      $xeCheckboxButton.$emit(type, createEvent(evnt, {
+        $checkboxButton: $xeCheckboxButton
       }, params));
     },
     emitModel: function emitModel(value) {
-      var $xeCheckbox = this;
-      var _events = $xeCheckbox._events;
-      $xeCheckbox.$emit('input', value);
+      var $xeCheckboxButton = this;
+      var _events = $xeCheckboxButton._events;
+      $xeCheckboxButton.$emit('input', value);
       if (_events && _events.modelValue) {
-        $xeCheckbox.$emit('modelValue', value);
+        $xeCheckboxButton.$emit('modelValue', value);
       } else {
-        $xeCheckbox.$emit('model-value', value);
+        $xeCheckboxButton.$emit('model-value', value);
       }
     },
     changeEvent: function changeEvent(evnt) {
-      var $xeCheckbox = this;
-      var props = $xeCheckbox;
-      var $xeCheckboxGroup = $xeCheckbox.$xeCheckboxGroup;
-      var $xeForm = $xeCheckbox.$xeForm;
-      var formItemInfo = $xeCheckbox.formItemInfo;
-      var checkedValue = props.checkedValue,
-        uncheckedValue = props.uncheckedValue;
-      var isDisabled = $xeCheckbox.computeIsDisabled;
+      var $xeCheckboxButton = this;
+      var props = $xeCheckboxButton;
+      var $xeCheckboxGroup = $xeCheckboxButton.$xeCheckboxGroup;
+      var $xeForm = $xeCheckboxButton.$xeForm;
+      var formItemInfo = $xeCheckboxButton.formItemInfo;
+      var uncheckedValue = props.uncheckedValue;
+      var isDisabled = $xeCheckboxButton.computeIsDisabled;
+      var checkValue = $xeCheckboxButton.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
+          };
+          $xeCheckboxButton.emitModel(_value);
+          $xeCheckboxButton.dispatchEvent('change', _params, evnt);
           // 自动更新校验状态
           if ($xeForm && formItemInfo) {
-            $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, value);
+            $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, _value);
           }
         }
       }
@@ -28815,11 +28842,12 @@ var Checkbox = VxeCheckbox;
       var props = $xeCheckboxButton;
       var slots = $xeCheckboxButton.$scopedSlots;
       var $xeCheckboxGroup = $xeCheckboxButton.$xeCheckboxGroup;
-      var label = props.label,
+      var icon = props.icon,
         content = props.content;
       var vSize = $xeCheckboxButton.computeSize;
       var isDisabled = $xeCheckboxButton.computeIsDisabled;
       var isChecked = $xeCheckboxButton.computeIsChecked;
+      var checkValue = $xeCheckboxButton.computeCheckValue;
       var defaultSlot = slots.default;
       if ($xeCheckboxGroup) {
         var isGroupReadonly = $xeCheckboxGroup.computeIsReadonly;
@@ -28829,13 +28857,19 @@ var Checkbox = VxeCheckbox;
               class: ['vxe-checkbox vxe-checkbox--button-view', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--readonly', isGroupReadonly)]
             }, [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: "".concat(checkValue),
         class: ['vxe-checkbox vxe-checkbox--button', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--disabled', isDisabled)],
         attrs: {
           title: props.title
@@ -28856,7 +28890,13 @@ var Checkbox = VxeCheckbox;
         class: ['vxe-checkbox--label', {
           'is--disabled': isDisabled
         }]
-      }, defaultSlot ? defaultSlot({}) : getFuncText(props.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)])]);
     }
   },
   render: function render(h) {
@@ -29013,6 +29053,16 @@ function group_createInternalData() {
       var propsOpts = $xeCheckboxGroup.computePropsOpts;
       return propsOpts.value || 'value';
     },
+    computeIconField: function computeIconField() {
+      var $xeCheckboxGroup = this;
+      var propsOpts = $xeCheckboxGroup.computePropsOpts;
+      return propsOpts.icon || 'icon';
+    },
+    computeTitleField: function computeTitleField() {
+      var $xeCheckboxGroup = this;
+      var propsOpts = $xeCheckboxGroup.computePropsOpts;
+      return propsOpts.title || 'title';
+    },
     computeDisabledField: function computeDisabledField() {
       var $xeCheckboxGroup = this;
       var propsOpts = $xeCheckboxGroup.computePropsOpts;
@@ -29116,6 +29166,8 @@ function group_createInternalData() {
       var valueField = $xeCheckboxGroup.computeValueField;
       var labelField = $xeCheckboxGroup.computeLabelField;
       var disabledField = $xeCheckboxGroup.computeDisabledField;
+      var iconField = $xeCheckboxGroup.computeIconField;
+      var titleField = $xeCheckboxGroup.computeTitleField;
       var isReadonly = $xeCheckboxGroup.computeIsReadonly;
       var isDisabled = $xeCheckboxGroup.computeIsDisabled;
       return h('div', {
@@ -29124,8 +29176,10 @@ function group_createInternalData() {
         return h(src_checkbox, {
           key: item[valueField],
           props: {
-            label: item[valueField],
+            checkedValue: item[valueField],
             content: item[labelField],
+            icon: item[iconField],
+            title: item[titleField],
             disabled: item[disabledField]
           }
         });
@@ -54007,6 +54061,7 @@ var Radio = VxeRadio;
     },
     title: [String, Number],
     content: [String, Number],
+    icon: String,
     disabled: {
       type: Boolean,
       default: null
@@ -54167,6 +54222,7 @@ var Radio = VxeRadio;
       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;
@@ -54183,7 +54239,13 @@ var Radio = VxeRadio;
               class: ['vxe-radio vxe-radio--button-view', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--readonly', isGroupReadonly)]
             }, [h('span', {
               class: 'vxe-checkbox--label'
-            }, 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)])]);
           }
           return renderEmptyElement($xeRadioButton);
         }
@@ -54212,7 +54274,13 @@ var Radio = VxeRadio;
         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)])]);
     }
   },
   render: function render(h) {
@@ -54366,6 +54434,16 @@ function src_group_createInternalData() {
       var $xeRadioGroup = this;
       var propsOpts = $xeRadioGroup.computePropsOpts;
       return propsOpts.disabled || 'disabled';
+    },
+    computeIconField: function computeIconField() {
+      var $xeRadioGroup = this;
+      var propsOpts = $xeRadioGroup.computePropsOpts;
+      return propsOpts.icon || 'icon';
+    },
+    computeTitleField: function computeTitleField() {
+      var $xeRadioGroup = this;
+      var propsOpts = $xeRadioGroup.computePropsOpts;
+      return propsOpts.title || 'title';
     }
   }),
   methods: {
@@ -54454,6 +54532,8 @@ function src_group_createInternalData() {
       var valueField = $xeRadioGroup.computeValueField;
       var labelField = $xeRadioGroup.computeLabelField;
       var disabledField = $xeRadioGroup.computeDisabledField;
+      var iconField = $xeRadioGroup.computeIconField;
+      var titleField = $xeRadioGroup.computeTitleField;
       var btnComp = type === 'button' ? radio_src_button : src_radio;
       return h('div', {
         class: ['vxe-radio-group', _defineProperty(_defineProperty({}, "theme--".concat(status), status), "size--".concat(vSize), vSize)]
@@ -54463,6 +54543,8 @@ function src_group_createInternalData() {
           props: {
             checkedValue: item[valueField],
             content: item[labelField],
+            icon: item[iconField],
+            title: item[titleField],
             disabled: item[disabledField]
           }
         });
@@ -66928,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,
@@ -66936,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];
@@ -66951,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;
@@ -67075,6 +67162,7 @@ function upload_createInternalData() {
           if (cacheItem) {
             cacheItem.percent = 100;
             cacheItem.status = 'success';
+            cacheItem.response = res;
           }
           // 处理动态字段双向绑定问题
           // Object.assign(item, res)
@@ -67090,6 +67178,7 @@ function upload_createInternalData() {
           var cacheItem = fileCacheMaps[fileKey];
           if (cacheItem) {
             cacheItem.status = 'error';
+            cacheItem.response = res;
           }
           if (showErrorStatus) {
             // 处理动态字段双向绑定问题
@@ -67126,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;
@@ -67143,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);
           }
         });
       }
@@ -67253,7 +67342,8 @@ function upload_createInternalData() {
             file: file,
             loading: !!autoSubmit,
             status: 'pending',
-            percent: 0
+            percent: 0,
+            response: null
           };
         }
         var item = fileObj;
@@ -67275,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);
@@ -67323,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 || {
@@ -67838,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', {
@@ -68082,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', {