vxe-table 4.3.0-beta.9 → 4.3.2

package/lib/index.umd.js

@@ -8872,7 +8872,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.3.0-beta.8", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("4.3.2", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10906,7 +10906,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.3.0-beta.8",
+  version: "4.3.2",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -13815,25 +13815,35 @@ function useSize(props) {
 /* harmony default export */ var src_loading = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeLoading',
   props: {
-    loading: Boolean
+    modelValue: Boolean,
+    icon: String,
+    text: String
   },
-  render: function render() {
-    var icon = src_conf.icon.LOADING;
-    var loadingText = src_conf.loadingText;
-    var text = loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text');
-    return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-      class: ['vxe-loading', {
-        'is--visible': this.loading
-      }]
-    }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-      class: 'vxe-loading--chunk'
-    }, [icon ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
-      class: icon
-    }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-      class: 'vxe-loading--spinner'
-    }), text ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-      class: 'vxe-loading--text'
-    }, "".concat(text)) : null])]);
+  setup: function setup(props) {
+    var computeLoadingIcon = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return props.icon || src_conf.icon.LOADING;
+    });
+    var computeLoadingText = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var loadingText = src_conf.loadingText;
+      return props.text || (loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text'));
+    });
+    return function () {
+      var loadingIcon = computeLoadingIcon.value;
+      var loadingText = computeLoadingText.value;
+      return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        class: ['vxe-loading', {
+          'is--visible': props.modelValue
+        }]
+      }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        class: 'vxe-loading--chunk'
+      }, [loadingIcon ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
+        class: loadingIcon
+      }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        class: 'vxe-loading--spinner'
+      }), loadingText ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
+        class: 'vxe-loading--text'
+      }, "".concat(loadingText)) : null])]);
+    };
   }
 }));
 // CONCATENATED MODULE: ./packages/loading/index.ts
@@ -14928,7 +14938,7 @@ var msgQueue = [];
          */
         contVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(packages_loading, {
           class: 'vxe-modal--loading',
-          loading: props.loading
+          modelValue: props.loading
         }));
       }
 
@@ -17860,17 +17870,36 @@ var quarterSize = 8;
     var checkboxMethods = {};
     var computeSize = useSize(props);
     var $xecheckboxgroup = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xecheckboxgroup', null);
-    var computeDisabled = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      return props.disabled || $xecheckboxgroup && $xecheckboxgroup.props.disabled;
+    var computeIsChecked = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      if ($xecheckboxgroup) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.props.modelValue, props.label);
+      }
+
+      return props.modelValue === props.checkedValue;
     });
-    var computeChecked = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
-      return $xecheckboxgroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.props.modelValue, props.label) : props.modelValue === props.checkedValue;
+    var computeIsDisabled = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      if (props.disabled) {
+        return true;
+      }
+
+      if ($xecheckboxgroup) {
+        var groupProps = $xecheckboxgroup.props;
+
+        var _$xecheckboxgroup$get = $xecheckboxgroup.getComputeMaps(),
+            computeIsMaximize = _$xecheckboxgroup$get.computeIsMaximize;
+
+        var isMaximize = computeIsMaximize.value;
+        var isChecked = computeIsChecked.value;
+        return groupProps.disabled || isMaximize && !isChecked;
+      }
+
+      return false;
     });
 
     var changeEvent = function changeEvent(evnt) {
       var checkedValue = props.checkedValue,
           uncheckedValue = props.uncheckedValue;
-      var isDisabled = computeDisabled.value;
+      var isDisabled = computeIsDisabled.value;
 
       if (!isDisabled) {
         var checked = evnt.target.checked;
@@ -17908,8 +17937,8 @@ var quarterSize = 8;
       var _ref;
 
       var vSize = computeSize.value;
-      var isDisabled = computeDisabled.value;
-      var isChecked = computeChecked.value;
+      var isDisabled = computeIsDisabled.value;
+      var isChecked = computeIsChecked.value;
       var indeterminate = props.indeterminate;
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('label', {
         class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _defineProperty(_ref, 'is--checked', isChecked), _ref)],
@@ -17991,6 +18020,10 @@ function getOptUniqueId() {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    max: {
+      type: [String, Number],
+      default: null
+    },
     size: {
       type: String,
       default: function _default() {
@@ -18085,6 +18118,17 @@ function getOptUniqueId() {
       var groupPropsOpts = computeGroupPropsOpts.value;
       return groupPropsOpts.options || 'options';
     });
+    var computeIsMaximize = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var modelValue = props.modelValue,
+          multiple = props.multiple,
+          max = props.max;
+
+      if (multiple && max) {
+        return (modelValue ? modelValue.length : 0) >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
+    });
     var computeOptionOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return Object.assign({}, src_conf.select.optionConfig, props.optionConfig);
     });
@@ -18782,6 +18826,24 @@ function getOptUniqueId() {
       }
     };
 
