vxe-table 3.8.8-beta.5 → 3.8.8-beta.7

package/lib/index.umd.js

@@ -11145,9 +11145,12 @@ var iconPrefix = 'vxe-icon-';
     //   visibleMethod () {}
     // },
     customConfig: {
+      allowVisible: true,
+      allowResizable: true,
       allowFixed: true,
       allowSort: true,
-      showFooter: true
+      showFooter: true,
+      placement: 'topRight'
       //  storage: false,
       //  checkMethod () {}
     },
@@ -11351,6 +11354,7 @@ var iconPrefix = 'vxe-icon-';
     leaveDelay: 300
   },
   pager: {
+    pageSizePlacement: 'top'
     // size: null,
     // autoHidden: false,
     // perfect: true,
@@ -11481,7 +11485,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.8-beta.5", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8-beta.7", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13161,7 +13165,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.8-beta.5",
+  version: "3.8.8-beta.7",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -13295,6 +13299,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
+      renderResizeWidth: 0,
       resizeWidth: 0,
       renderLeft: 0,
       renderArgs: [],
@@ -14040,8 +14045,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var rowHeight = rowOpts.height;
   var renderOpts = editRender || cellRender;
   var compConf = renderOpts ? v_x_e_table.renderer.get(renderOpts.name) : null;
-  var compCellClassName = compConf ? compConf.cellClassName : '';
-  var compCellStyle = compConf ? compConf.cellStyle : '';
+  var compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : '';
+  var compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
   var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -14335,7 +14340,8 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     })));
     // 如果行被展开了
     if (isExpandRow) {
-      var expandHeight = expandOpts.height;
+      var expandHeight = expandOpts.height,
+        padding = expandOpts.padding;
       var cellStyle = {};
       if (expandHeight) {
         cellStyle.height = "".concat(expandHeight, "px");
@@ -14357,7 +14363,9 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         $rowIndex: $rowIndex
       };
       rows.push(h('tr', {
-        class: 'vxe-body--expanded-row',
+        class: ['vxe-body--expanded-row', {
+          'is--padding': padding
+        }],
         key: "expand_".concat(rowid),
         style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
         on: trOn
@@ -15861,8 +15869,9 @@ function getFooterContent(h, params) {
   }
   if (renderOpts) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
-    if (compConf && compConf.renderFooter) {
-      return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params));
+    var rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
+    if (rtFooter) {
+      return getSlotVNs(rtFooter.call($table, h, renderOpts, params));
     }
   }
   // 兼容老模式
@@ -15949,8 +15958,9 @@ var Cell = {
     }
     if (renderOpts) {
       var compConf = v_x_e_table.renderer.get(renderOpts.name);
-      if (compConf && compConf.renderHeader) {
-        return getSlotVNs(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)));
+      var rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
+      if (rtHeader) {
+        return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
       }
     }
     return renderTitleContent(h, params, utils.formatText(column.getTitle(), 1));
@@ -15970,10 +15980,12 @@ var Cell = {
       return $table.callSlot(slots.default, params, h);
     }
     if (renderOpts) {
-      var funName = editRender ? 'renderCell' : 'renderDefault';
       var compConf = v_x_e_table.renderer.get(renderOpts.name);
-      if (compConf && compConf[funName]) {
-        return getSlotVNs(compConf[funName].call($table, h, renderOpts, Object.assign({
+      var rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
+      var rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
+      var renderFn = editRender ? rtCell : rtDefault;
+      if (renderFn) {
+        return getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({
           $type: editRender ? 'edit' : 'cell'
         }, params)));
       }
@@ -16422,8 +16434,9 @@ var Cell = {
     }
     if (contentRender) {
       var compConf = v_x_e_table.renderer.get(contentRender.name);
-      if (compConf && compConf.renderExpand) {
-        return getSlotVNs(compConf.renderExpand.call($table, h, contentRender, params));
+      var rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
+      if (rtExpand) {
+        return getSlotVNs(rtExpand.call($table, h, contentRender, params));
       }
     }
     return [];
@@ -16588,12 +16601,13 @@ var Cell = {
       editRender = column.editRender,
       formatter = column.formatter;
     var compConf = v_x_e_table.renderer.get(editRender.name);
+    var rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
     if (isEdit) {
       if (slots && slots.edit) {
         return $table.callSlot(slots.edit, params, h);
       }
-      if (compConf && compConf.renderEdit) {
-        return getSlotVNs(compConf.renderEdit.call($table, h, editRender, Object.assign({
+      if (rtEdit) {
+        return getSlotVNs(rtEdit.call($table, h, editRender, Object.assign({
           $type: 'edit'
         }, params)));
       }
@@ -18041,8 +18055,8 @@ var Methods = {
               filterRender = column.filterRender,
               field = column.field;
             var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-            var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
-            var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
+            var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
+            var defaultFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
             var cellValue = utils.getCellValue(row, column);
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -18458,6 +18472,7 @@ var Methods = {
       })) {
         column.visible = column.defaultVisible;
       }
+      column.renderResizeWidth = column.renderWidth;
     });
     if (opts.resizable) {
       this.saveCustomResizable(true);
@@ -18481,8 +18496,7 @@ var Methods = {
         this.clearCopyCellArea();
       }
     }
-    this.saveCustomVisible();
-    this.saveCustomSort();
+    this.saveCustomStore();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -18695,6 +18709,71 @@ var Methods = {
       localStorage.setItem(visibleStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnVisibleStorageMap));
     }
   },
+  getCustomStoreData: function getCustomStoreData() {
+    var id = this.id,
+      collectColumn = this.collectColumn,
+      customOpts = this.customOpts;
+    var checkMethod = customOpts.checkMethod;
+    var resizableData = {};
+    var sortData = {};
+    var visibleData = {};
+    var fixedData = {};
+    var storeData = {
+      resizableData: resizableData,
+      sortData: sortData,
+      visibleData: visibleData,
+      fixedData: fixedData
+    };
+    if (!id) {
+      errLog('vxe.error.reqProp', ['id']);
+      return storeData;
+    }
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
+      // 排序只支持一级
+      if (!parent) {
+        collectColumn.forEach(function (column) {
+          var colKey = column.getKey();
+          if (colKey) {
+            sortData[colKey] = column.renderSortNumber;
+          }
+        });
+      }
+      if (column.resizeWidth) {
+        var colKey = column.getKey();
+        if (colKey) {
+          resizableData[colKey] = column.renderWidth;
+        }
+      }
+      if (column.fixed && column.fixed !== column.defaultFixed) {
+        var _colKey2 = column.getKey();
+        if (_colKey2) {
+          fixedData[_colKey2] = column.fixed;
+        }
+      }
+      if (!checkMethod || checkMethod({
+        column: column
+      })) {
+        if (!column.visible && column.defaultVisible) {
+          var _colKey3 = column.getKey();
+          if (_colKey3) {
+            visibleData[_colKey3] = false;
+          }
+        } else if (column.visible && !column.defaultVisible) {
+          var _colKey4 = column.getKey();
+          if (_colKey4) {
+            visibleData[_colKey4] = true;
+          }
+        }
+      }
+    });
+    return storeData;
+  },
+  saveCustomStore: function saveCustomStore() {
+    this.saveCustomVisible();
+    this.saveCustomSort();
+    this.saveCustomFixed();
+    this.saveCustomResizable();
+  },
   saveCustomResizable: function saveCustomResizable(isReset) {
     var id = this.id,
       collectColumn = this.collectColumn,
@@ -20424,8 +20503,12 @@ var Methods = {
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
     var selectCheckboxMaps = this.selectCheckboxMaps,
       checkboxOpts = this.checkboxOpts;
-    var checkField = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField,
+      trigger = checkboxOpts.trigger;
     var row = params.row;
+    if (trigger === 'manual') {
+      return;
+    }
     var value = false;
     if (checkField) {
       value = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
@@ -20441,8 +20524,12 @@ var Methods = {
   triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
     var checkboxOpts = this.checkboxOpts,
       afterFullData = this.afterFullData;
-    var checkMethod = checkboxOpts.checkMethod;
+    var checkMethod = checkboxOpts.checkMethod,
+      trigger = checkboxOpts.trigger;
     var row = params.row;
+    if (trigger === 'manual') {
+      return;
+    }
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       var checkboxRecords = this.getCheckboxRecords();
       if (checkboxRecords.length) {
@@ -20887,23 +20974,33 @@ var Methods = {
       }
     }
   },
+  handleCheckAllEvent: function handleCheckAllEvent(evnt, value) {
+    this.handleCheckedAllCheckboxRow(value);
+    if (evnt) {
+      this.emitEvent('checkbox-all', {
+        records: this.getCheckboxRecords(),
+        reserves: this.getCheckboxReserveRecords(),
+        indeterminates: this.getCheckboxIndeterminateRecords(),
+        checked: value
+      }, evnt);
+    }
+  },
   /**
    * 多选，选中所有事件
    */
   triggerCheckAllEvent: function triggerCheckAllEvent(evnt, value) {
-    this.handleCheckedAllCheckboxRow(value);
-    this.emitEvent('checkbox-all', {
-      records: this.getCheckboxRecords(),
-      reserves: this.getCheckboxReserveRecords(),
-      indeterminates: this.getCheckboxIndeterminateRecords(),
-      checked: value
-    }, evnt);
+    var checkboxOpts = this.checkboxOpts;
+    var trigger = checkboxOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    this.handleCheckAllEvent(evnt, value);
   },
   /**
    * 多选，切换所有行的选中状态
    */
   toggleAllCheckboxRow: function toggleAllCheckboxRow() {
-    this.triggerCheckAllEvent(null, !this.isAllSelected);
+    this.handleCheckAllEvent(null, !this.isAllSelected);
     return this.$nextTick();
   },
   /**
@@ -20971,6 +21068,10 @@ var Methods = {
     var oldValue = this.selectRadioRow,
       radioOpts = this.radioOpts;
     var row = params.row;
+    var trigger = radioOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
@@ -21650,7 +21751,11 @@ var Methods = {
       rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
       column = this.expandColumn;
     var row = params.row;
-    var lazy = expandOpts.lazy;
+    var lazy = expandOpts.lazy,
+      trigger = expandOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
     var rowid = getRowid(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isRowExpandByRow(row);
@@ -21976,7 +22081,11 @@ var Methods = {
       treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
     var row = params.row,
       column = params.column;
-    var lazy = treeOpts.lazy;
+    var lazy = treeOpts.lazy,
+      trigger = treeOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
     var rowid = getRowid(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
@@ -24327,7 +24436,6 @@ var Table = VxeTable;
 
 
 
-
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilterPanel',
   props: {
@@ -24348,7 +24456,7 @@ var Table = VxeTable;
       column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
     var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-    var filterClassName = compConf ? compConf.filterClassName : '';
+    var filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', utils.getClass(filterClassName, Object.assign({
         $panel: this,
@@ -24371,6 +24479,7 @@ var Table = VxeTable;
         multiple = filterStore.multiple,
         maxHeight = filterStore.maxHeight;
       var slots = column.slots;
+      var rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
       if (slots && slots.filter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
@@ -24378,10 +24487,10 @@ var Table = VxeTable;
           $panel: this,
           context: this
         }, args), h))];
-      } else if (compConf && compConf.renderFilter) {
+      } else if (rtFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, getSlotVNs(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
+        }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
         }, args))))];
@@ -24446,7 +24555,7 @@ var Table = VxeTable;
       var filterRender = column.filterRender;
       var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
       var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-      return multiple && (!compConf || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(compConf.showFilterFooter) ? compConf.showFilterFooter !== false : compConf.isFooter !== false)) ? [h('div', {
+      return multiple(compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
         class: 'vxe-table--filter-footer'
       }, [h('button', {
         class: {
@@ -24603,7 +24712,7 @@ var Table = VxeTable;
           filterMultiple = column.filterMultiple,
           filterRender = column.filterRender;
         var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-        var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null);
+        var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
         var _DomTools$getDomNode = dom.getDomNode(),
           visibleWidth = _DomTools$getDomNode.visibleWidth;
         Object.assign(filterStore, {
@@ -24788,7 +24897,7 @@ var Table = VxeTable;
           filterRender = column.filterRender;
         if (filters) {
           var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-          var filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null);
+          var filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
           filters.forEach(function (item) {
             item._checked = false;
             item.checked = false;
@@ -26046,10 +26155,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           autoselect = editRender.autoselect;
         var inputElem;
         if (!autofocus && compRender) {
-          autofocus = compRender.autofocus;
+          autofocus = compRender.tableAutofocus || compRender.autofocus;
         }
         if (!autoselect && compRender) {
-          autoselect = compRender.autoselect;
+          autoselect = compRender.tableAutoSelect || compRender.autoselect;
         }
         // 如果指定了聚焦 class
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
@@ -32077,7 +32186,7 @@ function getLabelData($xetable, opts, columns, datas) {
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             var compConf = v_x_e_table.renderer.get(renderOpts.name);
             if (compConf) {
-              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
             }
           }
           if (!bodyExportMethod) {
@@ -32233,7 +32342,7 @@ function getFooterCellValue($xetable, opts, items, column) {
   if (!footLabelMethod && renderOpts && renderOpts.name) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
     if (compConf) {
-      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
+      footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
     }
   }
   if (!footLabelMethod) {
@@ -34653,6 +34762,7 @@ var Validator = VxeTableValidatorModule;
         var colid = column.getKey();
         column.renderFixed = column.fixed;
         column.renderVisible = column.visible;
+        column.renderResizeWidth = column.renderWidth;
         sortMaps[colid] = column.renderSortNumber;
         fixedMaps[colid] = column.fixed;
         visibleMaps[colid] = column.visible;
@@ -34683,20 +34793,14 @@ var Validator = VxeTableValidatorModule;
       return this.$nextTick();
     },
     calcMaxHeight: function calcMaxHeight() {
-      var $refs = this.$refs,
+      var $el = this.$el,
         customStore = this.customStore;
-      var customWrapperElem = $refs.customWrapper ? $refs.customWrapper.$el : null;
-      var headElem = $refs.tableHeader ? $refs.tableHeader.$el : null;
-      var bodyElem = $refs.tableBody ? $refs.tableBody.$el : null;
       // 判断面板不能大于表格高度
       var tableHeight = 0;
-      if (headElem) {
-        tableHeight += headElem.clientHeight;
-      }
-      if (bodyElem) {
-        tableHeight += bodyElem.clientHeight;
+      if ($el) {
+        tableHeight = $el.clientHeight - 30;
       }
-      customStore.maxHeight = Math.max(0, customWrapperElem ? Math.min(customWrapperElem.clientHeight, tableHeight - 80) : 0);
+      customStore.maxHeight = Math.max(4, tableHeight);
     },
     checkCustomStatus: function checkCustomStatus() {
       var customStore = this.customStore,
@@ -34764,6 +34868,9 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
+
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -34792,9 +34899,11 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod,
+    allowVisible = customOpts.allowVisible,
     allowSort = customOpts.allowSort,
     allowFixed = customOpts.allowFixed,
-    trigger = customOpts.trigger;
+    trigger = customOpts.trigger,
+    placement = customOpts.placement;
   var colVNs = [];
   var customWrapperOns = {};
   // hover 触发
@@ -34827,7 +34936,7 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
           dragend: _vm.sortDragendEvent,
           dragover: _vm.sortDragoverEvent
         }
-      }, [h('div', {
+      }, [allowVisible ? h('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
@@ -34845,7 +34954,7 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      })]), allowSort && column.level === 1 ? h('div', {
+      })]) : _e(), allowSort && column.level === 1 ? h('div', {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: 'vxe-table-custom--sort-btn',
@@ -34898,14 +35007,17 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
   var isAllIndeterminate = customStore.isIndeterminate;
   return h('div', {
     key: 'simple',
-    class: ['vxe-table-custom-wrapper', {
+    class: ['vxe-table-custom-wrapper', "placement--".concat(placement), {
       'is--active': customStore.visible
-    }]
+    }],
+    style: maxHeight && !['left', 'right'].includes(placement) ? {
+      maxHeight: "".concat(maxHeight, "px")
+    } : {}
   }, customStore.visible ? [h('ul', {
     class: 'vxe-table-custom--header'
   }, [h('li', {
     class: 'vxe-table-custom--option'
-  }, [h('div', {
+  }, [allowVisible ? h('div', {
     class: ['vxe-table-custom--checkbox-option', {
       'is--checked': isAllChecked,
       'is--indeterminate': isAllIndeterminate
@@ -34920,7 +35032,9 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
     class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('div', {
+  }, conf.i18n('vxe.toolbar.customAll'))]) : h('span', {
+    class: 'vxe-checkbox--label'
+  }, conf.i18n('vxe.table.customTitle'))])]), h('div', {
     ref: 'bodyElemRef',
     class: 'vxe-table-custom--list-wrapper'
   }, [h('transition-group', {
@@ -34929,9 +35043,6 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
       name: 'vxe-table-custom--list',
       tag: 'ul'
     },
-    style: maxHeight ? {
-      maxHeight: "".concat(maxHeight, "px")
-    } : {},
     on: customWrapperOns
   }, colVNs), h('div', {
     ref: 'dragHintElemRef',
@@ -34963,10 +35074,14 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     customColumnList = $xetable.customColumnList,
     columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var allowSort = customOpts.allowSort,
+  var modalOptions = customOpts.modalOptions,
+    allowVisible = customOpts.allowVisible,
+    allowSort = customOpts.allowSort,
     allowFixed = customOpts.allowFixed,
+    allowResizable = customOpts.allowResizable,
     checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
+  var modalOpts = Object.assign({}, modalOptions);
   var trVNs = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
     var isVisible = visibleMethod ? visibleMethod({
@@ -34993,7 +35108,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           dragend: _vm.sortDragendEvent,
           dragover: _vm.sortDragoverEvent
         }
-      }, [h('td', {
+      }, [allowVisible ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--visible'
       }, [h('div', {
         class: ['vxe-table-custom--checkbox-option', {
@@ -35013,7 +35128,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      })])]), allowSort ? h('td', {
+      })])]) : _e(), allowSort ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--sort'
       }, [column.level === 1 ? h('span', {
         class: 'vxe-table-custom-popup--column-sort-btn',
@@ -35026,16 +35141,29 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         }
       }, [h('i', {
         class: conf.icon.TABLE_CUSTOM_SORT
-      })]) : null]) : _e(), h('td', {
+      })]) : h('span', '-')]) : _e(), h('td', {
         class: 'vxe-table-custom-popup--column-item col--name'
       }, [h('div', {
         class: 'vxe-table-custom-popup--name',
         attrs: {
           title: colTitle
         }
-      }, colTitle)]), allowFixed ? h('td', {
+      }, colTitle)]), allowResizable ? h('td', {
+        class: 'vxe-table-custom-popup--column-item col--resizable'
+      }, [!isChecked || column.children && column.children.length ? h('span', '-') : h('vxe-input', {
+        props: {
+          type: 'integer',
+          min: 40,
+          value: column.renderResizeWidth
+        },
+        on: {
+          modelValue: function modelValue(value) {
+            column.renderResizeWidth = Math.max(40, Number(value));
+          }
+        }
+      })]) : _e(), allowFixed ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--fixed'
-      }, [!parent ? h('vxe-radio-group', {
+      }, [parent ? h('span', '-') : h('vxe-radio-group', {
         props: {
           value: column.renderFixed || '',
           type: 'button',
@@ -35060,7 +35188,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           //   changePopupFixedOption(column)
           // }
         }
-      }) : null]) : _e()]));
+      })]) : _e()]));
     }
   });
   var isAllChecked = customStore.isAll;
@@ -35068,13 +35196,13 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   return h('vxe-modal', {
     key: 'popup',
     props: {
-      className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
+      className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
       value: customStore.visible,
-      title: conf.i18n('vxe.custom.cstmTitle'),
-      width: '40vw',
-      minWidth: 520,
-      height: '50vh',
-      minHeight: 300,
+      title: modalOpts.title || conf.i18n('vxe.custom.cstmTitle'),
+      width: modalOpts.width || '50vw',
+      minWidth: modalOpts.minWidth || 700,
+      height: modalOpts.height || '50vh',
+      minHeight: modalOpts.minHeight || 400,
       mask: true,
       lockView: true,
       showFooter: true,
@@ -35094,11 +35222,11 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           class: 'vxe-table-custom-popup--body'
         }, [h('div', {
           class: 'vxe-table-custom-popup--table-wrapper'
-        }, [h('table', {}, [h('colgroup', {}, [h('col', {
+        }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
           style: {
             width: '80px'
           }
-        }), allowSort ? h('col', {
+        }) : _e(), allowSort ? h('col', {
           style: {
             width: '80px'
           }
@@ -35106,11 +35234,15 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           style: {
             minWidth: '120px'
           }
-        }), allowFixed ? h('col', {
+        }), allowResizable ? h('col', {
+          style: {
+            width: '140px'
+          }
+        }) : _e(), allowFixed ? h('col', {
           style: {
             width: '200px'
           }
-        }) : _e()]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('div', {
+        }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
           class: ['vxe-table-custom--checkbox-option', {
             'is--checked': isAllChecked,
             'is--indeterminate': isAllIndeterminate
@@ -35125,7 +35257,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
         }), h('span', {
           class: 'vxe-checkbox--label'
-        }, conf.i18n('vxe.toolbar.customAll'))])]), allowSort ? h('th', {}, [h('span', {
+        }, conf.i18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
           class: 'vxe-table-custom-popup--table-sort-help-title'
         }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
           props: {
@@ -35139,7 +35271,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
               });
             }
           }
-        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
+        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, conf.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -35239,18 +35371,39 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         updateStore({
           id: id,
           type: type,
-          storeData: this.getStoreData()
+          storeData: $xetable.getCustomStoreData()
         });
       }
     },
     confirmCustomEvent: function confirmCustomEvent(evnt) {
       var $xetable = this.$xetable;
-      var customColumnList = $xetable.customColumnList;
-      customColumnList.forEach(function (column, index) {
-        var sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-        column.fixed = column.renderFixed;
-        column.visible = column.renderVisible;
+      var customOpts = $xetable.customOpts,
+        customColumnList = $xetable.customColumnList;
+      var allowVisible = customOpts.allowVisible,
+        allowSort = customOpts.allowSort,
+        allowFixed = customOpts.allowFixed,
+        allowResizable = customOpts.allowResizable;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
+        if (!parent) {
+          if (allowSort) {
+            var sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+              column.renderWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
       });
       $xetable.closeCustom();
       $xetable.emitCustomEvent('confirm', evnt);
@@ -35259,19 +35412,33 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     cancelCustomEvent: function cancelCustomEvent(evnt) {
       var $xetable = this.$xetable;
       var customStore = $xetable.customStore,
+        customOpts = $xetable.customOpts,
         customColumnList = $xetable.customColumnList;
       var oldSortMaps = customStore.oldSortMaps,
         oldFixedMaps = customStore.oldFixedMaps,
         oldVisibleMaps = customStore.oldVisibleMaps;
+      var allowVisible = customOpts.allowVisible,
+        allowSort = customOpts.allowSort,
+        allowFixed = customOpts.allowFixed,
+        allowResizable = customOpts.allowResizable;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column) {
         var colid = column.getKey();
         var visible = !!oldVisibleMaps[colid];
         var fixed = oldFixedMaps[colid] || '';
-        column.renderVisible = visible;
-        column.visible = visible;
-        column.renderFixed = fixed;
-        column.fixed = fixed;
-        column.renderSortNumber = oldSortMaps[colid] || 0;
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
       }, {
         children: 'children'
       });
@@ -35283,7 +35450,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       $xetable.resetColumn(true);
       $xetable.closeCustom();
       $xetable.emitCustomEvent('reset', evnt);
-      this.handleSaveStore('confirm');
+      this.handleSaveStore('reset');
     },
     resetCustomEvent: function resetCustomEvent(evnt) {
       var _this = this;
@@ -37657,6 +37824,12 @@ var Toolbar = VxeToolbar;
       }
     },
     className: [String, Function],
+    pageSizePlacement: {
+      type: String,
+      default: function _default() {
+        return conf.pager.pageSizePlacement;
+      }
+    },
     // 自定义图标
     iconPrevPage: String,
     iconJumpPrev: String,
@@ -37881,7 +38054,7 @@ var Toolbar = VxeToolbar;
         class: 'vxe-pager--sizes',
         props: {
           value: this.pageSize,
-          placement: 'top',
+          placement: this.pageSizePlacement,
           transfer: this.transfer,
           options: this.sizeList
         },
@@ -39887,8 +40060,9 @@ function isActivetem($xeform, formItem) {
     return visible;
   }
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
-    visibleMethod = compConf.itemVisibleMethod;
+  var fiVisibleMethod = compConf ? compConf.formItemVisibleMethod || compConf.itemVisibleMethod : null;
+  if (!visibleMethod && fiVisibleMethod) {
+    visibleMethod = fiVisibleMethod;
   }
   if (!visibleMethod) {
     return true;
@@ -39980,9 +40154,10 @@ function renderTitle(h, _vm, item) {
       })
     }, [renderPrefixIcon(h, titlePrefix)]) : renderPrefixIcon(h, titlePrefix));
   }
+  var rfiTitle = compConf ? compConf.renderFormItemTitle || compConf.renderItemTitle : null;
   titVNs.push(h('span', {
     class: 'vxe-form--item-title-label'
-  }, compConf && compConf.renderItemTitle ? getSlotVNs(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
+  }, rfiTitle ? getSlotVNs(rfiTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -40065,12 +40240,12 @@ var VxeFormConfigItem = {
       titleClassName = item.titleClassName,
       titleStyle = item.titleStyle;
     var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-    var itemClassName = compConf ? compConf.itemClassName : '';
-    var itemStyle = compConf ? compConf.itemStyle : null;
-    var itemContentClassName = compConf ? compConf.itemContentClassName : '';
-    var itemContentStyle = compConf ? compConf.itemContentStyle : null;
-    var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
-    var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
+    var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
+    var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
+    var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
+    var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
+    var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
+    var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
     var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -40119,10 +40294,11 @@ var VxeFormConfigItem = {
       }
     }
     var contentVNs = [];
+    var rfiContent = compConf ? compConf.renderFormItemContent || compConf.renderItemContent : null;
     if (slots && slots.default) {
       contentVNs = $xeform.callSlot(slots.default, params, h);
-    } else if (compConf && compConf.renderItemContent) {
-      contentVNs = getSlotVNs(compConf.renderItemContent.call($xeform, h, itemRender, params));
+    } else if (rfiContent) {
+      contentVNs = getSlotVNs(rfiContent.call($xeform, h, itemRender, params));
     } else if (compConf && compConf.renderItem) {
       contentVNs = getSlotVNs(compConf.renderItem.call($xeform, h, itemRender, params));
     } else if (field) {
@@ -40552,8 +40728,9 @@ function getResetValue(value, resetValue) {
             itemRender = item.itemRender;
           if (isEnableConf(itemRender)) {
             var compConf = v_x_e_table.renderer.get(itemRender.name);
-            if (compConf && compConf.itemResetMethod) {
-              compConf.itemResetMethod({
+            var fiResetMethod = compConf ? compConf.formItemResetMethod || compConf.itemResetMethod : null;
+            if (compConf && fiResetMethod) {
+              fiResetMethod({
                 data: data,
                 field: field,
                 property: field,
@@ -41020,12 +41197,12 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     titleClassName = item.titleClassName,
     titleStyle = item.titleStyle;
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-  var itemClassName = compConf ? compConf.itemClassName : '';
-  var itemStyle = compConf ? compConf.itemStyle : null;
-  var itemContentClassName = compConf ? compConf.itemContentClassName : '';
-  var itemContentStyle = compConf ? compConf.itemContentStyle : null;
-  var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
-  var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
+  var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
+  var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
+  var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
+  var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
+  var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
+  var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
   var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -41059,10 +41236,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     }
   }
   var contentVNs = [];
+  var rfiContent = compConf ? compConf.renderFormItemContent || compConf.renderItemContent : null;
   if (slots && slots.default) {
     contentVNs = _vm.callSlot(slots.default, params, h);
-  } else if (compConf && compConf.renderItemContent) {
-    contentVNs = getSlotVNs(compConf.renderItemContent.call(_vm, h, itemRender, params));
+  } else if (rfiContent) {
+    contentVNs = getSlotVNs(rfiContent.call(_vm, h, itemRender, params));
   } else if (compConf && compConf.renderItem) {
     contentVNs = getSlotVNs(compConf.renderItem.call(_vm, h, itemRender, params));
   } else if (field) {
@@ -42199,7 +42377,7 @@ var Pulldown = VxePulldown;
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',
@@ -42271,6 +42449,7 @@ var Pulldown = VxePulldown;
         colSort: '排序',
         sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
+        colResizable: '列宽（像素）',
         colVisible: '是否显示',
         colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',