vxe-table 3.6.0-beta.9 → 3.6.3

package/lib/index.umd.js

@@ -8812,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.0-beta.8", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.3", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10093,7 +10093,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.0-beta.8",
+  version: "3.6.3",
   reg: reg,
   use: use,
   setup: setup,
@@ -10118,11 +10118,12 @@ var VXETable = {
 /* harmony default export */ var src_icon = ({
   name: 'VxeIcon',
   props: {
-    name: String
+    name: String,
+    roll: Boolean
   },
   render: function render(h) {
     return h('i', {
-      class: "vxe-icon-".concat(this.name),
+      class: ["vxe-icon-".concat(this.name), this.roll ? 'roll' : ''],
       on: {
         click: this.clickEvent
       }
@@ -11258,6 +11259,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       allColumnOverflow = $xetable.showOverflow,
       treeConfig = $xetable.treeConfig,
       treeOpts = $xetable.treeOpts,
+      expandOpts = $xetable.expandOpts,
       editOpts = $xetable.editOpts,
       treeExpandeds = $xetable.treeExpandeds,
       scrollYLoad = $xetable.scrollYLoad,
@@ -11353,12 +11355,15 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     }))); // 如果行被展开了
 
     if (isExpandRow) {
-      var cellStyle;
+      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;
@@ -11380,15 +11385,19 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
         on: trOn
       }, [h('td', {
-        class: ['vxe-body--expanded-column', {
+        class: {
+          'vxe-body--expanded-column': 1,
           'fixed--hidden': fixedType && !hasFixedColumn,
           'col--ellipsis': hasEllipsis
-        }],
+        },
         attrs: {
           colspan: tableColumn.length
         }
       }, [h('div', {
-        class: 'vxe-body--expanded-cell',
+        class: {
+          'vxe-body--expanded-cell': 1,
+          'is--ellipsis': expandHeight
+        },
         style: cellStyle
       }, [expandColumn.renderData(h, expandParams)])])]));
     } // 如果是树形表格
@@ -19861,25 +19870,35 @@ funcs.forEach(function (name) {
 /* harmony default export */ var src_loading = ({
   name: 'VxeLoading',
   props: {
-    loading: Boolean
+    value: Boolean,
+    icon: String,
+    text: String
+  },
+  computed: {
+    loadingIcon: function loadingIcon() {
+      return this.icon || src_conf.icon.LOADING;
+    },
+    loadingText: function loadingText() {
+      var loadingText = src_conf.loadingText;
+      return this.text || (loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text'));
+    }
   },
   render: function render(h) {
-    var icon = src_conf.icon.LOADING;
-    var loadingText = src_conf.loadingText;
-    var text = loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text');
+    var loadingIcon = this.loadingIcon,
+        loadingText = this.loadingText;
     return h('div', {
       class: ['vxe-loading', {
-        'is--visible': this.loading
+        'is--visible': this.value
       }]
     }, [h('div', {
       class: 'vxe-loading--chunk'
-    }, [icon ? h('i', {
-      class: icon
+    }, [loadingIcon ? h('i', {
+      class: loadingIcon
     }) : h('div', {
       class: 'vxe-loading--spinner'
-    }), text ? h('div', {
+    }), loadingText ? h('div', {
       class: 'vxe-loading--text'
-    }, "".concat(text)) : null])]);
+    }, "".concat(loadingText)) : null])]);
   }
 });
 // CONCATENATED MODULE: ./packages/loading/index.js