+    var checkOptionDisabled = function checkOptionDisabled(isSelected, option, group) {
+      if (option.disabled) {
+        return true;
+      }
+
+      if (group && group.disabled) {
+        return true;
+      }
+
+      var isMaximize = computeIsMaximize.value;
+
+      if (isMaximize && !isSelected) {
+        return true;
+      }
+
+      return false;
+    };
+
     var renderOption = function renderOption(list, group) {
       var optionKey = props.optionKey,
           modelValue = props.modelValue,
@@ -18795,9 +18857,10 @@ function getOptUniqueId() {
       return list.map(function (option, cIndex) {
         var slots = option.slots,
             className = option.className;
-        var isVisible = !isGroup || isOptionVisible(option);
-        var isDisabled = group && group.disabled || option.disabled;
         var optionValue = option[valueField];
+        var isSelected = multiple ? modelValue && modelValue.indexOf(optionValue) > -1 : modelValue === optionValue;
+        var isVisible = !isGroup || isOptionVisible(option);
+        var isDisabled = checkOptionDisabled(isSelected, option, group);
         var optid = getOptid(option);
         var defaultSlot = slots ? slots.default : null;
         return isVisible ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
@@ -18807,7 +18870,7 @@ function getOptUniqueId() {
             $select: $xeselect
           }) : className : '', {
             'is--disabled': isDisabled,
-            'is--selected': multiple ? modelValue && modelValue.indexOf(optionValue) > -1 : modelValue === optionValue,
+            'is--selected': isSelected,
             'is--hover': currentValue === optionValue
           }],
           // attrs
@@ -22901,7 +22964,8 @@ var Validator = VxeModuleValidator;
 /* harmony default export */ var src_icon = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeIcon',
   props: {
-    name: String
+    name: String,
+    roll: Boolean
   },
   emits: ['click'],
   setup: function setup(props, _ref) {
@@ -22915,7 +22979,7 @@ var Validator = VxeModuleValidator;
 
     return function () {
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
-        class: "vxe-icon-".concat(props.name),
+        class: ["vxe-icon-".concat(props.name), props.roll ? 'roll' : ''],
         onClick: clickEvent
       });
     };
@@ -24365,6 +24429,8 @@ var es_array_sort = __webpack_require__("4e82");
   validConfig: Object,
   // 校验规则配置项
   editRules: Object,
+  // 加载中配置项
+  loadingConfig: Object,
   // 空内容渲染配置项
   emptyRender: Object,
   // 自定义列配置项
@@ -26160,13 +26226,13 @@ dynamicApp.component(grid.name, grid);
       var refreshOpts = computeRefreshOpts.value;
 
       if (!isRefresh) {
-        var query = refreshOpts.query;
+        var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
 
-        if (query) {
+        if (queryMethod) {
           reactData.isRefresh = true;
 
           try {
-            Promise.resolve(query({})).catch(function (e) {
+            Promise.resolve(queryMethod({})).catch(function (e) {
               return e;
             }).then(function () {
               reactData.isRefresh = false;
@@ -26176,7 +26242,7 @@ dynamicApp.component(grid.name, grid);
           }
         } else if ($xegrid) {
           reactData.isRefresh = true;
-          $xegrid.commitProxy('reload').catch(function (e) {
+          $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
             return e;
           }).then(function () {
             reactData.isRefresh = false;
@@ -26534,9 +26600,10 @@ dynamicApp.component(grid.name, grid);
     Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
       var refresh = props.refresh;
       var refreshOpts = computeRefreshOpts.value;
+      var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
 
-      if (refresh && !$xegrid && !refreshOpts.query) {
-        warnLog('vxe.error.notFunc', ['query']);
+      if (refresh && !$xegrid && !queryMethod) {
+        warnLog('vxe.error.notFunc', ['queryMethod']);
       }
     });
 
@@ -27231,11 +27298,16 @@ dynamicApp.component(src_checkbox.name, src_checkbox);
 
 
 
+
 /* harmony default export */ var checkbox_src_group = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
   name: 'VxeCheckboxGroup',
   props: {
     modelValue: Array,
     disabled: Boolean,
+    max: {
+      type: [String, Number],
+      default: null
+    },
     size: {
       type: String,
       default: function _default() {
@@ -27250,10 +27322,26 @@ dynamicApp.component(src_checkbox.name, src_checkbox);
     var $xeform = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeform', null);
     var $xeformiteminfo = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeformiteminfo', null);
     var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.uniqueId();
+    var computeIsMaximize = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      var modelValue = props.modelValue,
+          max = props.max;
+
+      if (max) {
+        return (modelValue ? modelValue.length : 0) >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
+    });
+    var computeMaps = {
+      computeIsMaximize: computeIsMaximize
+    };
     var $xecheckboxgroup = {
       xID: xID,
       props: props,
-      context: context
+      context: context,
+      getComputeMaps: function getComputeMaps() {
+        return computeMaps;
+      }
     };
     useSize(props);
     var checkboxGroupMethods = {
@@ -29587,7 +29675,7 @@ function getResetValue(value, resetValue) {
        */
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(packages_loading, {
         class: 'vxe-form--loading',
-        loading: loading
+        modelValue: loading
       }),
       /**
        * 工具提示
@@ -30802,7 +30890,7 @@ function createResizeEvent(callback) {
        */
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(packages_loading, {
         class: 'vxe-list--loading',
-        loading: loading
+        modelValue: loading
       })]);
     };
 
@@ -31239,6 +31327,7 @@ var lineOffsetSizes = {
         computeKeyboardOpts = _$xetable$getComputeM.computeKeyboardOpts,
         computeTooltipOpts = _$xetable$getComputeM.computeTooltipOpts,
         computeRadioOpts = _$xetable$getComputeM.computeRadioOpts,
+        computeExpandOpts = _$xetable$getComputeM.computeExpandOpts,
         computeTreeOpts = _$xetable$getComputeM.computeTreeOpts,
         computeCheckboxOpts = _$xetable$getComputeM.computeCheckboxOpts,
         computeValidOpts = _$xetable$getComputeM.computeValidOpts,
@@ -31699,12 +31788,16 @@ var lineOffsetSizes = {
         }))); // 如果行被展开了
 
         if (isExpandRow) {
-          var cellStyle;
+          var expandOpts = computeExpandOpts.value;
+          var expandHeight = expandOpts.height;
+          var cellStyle = {};
+
+          if (expandHeight) {
+            cellStyle.height = "".concat(expandHeight, "px");
+          }
 
           if (treeConfig) {
-            cellStyle = {
-              paddingLeft: "".concat(rowLevel * treeOpts.indent + 30, "px")
-            };
+            cellStyle.paddingLeft = "".concat(rowLevel * treeOpts.indent + 30, "px");
           }
 
           var showOverflow = expandColumn.showOverflow;
@@ -31726,13 +31819,17 @@ var lineOffsetSizes = {
             key: "expand_".concat(rowid),
             style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null
           }, trOn), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('td', {
-            class: ['vxe-body--expanded-column', {
+            class: {
+              'vxe-body--expanded-column': 1,
               'fixed--hidden': fixedType && !hasFixedColumn,
               'col--ellipsis': hasEllipsis
-            }],
+            },
             colspan: tableColumn.length
           }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-            class: 'vxe-body--expanded-cell',
+            class: {
+              'vxe-body--expanded-cell': 1,
+              'is--ellipsis': expandHeight
+            },
             style: cellStyle
           }, [expandColumn.renderData(expandParams)])])]));
         } // 如果是树形表格
@@ -33488,6 +33585,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
     var computeEmptyOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return Object.assign({}, src_conf.table.emptyRender, props.emptyRender);
     });