@@ -20259,6 +20278,8 @@ function handleUupdateResize(_vm) {
     validConfig: Object,
     // 校验规则配置项
     editRules: Object,
+    // 加载中配置项
+    loadingConfig: Object,
     // 空内容渲染配置项
     emptyRender: [Boolean, Object],
     // 自定义列配置项
@@ -20612,6 +20633,9 @@ function handleUupdateResize(_vm) {
     emptyOpts: function emptyOpts() {
       return Object.assign({}, src_conf.table.emptyRender, this.emptyRender);
     },
+    loadingOpts: function loadingOpts() {
+      return Object.assign({}, src_conf.table.loadingConfig, this.loadingConfig);
+    },
     cellOffsetWidth: function cellOffsetWidth() {
       return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1;
     },
@@ -20947,7 +20971,8 @@ function handleUupdateResize(_vm) {
         footerTableData = this.footerTableData,
         hasTip = this.hasTip,
         columnOpts = this.columnOpts,
-        rowOpts = this.rowOpts;
+        rowOpts = this.rowOpts,
+        loadingOpts = this.loadingOpts;
     var leftList = columnStore.leftList,
         rightList = columnStore.rightList;
     return h('div', {
@@ -21064,7 +21089,9 @@ function handleUupdateResize(_vm) {
     h(packages_loading, {
       class: 'vxe-table--loading',
       props: {
-        loading: loading
+        value: loading,
+        icon: loadingOpts.icon,
+        text: loadingOpts.text
       }
     }),
     /**
@@ -23683,7 +23710,7 @@ var msgQueue = [];
     !isMsg ? h(packages_loading, {
       class: 'vxe-modal--loading',
       props: {
-        loading: loading
+        value: loading
       }
     }) : null]), showFooter ? h('div', {
       class: 'vxe-modal--footer'
@@ -27240,31 +27267,43 @@ function renderExtraSuffixIcon(h, _vm) {
     isGroup: function isGroup() {
       return this.$xecheckboxgroup;
     },
+    isMaximize: function isMaximize() {
+      return this.isGroup && this.$xecheckboxgroup.props.isMaximize;
+    },
     isDisabled: function isDisabled() {
-      return this.disabled || this.isGroup && this.$xecheckboxgroup.disabled;
+      if (this.disabled) {
+        return true;
+      }
+
+      if (this.isGroup) {
+        var _this$$xecheckboxgrou = this.$xecheckboxgroup,
+            disabled = _this$$xecheckboxgrou.disabled,
+            isMaximize = _this$$xecheckboxgrou.isMaximize;
+        return disabled || isMaximize && !this.isChecked;
+      }
+
+      return false;
+    },
+    isChecked: function isChecked() {
+      return this.isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes(this.$xecheckboxgroup.value, this.label) : this.value === this.checkedValue;
     }
   },
   render: function render(h) {
     var _ref;
 
     var $scopedSlots = this.$scopedSlots,
-        $xecheckboxgroup = this.$xecheckboxgroup,
-        isGroup = this.isGroup,
         isDisabled = this.isDisabled,
         title = this.title,
         vSize = this.vSize,
         indeterminate = this.indeterminate,
-        value = this.value,
-        label = this.label,
         content = this.content,
-        checkedValue = this.checkedValue;
+        isChecked = this.isChecked;
     var attrs = {};
 
     if (title) {
       attrs.title = title;
     }
 
-    var isChecked = isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.value, label) : value === checkedValue;
     return 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)],
       attrs: attrs
@@ -27497,6 +27536,22 @@ function getSelectLabel(_vm, value) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(item ? item[_vm.labelField] : value);
 }
 
+function checkOptionDisabled(_vm, isSelected, option, group) {
+  if (option.disabled) {
+    return true;
+  }
+
+  if (group && group.disabled) {
+    return true;
+  }
+
+  if (_vm.isMaximize && !isSelected) {
+    return true;
+  }
+
+  return false;
+}
+
 function renderOption(h, _vm, list, group) {
   var isGroup = _vm.isGroup,
       labelField = _vm.labelField,
@@ -27509,16 +27564,17 @@ function renderOption(h, _vm, list, group) {
   var useKey = optionOpts.useKey;
   return list.map(function (option, cIndex) {
     var slots = option.slots;
-    var isVisible = !isGroup || isOptionVisible(option);
-    var isDisabled = group && group.disabled || option.disabled;
     var optionValue = option[valueField];
+    var isSelected = multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue;
+    var isVisible = !isGroup || isOptionVisible(option);
+    var isDisabled = checkOptionDisabled(_vm, isSelected, option, group);
     var optid = getOptid(_vm, option);
     var defaultSlot = slots ? slots.default : null;
     return isVisible ? h('div', {
       key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
-        'is--selected': multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue,
+        'is--selected': isSelected,
         'is--hover': currentValue === optionValue
       }],
       attrs: {
@@ -27629,6 +27685,7 @@ function select_renderOpts(h, _vm) {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    max: [String, Number],
     size: {
       type: String,
       default: function _default() {
@@ -27756,6 +27813,17 @@ function select_renderOpts(h, _vm) {
       }
 
       return getSelectLabel(this, value);
+    },
+    isMaximize: function isMaximize() {
+      var value = this.value,
+          multiple = this.multiple,
+          max = this.max;
+
+      if (multiple && max) {
+        return (value ? value.length : 0) >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
     }
   },
   watch: {
@@ -34393,8 +34461,10 @@ function renderCustoms(h, _vm) {
     this.$nextTick(function () {
       var $xetable = _this.fintTable();
 
-      if (refresh && !_this.$xegrid && !refreshOpts.query) {
-        warnLog('vxe.error.notFunc', ['query']);
+      var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+
+      if (refresh && !_this.$xegrid && !queryMethod) {
+        warnLog('vxe.error.notFunc', ['queryMethod']);
       }
 
       if ($xetable) {
@@ -34703,11 +34773,13 @@ function renderCustoms(h, _vm) {
           isRefresh = this.isRefresh;
 
       if (!isRefresh) {
-        if (refreshOpts.query) {
+        var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+
+        if (queryMethod) {
           this.isRefresh = true;
 
           try {
-            Promise.resolve(refreshOpts.query()).catch(function (e) {
+            Promise.resolve(queryMethod({})).catch(function (e) {
               return e;
             }).then(function () {
               _this4.isRefresh = false;
@@ -34717,7 +34789,7 @@ function renderCustoms(h, _vm) {
           }
         } else if ($xegrid) {
           this.isRefresh = true;
-          $xegrid.commitProxy('reload').catch(function (e) {
+          $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
             return e;
           }).then(function () {
             _this4.isRefresh = false;
@@ -35322,11 +35394,14 @@ var Checkbox = Object.assign(src_checkbox, {
 
 
 
+
+
 /* harmony default export */ var checkbox_src_group = ({
   name: 'VxeCheckboxGroup',
   props: {
     value: Array,
     disabled: Boolean,
+    max: [String, Number],
     size: {
       type: String,
       default: function _default() {
@@ -35350,6 +35425,16 @@ var Checkbox = Object.assign(src_checkbox, {
   computed: {
     vSize: function vSize() {
       return this.size || this.$parent.size || this.$parent.vSize;
+    },
+    isMaximize: function isMaximize() {
+      var value = this.value,
+          max = this.max;
+
+      if (max) {
+        return value.length >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
     }
   },
   render: function render(h) {
@@ -37523,7 +37608,7 @@ function getResetValue(value, resetValue) {
     h(packages_loading, {
       class: 'vxe-form--loading',
       props: {
-        loading: loading
+        value: loading
       }
     }),
     /**
@@ -38020,8 +38105,14 @@ var form_item_props = {
   size: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -38062,6 +38153,10 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
+      allTitleAlign = _vm.titleAlign,
+      allTitleWidth = _vm.titleWidth,
+      allTitleColon = _vm.titleColon,
+      allTitleAsterisk = _vm.titleAsterisk,
       allTitleOverflow = _vm.titleOverflow;
   var title = item.title,
       folding = item.folding,
@@ -38077,8 +38172,10 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
-  var titleAlign = item.titleAlign || _vm.titleAlign;
-  var titleWidth = item.titleWidth || _vm.titleWidth;
+  var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+  var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+  var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+  var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
   var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -38128,6 +38225,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   return h('div', {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
+      'is--colon': titleColon,
+      'is--asterisk': titleAsterisk,
       'is--required': isRequired,
       'is--hidden': folding && collapseAll,
       'is--active': isActivetem(_vm, item),
@@ -38660,7 +38759,7 @@ var Switch = Object.assign(src_switch, {
     h(packages_loading, {
       class: 'vxe-list--loading',
       props: {
-        loading: loading
+        value: loading
       }
     })]);
   },
@@ -39226,7 +39325,7 @@ var Pulldown = Object.assign(pulldown, {
 /* harmony default export */ var zh_CN = ({
   vxe: {
     loading: {
-      text: '加载中'
+      text: '加载中...'
     },
     error: {
       groupFixed: '如果使用分组表头，固定列必须按组设置',