+    var computeLoadingOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return Object.assign({}, src_conf.table.loadingConfig, props.loadingConfig);
+    });
     var computeCellOffsetWidth = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1;
     });
@@ -33587,6 +33687,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       computeExpandOpts: computeExpandOpts,
       computeTreeOpts: computeTreeOpts,
       computeEmptyOpts: computeEmptyOpts,
+      computeLoadingOpts: computeLoadingOpts,
       computeCustomOpts: computeCustomOpts,
       computeIsAllCheckboxDisabled: computeIsAllCheckboxDisabled
     };
@@ -40541,6 +40642,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
       var mouseOpts = computeMouseOpts.value;
       var validOpts = computeValidOpts.value;
       var validTipOpts = computeValidTipOpts.value;
+      var loadingOpts = computeLoadingOpts.value;
       var isMenu = computeIsMenu.value;
       return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
         ref: refElem,
@@ -40622,7 +40724,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        */
       Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(packages_loading, {
         class: 'vxe-table--loading',
-        loading: loading
+        modelValue: loading,
+        icon: loadingOpts.icon,
+        text: loadingOpts.text
       }),
       /**
        * 筛选
@@ -40700,7 +40804,7 @@ dynamicApp.component(table.name, table);
 /* harmony default export */ var zh_CN = ({
   vxe: {
     loading: {
-      text: '加载中'
+      text: '加载中...'
     },
     error: {
       groupFixed: '如果使用分组表头，固定列必须按组设置',