byt-ui 0.1.11 → 0.1.13

package/lib/byt-ui.common.js

@@ -155816,7 +155816,10 @@ module.exports = function inspect_(obj, options, depth, seen) {
     if (typeof window !== 'undefined' && obj === window) {
         return '{ [object Window] }';
     }
-    if (obj === __webpack_require__.g) {
+    if (
+        (typeof globalThis !== 'undefined' && obj === globalThis)
+        || (typeof __webpack_require__.g !== 'undefined' && obj === __webpack_require__.g)
+    ) {
         return '{ [object globalThis] }';
     }
     if (!isDate(obj) && !isRegExp(obj)) {
@@ -176166,7 +176169,7 @@ class Minio {
       });
     });
   }
-  upload(file, bucketName, fileName) {
+  putObject(file, bucketName, fileName) {
     return new Promise((resolve, reject) => {
       const metaData = {
         'Content-Type': file.type
@@ -176200,13 +176203,35 @@ class Minio {
       await this.minioMakeBucket(bucketName);
     }
     return new Promise((resolve, reject) => {
-      this.upload(file, bucketName, fileName).then(res => {
+      this.putObject(file, bucketName, fileName).then(res => {
         resolve(res);
       }).catch(err => {
         reject(err);
       });
     });
   }
+  upload(file, bucketName = 'public', unHodeName = true) {
+    // file：文件
+    // bucketName：桶名
+    // unHodeName：是否保留原文件名，默认不保留
+    // 上传图片至minio
+    const {
+      name
+    } = file;
+    const suffix = name.match(/\.[a-zA-Z\d]+$/i);
+    const fileName = unHodeName ? `${new Date().getTime()}${suffix[0]}` : name;
+    return new Promise((resolve, reject) => {
+      this.uploadToMinio({
+        file,
+        bucketName,
+        fileName
+      }).then(() => {
+        resolve(`/minio/${bucketName}/${fileName}`);
+      }).catch(err => {
+        reject(err);
+      });
+    });
+  }
 }
 /* harmony default export */ __webpack_exports__["default"] = ({
   install(Vue, options = {}) {
@@ -180244,12 +180269,22 @@ class request_Request {
     }, error => {
       if (error.response) {
         const status = error.response.status;
+        const message = error.response.data.msg;
         switch (status) {
-          case 404:
-            element_ui_common.Message.error(this._errorCode[status]);
+          case 424:
+          case 428:
+            // 后台定义 424||428 针对令牌过期的特殊响应码
+            this.handler.expire && this.handler.expire(error.response);
+            element_ui_common.Message.error(message);
+            if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+              const {
+                outLogin
+              } = this._Vue.prototype.$appCommon;
+              outLogin && outLogin();
+            }
             break;
-          case 503:
-            element_ui_common.Message.error(error.response.data.msg);
+          default:
+            if (error.config.showError) element_ui_common.Message.error(message);
             break;
         }
         this.handler.error && this.handler.error(error.response);
@@ -180273,7 +180308,8 @@ class request_Request {
         params = {},
         responseType = 'json',
         headers = {},
-        retry = 0
+        retry = 0,
+        showError
       }) => {
         return new Promise((resolve, reject) => {
           this.request({
@@ -180287,7 +180323,7 @@ class request_Request {
             if (!res.code || res.code === 0 || responseType == 'arraybuffer' || responseType == 'blob') {
               resolve(res);
             } else {
-              element_ui_common.Message.error(res.msg);
+              if (showError) element_ui_common.Message.error(res.msg);
               reject(res);
             }
           }).catch(err => {
@@ -180300,7 +180336,8 @@ class request_Request {
                 params,
                 responseType,
                 headers,
-                retry: retry - 1
+                retry: retry - 1,
+                showError
               });
             }
           });
@@ -183525,7 +183562,7 @@ function generatePropagationContext() {
 //# sourceMappingURL=scope.js.map
 
 ;// CONCATENATED MODULE: ./node_modules/@sentry/core/esm/version.js
-const SDK_VERSION = '7.117.0';
+const SDK_VERSION = '7.118.0';
 
 
 //# sourceMappingURL=version.js.map
@@ -215677,12 +215714,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeButtonGroup = exports.ButtonGroup = void 0;
 var _group = _interopRequireDefault(__webpack_require__(55562));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeButtonGroup = exports.VxeButtonGroup = Object.assign(_group.default, {
   install: function install(Vue) {
     Vue.component(_group.default.name, _group.default);
   }
 });
+_vXETable.default.component(_group.default);
 var ButtonGroup = exports.ButtonGroup = VxeButtonGroup;
 var _default = exports["default"] = VxeButtonGroup;
 
@@ -215699,12 +215738,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeButton = exports.Button = void 0;
 var _button = _interopRequireDefault(__webpack_require__(33409));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeButton = exports.VxeButton = Object.assign(_button.default, {
   install: function install(Vue) {
     Vue.component(_button.default.name, _button.default);
   }
 });
+_vXETable.default.component(_button.default);
 var Button = exports.Button = VxeButton;
 var _default = exports["default"] = VxeButton;
 
@@ -216265,12 +216306,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeCheckboxGroup = exports.CheckboxGroup = void 0;
 var _group = _interopRequireDefault(__webpack_require__(71363));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeCheckboxGroup = exports.VxeCheckboxGroup = Object.assign(_group.default, {
   install: function install(Vue) {
     Vue.component(_group.default.name, _group.default);
   }
 });
+_vXETable.default.component(_group.default);
 var CheckboxGroup = exports.CheckboxGroup = VxeCheckboxGroup;
 var _default = exports["default"] = VxeCheckboxGroup;
 
@@ -216287,12 +216330,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeCheckbox = exports.Checkbox = void 0;
 var _checkbox = _interopRequireDefault(__webpack_require__(66375));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeCheckbox = exports.VxeCheckbox = Object.assign(_checkbox.default, {
   install: function install(Vue) {
     Vue.component(_checkbox.default.name, _checkbox.default);
   }
 });
+_vXETable.default.component(_checkbox.default);
 var Checkbox = exports.Checkbox = VxeCheckbox;
 var _default = exports["default"] = VxeCheckbox;
 
@@ -216566,6 +216611,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeColgroup = exports.Colgroup = void 0;
 var _group = _interopRequireDefault(__webpack_require__(99506));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeColgroup = exports.VxeColgroup = Object.assign(_group.default, {
   install: function install(Vue) {
@@ -216574,6 +216620,7 @@ var VxeColgroup = exports.VxeColgroup = Object.assign(_group.default, {
     Vue.component('VxeTableColgroup', _group.default);
   }
 });
+_vXETable.default.component(_group.default);
 var Colgroup = exports.Colgroup = VxeColgroup;
 var _default = exports["default"] = VxeColgroup;
 
@@ -216590,6 +216637,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeColumn = exports.Column = void 0;
 var _column = _interopRequireDefault(__webpack_require__(71387));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeColumn = exports.VxeColumn = Object.assign(_column.default, {
   install: function install(Vue) {
@@ -216598,6 +216646,7 @@ var VxeColumn = exports.VxeColumn = Object.assign(_column.default, {
     Vue.component('VxeTableColumn', _column.default);
   }
 });
+_vXETable.default.component(_column.default);
 var Column = exports.Column = VxeColumn;
 var _default = exports["default"] = VxeColumn;
 
@@ -216632,7 +216681,7 @@ var _default = exports["default"] = VxeTableCustomModule;
 /***/ }),
 
 /***/ 5091:
-/***/ (function(__unused_webpack_module, exports) {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
@@ -216641,6 +216690,8 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports["default"] = void 0;
+var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = exports["default"] = {
   methods: {
     _openCustom: function _openCustom() {
@@ -216648,9 +216699,26 @@ var _default = exports["default"] = {
       var initStore = this.initStore,
         customStore = this.customStore,
         collectColumn = this.collectColumn;
+      var sortMaps = {};
+      var fixedMaps = {};
+      var visibleMaps = {};
+      _xeUtils.default.eachTree(collectColumn, function (column) {
+        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;
+      }, {
+        children: 'children'
+      });
+      customStore.oldSortMaps = sortMaps;
+      customStore.oldFixedMaps = fixedMaps;
+      customStore.oldVisibleMaps = visibleMaps;
+      this.customColumnList = collectColumn.slice(0);
       customStore.visible = true;
       initStore.custom = true;
-      this.customColumnList = collectColumn.slice(0);
       this.checkCustomStatus();
       this.calcMaxHeight();
       return this.$nextTick().then(function () {
@@ -216669,20 +216737,14 @@ var _default = exports["default"] = {
       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,
@@ -216692,12 +216754,12 @@ var _default = exports["default"] = {
       customStore.isAll = collectColumn.every(function (column) {
         return (checkMethod ? !checkMethod({
           column: column
-        }) : false) || column.visible;
+        }) : false) || column.renderVisible;
       });
       customStore.isIndeterminate = !customStore.isAll && collectColumn.some(function (column) {
         return (!checkMethod || checkMethod({
           column: column
-        })) && (column.visible || column.halfVisible);
+        })) && (column.renderVisible || column.halfVisible);
       });
     },
     emitCustomEvent: function emitCustomEvent(type, evnt) {
@@ -216776,16 +216838,21 @@ function updateDropHint(_vm, evnt) {
     dragHintEl.style.left = "".concat(Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x), "px");
   }
 }
-function renderSimplePanel(h, _vm) {
-  var $xetable = _vm.$xetable,
+var renderSimplePanel = function renderSimplePanel(h, _vm) {
+  var _e = _vm._e,
+    $xetable = _vm.$xetable,
     customStore = _vm.customStore;
-  var customOpts = $xetable.customOpts,
-    customColumnList = $xetable.customColumnList,
+  var customColumnList = $xetable.customColumnList,
+    customOpts = $xetable.customOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod,
-    trigger = customOpts.trigger;
+    allowVisible = customOpts.allowVisible,
+    allowSort = customOpts.allowSort,
+    allowFixed = customOpts.allowFixed,
+    trigger = customOpts.trigger,
+    placement = customOpts.placement;
   var colVNs = [];
   var customWrapperOns = {};
   // hover 触发
@@ -216798,7 +216865,7 @@ function renderSimplePanel(h, _vm) {
       column: column
     }) : true;
     if (isVisible) {
-      var isChecked = column.visible;
+      var isChecked = column.renderVisible;
       var isIndeterminate = column.halfVisible;
       var isColGroup = column.children && column.children.length;
       var colTitle = formatText(column.getTitle(), 1);
@@ -216807,16 +216874,26 @@ function renderSimplePanel(h, _vm) {
       }) : false;
       colVNs.push(h('li', {
         key: column.id,
+        attrs: {
+          colid: column.id
+        },
         class: ['vxe-table-custom--option', "level--".concat(column.level), {
           'is--group': isColGroup
-        }]
-      }, [h('div', {
-        title: colTitle,
+        }],
+        on: {
+          dragstart: _vm.sortDragstartEvent,
+          dragend: _vm.sortDragendEvent,
+          dragover: _vm.sortDragoverEvent
+        }
+      }, [allowVisible ? h('div', {
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
+        attrs: {
+          title: _conf.default.i18n('vxe.custom.setting.colVisible')
+        },
         on: {
           click: function click() {
             if (!isDisabled) {
@@ -216826,17 +216903,33 @@ function renderSimplePanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
-      }), h('span', {
-        class: 'vxe-checkbox--label'
-      }, colTitle)]), !parent && customOpts.allowFixed ? h('div', {
+      })]) : _e(), allowSort && column.level === 1 ? h('div', {
+        class: 'vxe-table-custom--sort-option'
+      }, [h('span', {
+        class: 'vxe-table-custom--sort-btn',
+        attrs: {
+          title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
+        },
+        on: {
+          mousedown: _vm.sortMousedownEvent,
+          mouseup: _vm.sortMouseupEvent
+        }
+      }, [h('i', {
+        class: _conf.default.icon.TABLE_CUSTOM_SORT
+      })])]) : _e(), h('div', {
+        class: 'vxe-table-custom--checkbox-label',
+        attrs: {
+          title: colTitle
+        }
+      }, colTitle), !parent && allowFixed ? h('div', {
         class: 'vxe-table-custom--fixed-option'
       }, [h('span', {
-        class: ['vxe-table-custom--fixed-left-option', column.fixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
-          'is--checked': column.fixed === 'left',
-          'is--disabled': isMaxFixedColumn && !column.fixed
+        class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
+          'is--checked': column.renderFixed === 'left',
+          'is--disabled': isMaxFixedColumn && !column.renderFixed
         }],
         attrs: {
-          title: _conf.default.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
+          title: _conf.default.i18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
           click: function click() {
@@ -216844,33 +216937,36 @@ function renderSimplePanel(h, _vm) {
           }
         }
       }), h('span', {
-        class: ['vxe-table-custom--fixed-right-option', column.fixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
-          'is--checked': column.fixed === 'right',
-          'is--disabled': isMaxFixedColumn && !column.fixed
+        class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
+          'is--checked': column.renderFixed === 'right',
+          'is--disabled': isMaxFixedColumn && !column.renderFixed
         }],
         attrs: {
-          title: _conf.default.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
+          title: _conf.default.i18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
           click: function click() {
             _vm.changeFixedOption(column, 'right');
           }
         }
-      })]) : null]));
+      })]) : _e()]));
     }
   });
   var isAllChecked = customStore.isAll;
   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
-    }]
-  }, [h('ul', {
+    }],
+    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
@@ -216885,42 +216981,63 @@ function renderSimplePanel(h, _vm) {
     class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
-  }, _conf.default.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
+  }, _conf.default.i18n('vxe.toolbar.customAll'))]) : h('span', {
+    class: 'vxe-checkbox--label'
+  }, _conf.default.i18n('vxe.table.customTitle'))])]), h('div', {
+    ref: 'bodyElemRef',
+    class: 'vxe-table-custom--list-wrapper'
+  }, [h('transition-group', {
     class: 'vxe-table-custom--body',
-    style: maxHeight ? {
-      maxHeight: "".concat(maxHeight, "px")
-    } : {},
+    props: {
+      name: 'vxe-table-custom--list',
+      tag: 'ul'
+    },
     on: customWrapperOns
-  }, colVNs), customOpts.showFooter ? h('div', {
+  }, colVNs), h('div', {
+    ref: 'dragHintElemRef',
+    class: 'vxe-table-custom-popup--drag-hint'
+  }, _conf.default.i18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
   }, [h('button', {
     class: 'btn--reset',
     on: {
       click: _vm.resetCustomEvent
     }
-  }, customOpts.resetButtonText || _conf.default.i18n('vxe.toolbar.customRestore')), h('button', {
+  }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customRestore')), customOpts.immediate ? _e() : h('button', {
+    class: 'btn--cancel',
+    on: {
+      click: _vm.cancelCustomEvent
+    }
+  }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customCancel')), h('button', {
     class: 'btn--confirm',
     on: {
       click: _vm.confirmCustomEvent
     }
-  }, customOpts.confirmButtonText || _conf.default.i18n('vxe.toolbar.customConfirm'))]) : null]);
-}
-function renderPopupPanel(h, _vm) {
-  var $xetable = _vm.$xetable,
+  }, customOpts.confirmButtonText || _conf.default.i18n('vxe.table.customConfirm'))]) : null] : []);
+};
+var renderPopupPanel = function renderPopupPanel(h, _vm) {
+  var _e = _vm._e,
+    $xetable = _vm.$xetable,
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
     customColumnList = $xetable.customColumnList,
     columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var checkMethod = customOpts.checkMethod,
+  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 = [];
   _xeUtils.default.eachTree(customColumnList, function (column, index, items, path, parent) {
     var isVisible = visibleMethod ? visibleMethod({
       column: column
     }) : true;
     if (isVisible) {
-      var isChecked = column.visible;
+      var isChecked = column.renderVisible;
       var isIndeterminate = column.halfVisible;
       var colTitle = formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
@@ -216929,56 +217046,75 @@ function renderPopupPanel(h, _vm) {
       }) : false;
       trVNs.push(h('tr', {
         key: column.id,
-        class: ["vxe-table-custom-popup--row level--".concat(column.level), {
-          'is--group': isColGroup
-        }],
         attrs: {
           colid: column.id
         },
+        class: ["vxe-table-custom-popup--row level--".concat(column.level), {
+          'is--group': isColGroup
+        }],
         on: {
           dragstart: _vm.sortDragstartEvent,
           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', {
+          'is--checked': isChecked,
+          'is--indeterminate': isIndeterminate,
+          'is--disabled': isDisabled
+        }],
+        attrs: {
+          title: _conf.default.i18n('vxe.custom.setting.colVisible')
+        },
+        on: {
+          click: function click() {
+            if (!isDisabled) {
+              _vm.changeCheckboxOption(column);
+            }
+          }
+        }
+      }, [h('span', {
+        class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
+      })])]) : _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',
+        attrs: {
+          title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
+        },
         on: {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
       }, [h('i', {
-        class: 'vxe-icon-sort'
-      })]) : null]), h('td', {
+        class: _conf.default.icon.TABLE_CUSTOM_SORT
+      })]) : 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)]), h('td', {
-        class: 'vxe-table-custom-popup--column-item col--visible'
-      }, [h('div', {
-        class: ['vxe-table-custom--checkbox-option', {
-          'is--checked': isChecked,
-          'is--indeterminate': isIndeterminate,
-          'is--disabled': isDisabled
-        }],
+      }, 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: {
-          click: function click() {
-            if (!isDisabled) {
-              _vm.changeCheckboxOption(column);
-            }
+          modelValue: function modelValue(value) {
+            column.renderResizeWidth = Math.max(40, Number(value));
           }
         }
-      }, [h('span', {
-        class: ['vxe-checkbox--icon', isIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
-      })])]), h('td', {
+      })]) : _e(), allowFixed ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--fixed'
-      }, [!parent && customOpts.allowFixed ? h('vxe-radio-group', {
+      }, [parent ? h('span', '-') : h('vxe-radio-group', {
         props: {
-          value: column.fixed || '',
+          value: column.renderFixed || '',
           type: 'button',
           size: 'mini',
           options: [{
@@ -216996,25 +217132,26 @@ function renderPopupPanel(h, _vm) {
         },
         on: {
           input: function input(value) {
-            column.fixed = value;
-          },
-          change: function change() {
-            _vm.changePopupFixedOption(column);
-          }
+            column.renderFixed = value;
+          } // onChange () {
+          //   changePopupFixedOption(column)
+          // }
         }
-      }) : null])]));
+      })]) : _e()]));
     }
   });
+  var isAllChecked = customStore.isAll;
+  var isAllIndeterminate = customStore.isIndeterminate;
   return h('vxe-modal', {
     key: 'popup',
     props: {
+      className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
       value: customStore.visible,
-      title: _conf.default.i18n('vxe.custom.cstmTitle'),
-      className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
-      width: '40vw',
-      minWidth: 520,
-      height: '50vh',
-      minHeight: 300,
+      title: modalOpts.title || _conf.default.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,
@@ -217034,24 +217171,47 @@ 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'
           }
-        }), h('col'), h('col', {
+        }) : _e(), allowSort ? h('col', {
           style: {
             width: '80px'
           }
-        }), h('col', {
+        }) : _e(), h('col', {
+          style: {
+            minWidth: '120px'
+          }
+        }), allowResizable ? h('col', {
+          style: {
+            width: '140px'
+          }
+        }) : _e(), allowFixed ? h('col', {
           style: {
             width: '200px'
           }
-        })]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
+        }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
+          class: ['vxe-table-custom--checkbox-option', {
+            'is--checked': isAllChecked,
+            'is--indeterminate': isAllIndeterminate
+          }],
+          attrs: {
+            title: _conf.default.i18n('vxe.table.allTitle')
+          },
+          on: {
+            click: _vm.allCustomEvent
+          }
+        }, [h('span', {
+          class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
+        }), h('span', {
+          class: 'vxe-checkbox--label'
+        }, _conf.default.i18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
           class: 'vxe-table-custom-popup--table-sort-help-title'
         }, _conf.default.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
           props: {
             enterable: true,
-            content: '点击并拖动图标可以调整列的排序'
+            content: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
           },
           scopedSlots: {
             default: function _default() {
@@ -217060,7 +217220,7 @@ function renderPopupPanel(h, _vm) {
               });
             }
           }
-        })]), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colVisible')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
+        })]) : _e(), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, _conf.default.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -217079,7 +217239,7 @@ function renderPopupPanel(h, _vm) {
             content: customOpts.resetButtonText || _conf.default.i18n('vxe.custom.cstmRestore')
           },
           on: {
-            click: _vm.resetPopupCustomEvent
+            click: _vm.resetCustomEvent
           }
         }), h('vxe-button', {
           props: {
@@ -217100,7 +217260,7 @@ function renderPopupPanel(h, _vm) {
       }
     }
   });
-}
+};
 var _default2 = exports["default"] = {
   name: 'VxeTableCustomPanel',
   props: {
@@ -217147,23 +217307,101 @@ var _default2 = exports["default"] = {
         }
       }, 300);
     },
+    getStoreData: function getStoreData() {
+      return {};
+    },
+    handleSaveStore: function handleSaveStore(type) {
+      var $xetable = this.$xetable;
+      var id = $xetable.id,
+        customOpts = $xetable.customOpts;
+      var storage = customOpts.storage,
+        updateStore = customOpts.updateStore;
+      if (storage && id && updateStore) {
+        updateStore({
+          id: id,
+          type: type,
+          storeData: $xetable.getCustomStoreData()
+        });
+      }
+    },
     confirmCustomEvent: function confirmCustomEvent(evnt) {
       var $xetable = this.$xetable;
+      var customOpts = $xetable.customOpts,
+        customColumnList = $xetable.customColumnList;
+      var allowVisible = customOpts.allowVisible,
+        allowSort = customOpts.allowSort,
+        allowFixed = customOpts.allowFixed,
+        allowResizable = customOpts.allowResizable;
+      _xeUtils.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);
+      this.handleSaveStore('confirm');
     },
     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;
+      _xeUtils.default.eachTree(customColumnList, function (column) {
+        var colid = column.getKey();
+        var visible = !!oldVisibleMaps[colid];
+        var fixed = oldFixedMaps[colid] || '';
+        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'
+      });
       $xetable.closeCustom();
       $xetable.emitCustomEvent('cancel', evnt);
     },
-    resetCustomEvent: function resetCustomEvent(evnt) {
+    handleResetCustomEvent: function handleResetCustomEvent(evnt) {
       var $xetable = this.$xetable;
       $xetable.resetColumn(true);
       $xetable.closeCustom();
       $xetable.emitCustomEvent('reset', evnt);
+      this.handleSaveStore('reset');
     },
-    resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
+    resetCustomEvent: function resetCustomEvent(evnt) {
       var _this = this;
       if (_vXETable.default.modal) {
         _vXETable.default.modal.confirm({
@@ -217172,7 +217410,23 @@ var _default2 = exports["default"] = {
           escClosable: true
         }).then(function (type) {
           if (type === 'confirm') {
-            _this.resetCustomEvent(evnt);
+            _this.handleResetCustomEvent(evnt);
+          }
+        });
+      } else {
+        this.handleResetCustomEvent(evnt);
+      }
+    },
+    resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
+      var _this2 = this;
+      if (_vXETable.default.modal) {
+        _vXETable.default.modal.confirm({
+          content: _conf.default.i18n('vxe.custom.cstmConfirmRestore'),
+          className: 'vxe-table--ignore-clear',
+          escClosable: true
+        }).then(function (type) {
+          if (type === 'confirm') {
+            _this2.resetCustomEvent(evnt);
           }
         });
       } else {
@@ -217201,9 +217455,9 @@ var _default2 = exports["default"] = {
     changeCheckboxOption: function changeCheckboxOption(column) {
       var $xetable = this.$xetable;
       var customOpts = $xetable.customOpts;
-      var isChecked = !column.visible;
+      var isChecked = !column.renderVisible;
       _xeUtils.default.eachTree([column], function (item) {
-        item.visible = isChecked;
+        item.renderVisible = isChecked;
         item.halfVisible = false;
       });
       this.handleOptionCheck(column);
@@ -217215,21 +217469,23 @@ var _default2 = exports["default"] = {
     changeFixedOption: function changeFixedOption(column, colFixed) {
       var $xetable = this.$xetable;
       var isMaxFixedColumn = $xetable.isMaxFixedColumn;
-      if (column.fixed === colFixed) {
-        $xetable.clearColumnFixed(column);
+      if (column.renderFixed === colFixed) {
+        column.renderFixed = '';
+        // $xeTable.clearColumnFixed(column)
       } else {
-        if (!isMaxFixedColumn || column.fixed) {
-          $xetable.setColumnFixed(column, colFixed);
+        if (!isMaxFixedColumn || column.renderFixed) {
+          column.renderFixed = colFixed;
+          // $xeTable.setColumnFixed(column, colFixed)
         }
       }
     },
-    changePopupFixedOption: function changePopupFixedOption(column) {
-      var $xetable = this.$xetable;
-      var isMaxFixedColumn = $xetable.isMaxFixedColumn;
-      if (!isMaxFixedColumn) {
-        $xetable.setColumnFixed(column, column.fixed);
-      }
-    },
+    // changePopupFixedOption  (column) {
+    //   const { $xetable } = this
+    //   const { isMaxFixedColumn } = $xetable
+    //   if (!isMaxFixedColumn) {
+    //     $xetable.setColumnFixed(column, column.fixed)
+    //   }
+    // },
     allCustomEvent: function allCustomEvent() {
       var $xetable = this.$xetable,
         customStore = this.customStore;
@@ -217241,7 +217497,7 @@ var _default2 = exports["default"] = {
         if (!checkMethod || checkMethod({
           column: column
         })) {
-          column.visible = isAll;
+          column.renderVisible = isAll;
           column.halfVisible = false;
         }
       });
@@ -217320,8 +217576,6 @@ var _default2 = exports["default"] = {
       }
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
-      // 更新顺序
-      this.updateColumnSort();
     },
     sortDragoverEvent: function sortDragoverEvent(evnt) {
       var $xetable = this.$xetable,
@@ -217342,15 +217596,6 @@ var _default2 = exports["default"] = {
         this.prevDropTrEl = trEl;
       }
       updateDropHint(this, evnt);
-    },
-    updateColumnSort: function updateColumnSort() {
-      var $xetable = this.$xetable;
-      var customColumnList = $xetable.customColumnList;
-      // 更新顺序
-      customColumnList.forEach(function (column, index) {
-        var sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-      });
     }
   }
 };
@@ -217929,7 +218174,7 @@ var _default = exports["default"] = {
       var row = params.row,
         column = params.column;
       var editRender = column.editRender;
-      var cell = params.cell = params.cell || this.getCell(row, column);
+      var cell = params.cell = params.cell || this.getCellElement(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
       if (cell && (0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(editRender)) {
         // 激活编辑
@@ -218137,10 +218382,10 @@ var _default = exports["default"] = {
           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 (_xeUtils.default.isFunction(autofocus)) {
@@ -218199,7 +218444,7 @@ var _default = exports["default"] = {
       var column = _xeUtils.default.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       if (row && column && (0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this8.getCell(row, column);
+          var cell = _this8.getCellElement(row, column);
           if (cell) {
             _this8.handleActived({
               row: row,
@@ -218226,7 +218471,7 @@ var _default = exports["default"] = {
       if (row && column && editOpts.trigger !== 'manual') {
         var rowIndex = this.findRowIndexOf(tableData, row);
         if (rowIndex > -1) {
-          var cell = this.getCell(row, column);
+          var cell = this.getCellElement(row, column);
           var params = {
             row: row,
             rowIndex: rowIndex,
@@ -218319,7 +218564,7 @@ var _default = exports["default"] = {
         column = selected.column;
       this.reColSdCls();
       if (row && column) {
-        var cell = this.getCell(row, column);
+        var cell = this.getCellElement(row, column);
         if (cell) {
           _dom.default.addClass(cell, 'col--selected');
         }
@@ -219133,7 +219378,7 @@ function getLabelData($xetable, opts, columns, datas) {
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             var compConf = _vXETable.default.renderer.get(renderOpts.name);
             if (compConf) {
-              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
             }
           }
           if (!bodyExportMethod) {
@@ -219176,7 +219421,7 @@ function getLabelData($xetable, opts, columns, datas) {
                     htmlCellElem.innerHTML = cellValue;
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
-                    var cell = $xetable.getCell(row, column);
+                    var cell = $xetable.getCellElement(row, column);
                     if (cell) {
                       cellValue = cell.innerText.trim();
                     }
@@ -219243,7 +219488,7 @@ function getLabelData($xetable, opts, columns, datas) {
                 htmlCellElem.innerHTML = cellValue;
                 cellValue = htmlCellElem.innerText.trim();
               } else {
-                var cell = $xetable.getCell(row, column);
+                var cell = $xetable.getCellElement(row, column);
                 if (cell) {
                   cellValue = cell.innerText.trim();
                 }
@@ -219282,30 +219527,36 @@ function getHeaderTitle($xetable, opts, column) {
     $table: $xetable
   }) : (opts.original ? column.property : column.getTitle()) || '';
 }
-function getFooterCellValue($xetable, opts, items, column) {
+function getFooterCellValue($xetable, opts, row, column) {
   var columnOpts = $xetable.columnOpts;
   var renderOpts = column.editRender || column.cellRender;
   var footLabelMethod = column.footerExportMethod;
   if (!footLabelMethod && renderOpts && renderOpts.name) {
     var compConf = _vXETable.default.renderer.get(renderOpts.name);
     if (compConf) {
-      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
+      footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
     }
   }
   if (!footLabelMethod) {
     footLabelMethod = columnOpts.footerExportMethod;
   }
   var _columnIndex = $xetable.getVTColumnIndex(column);
-  var cellValue = footLabelMethod ? footLabelMethod({
-    $table: $xetable,
-    items: items,
-    itemIndex: _columnIndex,
-    row: items,
-    _columnIndex: _columnIndex,
-    column: column,
-    options: opts
-  }) : _xeUtils.default.toValueString(items[_columnIndex]);
-  return cellValue;
+  if (footLabelMethod) {
+    return footLabelMethod({
+      $table: $xetable,
+      items: row,
+      itemIndex: _columnIndex,
+      row: row,
+      _columnIndex: _columnIndex,
+      column: column,
+      options: opts
+    });
+  }
+  // 兼容老模式
+  if (_xeUtils.default.isArray(row)) {
+    return _xeUtils.default.toValueString(row[_columnIndex]);
+  }
+  return _xeUtils.default.get(row, column.field);
 }
 function getFooterData(opts, footerTableData) {
   var footerFilterMethod = opts.footerFilterMethod;
@@ -219359,9 +219610,9 @@ function toCsv($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -219382,9 +219633,9 @@ function toTxt($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -219555,11 +219806,11 @@ function toHtml($xetable, opts, columns, datas) {
     var footers = getFooterData(opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
-      footers.forEach(function (rows) {
+      footers.forEach(function (row) {
         tables.push("<tr>".concat(columns.map(function (column) {
           var footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
           var classNames = hasEllipsis($xetable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-          var cellValue = getFooterCellValue($xetable, opts, rows, column);
+          var cellValue = getFooterCellValue($xetable, opts, row, column);
           if (footAlign) {
             classNames.push("col--".concat(footAlign));
           }
@@ -219591,9 +219842,9 @@ function toXML($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       xml += "<Row>".concat(columns.map(function (column) {
-        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, rows, column), "</Data></Cell>");
+        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, row, column), "</Data></Cell>");
       }).join(''), "</Row>");
     });
   }
@@ -219960,6 +220211,7 @@ function handleImport($xetable, content, opts) {
   }
 }
 function handleFileImport($xetable, file, opts) {
+  var importOpts = $xetable.importOpts;
   var importMethod = opts.importMethod,
     afterImportMethod = opts.afterImportMethod;
   var _UtilTools$parseFile = _utils.default.parseFile(file),
@@ -219967,7 +220219,7 @@ function handleFileImport($xetable, file, opts) {
     filename = _UtilTools$parseFile.filename;
 
   // 检查类型，如果为自定义导出，则不需要校验类型
-  if (!importMethod && !_xeUtils.default.includes(_vXETable.default.globalConfs.importTypes, type)) {
+  if (!importMethod && !_xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
       if (false) {}
@@ -220190,7 +220442,8 @@ function handleExportAndPrint($xetable, options, isPrint) {
     treeConfig = $xetable.treeConfig,
     mergeList = $xetable.mergeList,
     isGroup = $xetable.isGroup,
-    exportParams = $xetable.exportParams;
+    exportParams = $xetable.exportParams,
+    exportOpts = $xetable.exportOpts;
   var selectRecords = $xetable.getCheckboxRecords();
   var hasFooter = !!footerTableData.length;
   var hasTree = treeConfig;
@@ -220199,7 +220452,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
     message: true,
     isHeader: true
   }, options);
-  var types = defOpts.types || _vXETable.default.globalConfs.exportTypes;
+  var types = defOpts.types || _xeUtils.default.keys(exportOpts._typeMaps);
   var modes = defOpts.modes;
   var checkMethod = customOpts.checkMethod;
   var exportColumns = collectColumn.slice(0);
@@ -220459,7 +220712,7 @@ var _default = exports["default"] = {
       }
 
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!opts.exportMethod && !_xeUtils.default.includes(_vXETable.default.globalConfs.exportTypes, type)) {
+      if (!opts.exportMethod && !_xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)) {
         if (false) {}
         var params = {
           status: false
@@ -220538,11 +220791,12 @@ var _default = exports["default"] = {
     },
     _importData: function _importData(options) {
       var _this2 = this;
+      var importOpts = this.importOpts;
       var opts = Object.assign({
-        types: _vXETable.default.globalConfs.importTypes
+        types: _xeUtils.default.keys(importOpts._typeMaps)
         // beforeImportMethod: null,
         // afterImportMethod: null
-      }, this.importOpts, options);
+      }, importOpts, options);
       var beforeImportMethod = opts.beforeImportMethod,
         afterImportMethod = opts.afterImportMethod;
       if (beforeImportMethod) {
@@ -220596,12 +220850,31 @@ var _default = exports["default"] = {
         }
       });
     },
+    _getPrintHtml: function _getPrintHtml(options) {
+      var printOpts = this.printOpts;
+      var opts = Object.assign({
+        original: false
+        // beforePrintMethod
+      }, printOpts, options, {
+        type: 'html',
+        download: false,
+        remote: false,
+        print: true
+      });
+      return this.exportData(opts).then(function (_ref4) {
+        var content = _ref4.content;
+        return {
+          html: content
+        };
+      });
+    },
     _openImport: function _openImport(options) {
+      var importOpts = this.importOpts;
       var defOpts = Object.assign({
         mode: 'insert',
         message: true,
-        types: _vXETable.default.globalConfs.importTypes
-      }, options, this.importOpts);
+        types: _xeUtils.default.keys(importOpts._typeMaps)
+      }, options, importOpts);
       var types = defOpts.types;
       var isTree = !!this.getTreeStatus();
       if (isTree) {
@@ -220761,7 +221034,7 @@ var _default = exports["default"] = {
           filterMultiple = column.filterMultiple,
           filterRender = column.filterRender;
         var compConf = filterRender ? _vXETable.default.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.default.getDomNode(),
           visibleWidth = _DomTools$getDomNode.visibleWidth;
         Object.assign(filterStore, {
@@ -220946,7 +221219,7 @@ var _default = exports["default"] = {
           filterRender = column.filterRender;
         if (filters) {
           var compConf = filterRender ? _vXETable.default.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;
@@ -221020,7 +221293,6 @@ exports["default"] = void 0;
 var _conf = _interopRequireDefault(__webpack_require__(56895));
 var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 var _utils = _interopRequireDefault(__webpack_require__(87794));
-var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
 var _vn = __webpack_require__(34623);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = exports["default"] = {
@@ -221043,7 +221315,7 @@ var _default = exports["default"] = {
       column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
     var compConf = filterRender ? _vXETable.default.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.default.getClass(filterClassName, Object.assign({
         $panel: this,
@@ -221066,6 +221338,7 @@ var _default = exports["default"] = {
         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'
@@ -221073,10 +221346,10 @@ var _default = exports["default"] = {
           $panel: this,
           context: this
         }, args), h))];
-      } else if (compConf && compConf.renderFilter) {
+      } else if (rtFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, (0, _vn.getSlotVNs)(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
+        }, (0, _vn.getSlotVNs)(rtFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
         }, args))))];
@@ -221141,7 +221414,7 @@ var _default = exports["default"] = {
       var filterRender = column.filterRender;
       var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
       var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-      return multiple && (!compConf || (_xeUtils.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: {
@@ -221237,12 +221510,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeFormGather = exports.FormGather = void 0;
 var _formGather = _interopRequireDefault(__webpack_require__(63577));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeFormGather = exports.VxeFormGather = Object.assign(_formGather.default, {
   install: function install(Vue) {
     Vue.component(_formGather.default.name, _formGather.default);
   }
 });
+_vXETable.default.component(_formGather.default);
 var FormGather = exports.FormGather = VxeFormGather;
 var _default = exports["default"] = VxeFormGather;
 
@@ -221259,12 +221534,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeFormItem = exports.FormItem = void 0;
 var _formItem = _interopRequireDefault(__webpack_require__(78749));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeFormItem = exports.VxeFormItem = Object.assign(_formItem.default, {
   install: function install(Vue) {
     Vue.component(_formItem.default.name, _formItem.default);
   }
 });
+_vXETable.default.component(_formItem.default);
 var FormItem = exports.FormItem = VxeFormItem;
 var _default = exports["default"] = VxeFormItem;
 
@@ -221281,12 +221558,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeForm = exports.Form = void 0;
 var _form = _interopRequireDefault(__webpack_require__(47321));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeForm = exports.VxeForm = Object.assign(_form.default, {
   install: function install(Vue) {
     Vue.component(_form.default.name, _form.default);
   }
 });
+_vXETable.default.component(_form.default);
 var Form = exports.Form = VxeForm;
 var _default = exports["default"] = VxeForm;
 
@@ -221362,12 +221641,12 @@ var VxeFormConfigItem = {
       titleClassName = item.titleClassName,
       titleStyle = item.titleStyle;
     var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.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 = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -221416,10 +221695,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 = (0, _vn.getSlotVNs)(compConf.renderItemContent.call($xeform, h, itemRender, params));
+    } else if (rfiContent) {
+      contentVNs = (0, _vn.getSlotVNs)(rfiContent.call($xeform, h, itemRender, params));
     } else if (compConf && compConf.renderItem) {
       contentVNs = (0, _vn.getSlotVNs)(compConf.renderItem.call($xeform, h, itemRender, params));
     } else if (field) {
@@ -221628,12 +221908,12 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     titleClassName = item.titleClassName,
     titleStyle = item.titleStyle;
   var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.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 = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -221667,10 +221947,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 = (0, _vn.getSlotVNs)(compConf.renderItemContent.call(_vm, h, itemRender, params));
+  } else if (rfiContent) {
+    contentVNs = (0, _vn.getSlotVNs)(rfiContent.call(_vm, h, itemRender, params));
   } else if (compConf && compConf.renderItem) {
     contentVNs = (0, _vn.getSlotVNs)(compConf.renderItem.call(_vm, h, itemRender, params));
   } else if (field) {
@@ -222134,8 +222415,9 @@ var _default2 = exports["default"] = {
             itemRender = item.itemRender;
           if ((0, _utils.isEnableConf)(itemRender)) {
             var compConf = _vXETable.default.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,
@@ -222551,9 +222833,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 ? (0, _vn.getSlotVNs)(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
+  }, rfiTitle ? (0, _vn.getSlotVNs)(rfiTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -222672,8 +222955,9 @@ function isActivetem($xeform, formItem) {
     return visible;
   }
   var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.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;
@@ -222740,6 +223024,7 @@ var VxeGrid = exports.VxeGrid = Object.assign(_grid.default, {
     Vue.component(_grid.default.name, _grid.default);
   }
 });
+_vXETable.default.component(_grid.default);
 var Grid = exports.Grid = VxeGrid;
 var _default = exports["default"] = VxeGrid;
 
@@ -224028,12 +224313,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeIcon = exports.Icon = void 0;
 var _icon = _interopRequireDefault(__webpack_require__(59279));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeIcon = exports.VxeIcon = Object.assign(_icon.default, {
   install: function install(Vue) {
     Vue.component(_icon.default.name, _icon.default);
   }
 });
+_vXETable.default.component(_icon.default);
 var Icon = exports.Icon = VxeIcon;
 var _default = exports["default"] = VxeIcon;
 
@@ -224119,12 +224406,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeInput = exports.Input = void 0;
 var _input = _interopRequireDefault(__webpack_require__(55613));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeInput = exports.VxeInput = Object.assign(_input.default, {
   install: function install(Vue) {
     Vue.component(_input.default.name, _input.default);
   }
 });
+_vXETable.default.component(_input.default);
 var Input = exports.Input = VxeInput;
 var _default = exports["default"] = VxeInput;
 
@@ -226819,7 +227108,7 @@ var _default = exports["default"] = {
         }
         params.columnIndex = targetColumnIndex;
         params.column = targetColumn;
-        params.cell = this.getCell(params.row, params.column);
+        params.cell = this.getCellElement(params.row, params.column);
         if (editConfig) {
           if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row') {
@@ -226909,7 +227198,7 @@ var _default = exports["default"] = {
         params.column = visibleColumn[params.columnIndex];
       }
       this.scrollToRow(params.row, params.column).then(function () {
-        params.cell = _this3.getCell(params.row, params.column);
+        params.cell = _this3.getCellElement(params.row, params.column);
         _this3.handleSelected(params, evnt);
       });
     },
@@ -227135,12 +227424,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeList = exports.List = void 0;
 var _list = _interopRequireDefault(__webpack_require__(43369));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeList = exports.VxeList = Object.assign(_list.default, {
   install: function install(Vue) {
     Vue.component(_list.default.name, _list.default);
   }
 });
+_vXETable.default.component(_list.default);
 var List = exports.List = VxeList;
 var _default = exports["default"] = VxeList;
 
@@ -227520,12 +227811,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeLoading = exports.Loading = void 0;
 var _loading = _interopRequireDefault(__webpack_require__(65909));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeLoading = exports.VxeLoading = Object.assign(_loading.default, {
   install: function install(Vue) {
     Vue.component(_loading.default.name, _loading.default);
   }
 });
+_vXETable.default.component(_loading.default);
 var Loading = exports.Loading = VxeLoading;
 var _default = exports["default"] = VxeLoading;
 
@@ -227641,7 +227934,7 @@ var _default = exports["default"] = {
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',
@@ -227656,7 +227949,8 @@ var _default = exports["default"] = {
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '重置',
+      customCancel: '取消',
+      customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
     },
     grid: {
@@ -227712,6 +228006,7 @@ var _default = exports["default"] = {
         colSort: '排序',
         sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
+        colResizable: '列宽（像素）',
         colVisible: '是否显示',
         colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
@@ -228329,7 +228624,7 @@ var _default = exports["default"] = {
                 column = params.column;
               if (keyboard && row && column) {
                 _this.scrollToRow(row, column).then(function () {
-                  var cell = _this.getCell(row, column);
+                  var cell = _this.getCellElement(row, column);
                   var _DomTools$getAbsolute2 = _dom.default.getAbsolutePos(cell),
                     boundingTop = _DomTools$getAbsolute2.boundingTop,
                     boundingLeft = _DomTools$getAbsolute2.boundingLeft;
@@ -228691,6 +228986,7 @@ var VxeModal = exports.VxeModal = Object.assign(_modal.default, {
     }
   }
 });
+_vXETable.default.component(_modal.default);
 var Modal = exports.Modal = VxeModal;
 var _default = exports["default"] = VxeModal;
 
@@ -229832,12 +230128,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeOptgroup = exports.Optgroup = void 0;
 var _optgroup = _interopRequireDefault(__webpack_require__(11474));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeOptgroup = exports.VxeOptgroup = Object.assign(_optgroup.default, {
   install: function install(Vue) {
     Vue.component(_optgroup.default.name, _optgroup.default);
   }
 });
+_vXETable.default.component(_optgroup.default);
 var Optgroup = exports.Optgroup = VxeOptgroup;
 var _default = exports["default"] = VxeOptgroup;
 
@@ -229854,12 +230152,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeOption = exports.Option = void 0;
 var _option = _interopRequireDefault(__webpack_require__(90916));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeOption = exports.VxeOption = Object.assign(_option.default, {
   install: function install(Vue) {
     Vue.component(_option.default.name, _option.default);
   }
 });
+_vXETable.default.component(_option.default);
 var Option = exports.Option = VxeOption;
 var _default = exports["default"] = VxeOption;
 
@@ -229876,12 +230176,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxePager = exports.Pager = void 0;
 var _pager = _interopRequireDefault(__webpack_require__(2469));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxePager = exports.VxePager = Object.assign(_pager.default, {
   install: function install(Vue) {
     Vue.component(_pager.default.name, _pager.default);
   }
 });
+_vXETable.default.component(_pager.default);
 var Pager = exports.Pager = VxePager;
 var _default = exports["default"] = VxePager;
 
@@ -230000,6 +230302,12 @@ var _default2 = exports["default"] = {
       }
     },
     className: [String, Function],
+    pageSizePlacement: {
+      type: String,
+      default: function _default() {
+        return _conf.default.pager.pageSizePlacement;
+      }
+    },
     // 自定义图标
     iconPrevPage: String,
     iconJumpPrev: String,
@@ -230118,7 +230426,7 @@ var _default2 = exports["default"] = {
     renderEnd: function renderEnd(h) {
       return h('button', {
         class: ['vxe-pager--prev-btn', {
-          'is--disabled': this.currentPage <= 1
+          'is--disabled': this.currentPage >= this.pageCount
         }],
         attrs: {
           type: 'button',
@@ -230224,7 +230532,7 @@ var _default2 = exports["default"] = {
         class: 'vxe-pager--sizes',
         props: {
           value: this.pageSize,
-          placement: 'top',
+          placement: this.pageSizePlacement,
           transfer: this.transfer,
           options: this.sizeList
         },
@@ -230443,12 +230751,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxePulldown = exports.Pulldown = void 0;
 var _pulldown = _interopRequireDefault(__webpack_require__(42547));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxePulldown = exports.VxePulldown = Object.assign(_pulldown.default, {
   install: function install(Vue) {
     Vue.component(_pulldown.default.name, _pulldown.default);
   }
 });
+_vXETable.default.component(_pulldown.default);
 var Pulldown = exports.Pulldown = VxePulldown;
 var _default = exports["default"] = VxePulldown;
 
@@ -230788,12 +231098,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeRadioButton = exports.RadioButton = void 0;
 var _button = _interopRequireDefault(__webpack_require__(38580));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeRadioButton = exports.VxeRadioButton = Object.assign(_button.default, {
   install: function install(Vue) {
     Vue.component(_button.default.name, _button.default);
   }
 });
+_vXETable.default.component(_button.default);
 var RadioButton = exports.RadioButton = VxeRadioButton;
 var _default = exports["default"] = VxeRadioButton;
 
@@ -230810,12 +231122,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeRadioGroup = exports.RadioGroup = void 0;
 var _group = _interopRequireDefault(__webpack_require__(13137));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeRadioGroup = exports.VxeRadioGroup = Object.assign(_group.default, {
   install: function install(Vue) {
     Vue.component(_group.default.name, _group.default);
   }
 });
+_vXETable.default.component(_group.default);
 var RadioGroup = exports.RadioGroup = VxeRadioGroup;
 var _default = exports["default"] = VxeRadioGroup;
 
@@ -230832,12 +231146,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeRadio = exports.Radio = void 0;
 var _radio = _interopRequireDefault(__webpack_require__(95429));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeRadio = exports.VxeRadio = Object.assign(_radio.default, {
   install: function install(Vue) {
     Vue.component(_radio.default.name, _radio.default);
   }
 });
+_vXETable.default.component(_radio.default);
 var Radio = exports.Radio = VxeRadio;
 var _default = exports["default"] = VxeRadio;
 
@@ -231235,6 +231551,7 @@ exports["default"] = exports.VxeSelect = exports.Select = void 0;
 var _select = _interopRequireDefault(__webpack_require__(51485));
 var _option = _interopRequireDefault(__webpack_require__(90916));
 var _optgroup = _interopRequireDefault(__webpack_require__(11474));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeSelect = exports.VxeSelect = Object.assign(_select.default, {
   Option: _option.default,
@@ -231245,6 +231562,7 @@ var VxeSelect = exports.VxeSelect = Object.assign(_select.default, {
     Vue.component(_optgroup.default.name, _optgroup.default);
   }
 });
+_vXETable.default.component(_select.default);
 var Select = exports.Select = VxeSelect;
 var _default = exports["default"] = VxeSelect;
 
@@ -232538,12 +232856,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeSwitch = exports.Switch = void 0;
 var _switch = _interopRequireDefault(__webpack_require__(93265));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeSwitch = exports.VxeSwitch = Object.assign(_switch.default, {
   install: function install(Vue) {
     Vue.component(_switch.default.name, _switch.default);
   }
 });
+_vXETable.default.component(_switch.default);
 var Switch = exports.Switch = VxeSwitch;
 var _default = exports["default"] = VxeSwitch;
 
@@ -232760,6 +233080,7 @@ var VxeTable = exports.VxeTable = Object.assign(_table.default, {
     Vue.component(_body.default.name, _body.default);
   }
 });
+_vXETable.default.component(_table.default);
 var Table = exports.Table = VxeTable;
 var _default = exports["default"] = VxeTable;
 
@@ -232891,8 +233212,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var rowHeight = rowOpts.height;
   var renderOpts = editRender || cellRender;
   var compConf = renderOpts ? _vXETable.default.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);
@@ -233186,7 +233507,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");
@@ -233208,7 +233530,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 ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
         on: trOn
@@ -233785,8 +234109,9 @@ function getFooterContent(h, params) {
   }
   if (renderOpts) {
     var compConf = _vXETable.default.renderer.get(renderOpts.name);
-    if (compConf && compConf.renderFooter) {
-      return (0, _vn.getSlotVNs)(compConf.renderFooter.call($table, h, renderOpts, params));
+    var rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
+    if (rtFooter) {
+      return (0, _vn.getSlotVNs)(rtFooter.call($table, h, renderOpts, params));
     }
   }
   // 兼容老模式
@@ -233873,8 +234198,9 @@ var Cell = exports.Cell = {
     }
     if (renderOpts) {
       var compConf = _vXETable.default.renderer.get(renderOpts.name);
-      if (compConf && compConf.renderHeader) {
-        return (0, _vn.getSlotVNs)(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)));
+      var rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
+      if (rtHeader) {
+        return (0, _vn.getSlotVNs)(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
       }
     }
     return renderTitleContent(h, params, _utils.default.formatText(column.getTitle(), 1));
@@ -233894,10 +234220,12 @@ var Cell = exports.Cell = {
       return $table.callSlot(slots.default, params, h);
     }
     if (renderOpts) {
-      var funName = editRender ? 'renderCell' : 'renderDefault';
       var compConf = _vXETable.default.renderer.get(renderOpts.name);
-      if (compConf && compConf[funName]) {
-        return (0, _vn.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 (0, _vn.getSlotVNs)(renderFn.call($table, h, renderOpts, Object.assign({
           $type: editRender ? 'edit' : 'cell'
         }, params)));
       }
@@ -233960,7 +234288,6 @@ var Cell = exports.Cell = {
     }
     if (!trigger || trigger === 'default') {
       on.click = function (evnt) {
-        evnt.stopPropagation();
         $table.triggerTreeExpandEvent(evnt, params);
       };
     }
@@ -234041,7 +234368,6 @@ var Cell = exports.Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -234102,7 +234428,6 @@ var Cell = exports.Cell = {
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
-            evnt.stopPropagation();
             $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
@@ -234165,7 +234490,6 @@ var Cell = exports.Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -234241,7 +234565,6 @@ var Cell = exports.Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -234326,7 +234649,6 @@ var Cell = exports.Cell = {
       }],
       on: {
         click: function click(evnt) {
-          evnt.stopPropagation();
           $table.triggerRowExpandEvent(evnt, params);
         }
       }
@@ -234346,8 +234668,9 @@ var Cell = exports.Cell = {
     }
     if (contentRender) {
       var compConf = _vXETable.default.renderer.get(contentRender.name);
-      if (compConf && compConf.renderExpand) {
-        return (0, _vn.getSlotVNs)(compConf.renderExpand.call($table, h, contentRender, params));
+      var rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
+      if (rtExpand) {
+        return (0, _vn.getSlotVNs)(rtExpand.call($table, h, contentRender, params));
       }
     }
     return [];
@@ -234512,12 +234835,13 @@ var Cell = exports.Cell = {
       editRender = column.editRender,
       formatter = column.formatter;
     var compConf = _vXETable.default.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 (0, _vn.getSlotVNs)(compConf.renderEdit.call($table, h, editRender, Object.assign({
+      if (rtEdit) {
+        return (0, _vn.getSlotVNs)(rtEdit.call($table, h, editRender, Object.assign({
           $type: 'edit'
         }, params)));
       }
@@ -234820,8 +235144,11 @@ var ColumnInfo = exports.ColumnInfo = /*#__PURE__*/function () {
       renderSortNumber: 0,
       // 用于记录自定义列顺序
 
+      renderFixed: '',
+      renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
+      renderResizeWidth: 0,
       resizeWidth: 0,
       renderLeft: 0,
       renderArgs: [],
@@ -235626,16 +235953,16 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -236173,6 +236500,21 @@ var Methods = {
       return _this6.recalculate();
     });
   },
+  /**
+   * 修改行数据
+   */
+  setRow: function setRow(rows, record) {
+    if (record) {
+      var rest = rows;
+      if (!_xeUtils.default.isArray(rows)) {
+        rest = [rows];
+      }
+      rest.forEach(function (item) {
+        return Object.assign(item, record);
+      });
+    }
+    return this.$nextTick();
+  },
   /**
    * 局部加载行数据并恢复到初始状态
    * 对于行数据需要局部更改的场景中可能会用到
@@ -236778,6 +237120,72 @@ var Methods = {
     }
     return this.$nextTick();
   },
+  getCellElement: function getCellElement(row, fieldOrColumn) {
+    var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var $refs = this.$refs;
+    var rowid = (0, _util.getRowid)(this, row);
+    var bodyElem = null;
+    if (column) {
+      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
+    }
+    if (bodyElem && bodyElem.$el) {
+      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
+    }
+    return null;
+  },
+  getCellLabel: function getCellLabel(row, fieldOrColumn) {
+    var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var formatter = column.formatter;
+    var cellValue = _utils.default.getCellValue(row, column);
+    var cellLabel = cellValue;
+    if (formatter) {
+      var rest, formatData;
+      var fullAllDataRowMap = this.fullAllDataRowMap;
+      var colid = column.id;
+      var cacheFormat = fullAllDataRowMap.has(row);
+      if (cacheFormat) {
+        rest = fullAllDataRowMap.get(row);
+        formatData = rest.formatData;
+        if (!formatData) {
+          formatData = fullAllDataRowMap.get(row).formatData = {};
+        }
+        if (rest && formatData[colid]) {
+          if (formatData[colid].value === cellValue) {
+            return formatData[colid].label;
+          }
+        }
+      }
+      var formatParams = {
+        cellValue: cellValue,
+        row: row,
+        rowIndex: this.getRowIndex(row),
+        column: column,
+        columnIndex: this.getColumnIndex(column)
+      };
+      if (_xeUtils.default.isString(formatter)) {
+        var gFormatOpts = _formats.formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
+      } else if (_xeUtils.default.isArray(formatter)) {
+        var _gFormatOpts = _formats.formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+      } else {
+        cellLabel = formatter(formatParams);
+      }
+      if (formatData) {
+        formatData[colid] = {
+          value: cellValue,
+          label: cellLabel
+        };
+      }
+    }
+    return cellLabel;
+  },
   /**
    * 检查是否为临时行数据
    * @param {Row} row 行对象
@@ -236834,6 +237242,13 @@ var Methods = {
     var columns = this.visibleColumn;
     return _xeUtils.default.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
   },
+  /**
+   * 根据列获取列的唯一主键
+   */
+  getColid: function getColid(fieldOrColumn) {
+    var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    return column ? column.id : null;
+  },
   /**
    * 根据列的唯一主键获取列
    * @param {String} colid 列主键
@@ -237016,8 +237431,8 @@ var Methods = {
               filterRender = column.filterRender,
               field = column.field;
             var compConf = filterRender ? _vXETable.default.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.default.getCellValue(row, column);
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -237433,6 +237848,7 @@ var Methods = {
       })) {
         column.visible = column.defaultVisible;
       }
+      column.renderResizeWidth = column.renderWidth;
     });
     if (opts.resizable) {
       this.saveCustomResizable(true);
@@ -237456,8 +237872,7 @@ var Methods = {
         this.clearCopyCellArea();
       }
     }
-    this.saveCustomVisible();
-    this.saveCustomSort();
+    this.saveCustomStore();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -237468,13 +237883,19 @@ var Methods = {
     var id = this.id,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
-    var storage = customOpts.storage;
+    var storage = customOpts.storage,
+      restoreStore = customOpts.restoreStore;
     var isAllStorage = storage === true;
     var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
     var isCustomResizable = isAllStorage || storageOpts.resizable;
     var isCustomVisible = isAllStorage || storageOpts.visible;
     var isCustomFixed = isAllStorage || storageOpts.fixed;
     var isCustomSort = isAllStorage || storageOpts.sort;
+    if (storage && id && restoreStore) {
+      restoreStore({
+        id: id
+      });
+    }
     if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       var customMap = {};
       if (!id) {
@@ -237664,6 +238085,71 @@ var Methods = {
       localStorage.setItem(visibleStorageKey, _xeUtils.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) {
+      (0, _log.errLog)('vxe.error.reqProp', ['id']);
+      return storeData;
+    }
+    _xeUtils.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,
@@ -237715,11 +238201,9 @@ var Methods = {
         columnWidthStorage = _xeUtils.default.isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
         // 排序只支持一级
         collectColumn.forEach(function (column) {
-          if (column.sortNumber !== column.renderSortNumber) {
-            var colKey = column.getKey();
-            if (colKey) {
-              columnWidthStorage[colKey] = column.renderSortNumber;
-            }
+          var colKey = column.getKey();
+          if (colKey) {
+            columnWidthStorage[colKey] = column.renderSortNumber;
           }
         });
       }
@@ -238624,7 +239108,7 @@ var Methods = {
         var selected = editStore.selected,
           actived = editStore.actived;
         var keyCode = evnt.keyCode;
-        var isBack = keyCode === 8;
+        var hasBackspaceKey = keyCode === 8;
         var isTab = keyCode === 9;
         var isEnter = keyCode === 13;
         var isEsc = keyCode === 27;
@@ -238751,12 +239235,12 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (treeConfig || (0, _utils.isEnableConf)(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod,
               backMethod = keyboardOpts.backMethod;
             // 如果是删除键
-            if (keyboardOpts.isDel && (selected.row || selected.column)) {
+            if (keyboardOpts.isDel && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
               var delPaqrams = {
                 row: selected.row,
                 rowIndex: _this29.getRowIndex(selected.row),
@@ -238769,7 +239253,7 @@ var Methods = {
               } else {
                 setCellValue(selected.row, selected.column, null);
               }
-              if (isBack) {
+              if (hasBackspaceKey) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -238786,7 +239270,7 @@ var Methods = {
                 _this29.updateFooter();
               }
               _this29.emitEvent('cell-delete-value', delPaqrams, evnt);
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = _xeUtils.default.findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
@@ -239395,8 +239879,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 = !_xeUtils.default.get(row, checkField);
@@ -239412,8 +239900,13 @@ 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;
+    }
+    evnt.stopPropagation();
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       var checkboxRecords = this.getCheckboxRecords();
       if (checkboxRecords.length) {
@@ -239858,23 +240351,36 @@ 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;
+    }
+    if (evnt) {
+      evnt.stopPropagation();
+    }
+    this.handleCheckAllEvent(evnt, value);
   },
   /**
    * 多选，切换所有行的选中状态
    */
   toggleAllCheckboxRow: function toggleAllCheckboxRow() {
-    this.triggerCheckAllEvent(null, !this.isAllSelected);
+    this.handleCheckAllEvent(null, !this.isAllSelected);
     return this.$nextTick();
   },
   /**
@@ -239942,6 +240448,11 @@ var Methods = {
     var oldValue = this.selectRadioRow,
       radioOpts = this.radioOpts;
     var row = params.row;
+    var trigger = radioOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
@@ -240621,7 +241132,12 @@ 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;
+    }
+    evnt.stopPropagation();
     var rowid = (0, _util.getRowid)(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isRowExpandByRow(row);
@@ -240947,7 +241463,12 @@ 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;
+    }
+    evnt.stopPropagation();
     var rowid = (0, _util.getRowid)(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
@@ -241657,7 +242178,7 @@ var Methods = {
         var type = 'change';
         if (_this57.hasCellRules) {
           if (_this57.hasCellRules(type, row, column)) {
-            var cell = _this57.getCell(row, column);
+            var cell = _this57.getCellElement(row, column);
             if (cell) {
               return _this57.validCellRules(type, row, column, cellValue).then(function () {
                 if (customVal && validStore.visible) {
@@ -241818,63 +242339,12 @@ var Methods = {
   /*************************
    * Publish methods
    *************************/
+  /**
+   * 已废弃，被 getCellElement 替换
+   * @deprecated
+   */
   getCell: function getCell(row, column) {
-    var $refs = this.$refs;
-    var rowid = (0, _util.getRowid)(this, row);
-    var bodyElem = null;
-    if (column) {
-      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
-    }
-    return null;
-  },
-  getCellLabel: function getCellLabel(row, column) {
-    var formatter = column.formatter;
-    var cellValue = _utils.default.getCellValue(row, column);
-    var cellLabel = cellValue;
-    if (formatter) {
-      var rest, formatData;
-      var fullAllDataRowMap = this.fullAllDataRowMap;
-      var colid = column.id;
-      var cacheFormat = fullAllDataRowMap.has(row);
-      if (cacheFormat) {
-        rest = fullAllDataRowMap.get(row);
-        formatData = rest.formatData;
-        if (!formatData) {
-          formatData = fullAllDataRowMap.get(row).formatData = {};
-        }
-        if (rest && formatData[colid]) {
-          if (formatData[colid].value === cellValue) {
-            return formatData[colid].label;
-          }
-        }
-      }
-      var formatParams = {
-        cellValue: cellValue,
-        row: row,
-        rowIndex: this.getRowIndex(row),
-        column: column,
-        columnIndex: this.getColumnIndex(column)
-      };
-      if (_xeUtils.default.isString(formatter)) {
-        var gFormatOpts = _formats.formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
-      } else if (_xeUtils.default.isArray(formatter)) {
-        var _gFormatOpts = _formats.formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
-      } else {
-        cellLabel = formatter(formatParams);
-      }
-      if (formatData) {
-        formatData[colid] = {
-          value: cellValue,
-          label: cellLabel
-        };
-      }
-    }
-    return cellLabel;
+    return this.getCellElement(row, column);
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
     var _this64 = this;
@@ -241900,7 +242370,7 @@ var Methods = {
 };
 
 // Module methods
-var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
+var funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
     if (false) {}
@@ -242409,7 +242879,10 @@ var _default2 = exports["default"] = {
         activeBtn: false,
         activeWrapper: false,
         visible: false,
-        maxHeight: 0
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
       },
       // 当前选中的筛选列
       filterStore: {
@@ -243617,12 +244090,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeTextarea = exports.Textarea = void 0;
 var _textarea = _interopRequireDefault(__webpack_require__(30457));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeTextarea = exports.VxeTextarea = Object.assign(_textarea.default, {
   install: function install(Vue) {
     Vue.component(_textarea.default.name, _textarea.default);
   }
 });
+_vXETable.default.component(_textarea.default);
 var Textarea = exports.Textarea = VxeTextarea;
 var _default = exports["default"] = VxeTextarea;
 
@@ -243925,12 +244400,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = exports.VxeToolbar = exports.Toolbar = void 0;
 var _toolbar = _interopRequireDefault(__webpack_require__(36801));
+var _vXETable = _interopRequireDefault(__webpack_require__(97080));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var VxeToolbar = exports.VxeToolbar = Object.assign(_toolbar.default, {
   install: function install(Vue) {
     Vue.component(_toolbar.default.name, _toolbar.default);
   }
 });
+_vXETable.default.component(_toolbar.default);
 var Toolbar = exports.Toolbar = VxeToolbar;
 var _default = exports["default"] = VxeToolbar;
 
@@ -244793,7 +245270,7 @@ exports.warnLog = void 0;
 var _conf = _interopRequireDefault(__webpack_require__(56895));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.7", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8", "] ", _conf.default.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -245074,6 +245551,7 @@ var VxeTooltip = exports.VxeTooltip = Object.assign(_tooltip.default, {
     Vue.component(_tooltip.default.name, _tooltip.default);
   }
 });
+_vXETable.default.component(_tooltip.default);
 var Tooltip = exports.Tooltip = VxeTooltip;
 var _default = exports["default"] = VxeTooltip;
 
@@ -245467,17 +245945,25 @@ var _exportNames = {
   config: true,
   setIcon: true,
   globalStore: true,
-  VXETable: true,
-  VxeUI: true
+  getComponent: true,
+  component: true,
+  version: true,
+  tableVersion: true,
+  VxeUI: true,
+  VXETable: true
 };
 exports.VxeUI = exports.VXETable = void 0;
 exports._t = _t;
-exports.setConfig = exports.globalStore = exports.globalConfs = exports["default"] = exports.config = void 0;
+exports.component = component;
+exports["default"] = exports.config = void 0;
+exports.getComponent = getComponent;
+exports.setConfig = exports.globalStore = exports.globalConfs = void 0;
 exports.setIcon = setIcon;
 exports.setup = void 0;
 exports.t = t;
+exports.tableVersion = void 0;
 exports.use = use;
-exports.v = void 0;
+exports.version = exports.v = void 0;
 var _xeUtils = _interopRequireDefault(__webpack_require__(78982));
 var _domZindex = _interopRequireDefault(__webpack_require__(40092));
 var _conf = _interopRequireDefault(__webpack_require__(56895));
@@ -245543,6 +246029,17 @@ Object.keys(_formats).forEach(function (key) {
 });
 var _validators = __webpack_require__(70514);
 var _theme = __webpack_require__(21200);
+Object.keys(_theme).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _theme[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _theme[key];
+    }
+  });
+});
 var _utils = __webpack_require__(87794);
 var _log = __webpack_require__(45561);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -245557,11 +246054,11 @@ function use(Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   if (Plugin && Plugin.install) {
     if (installedPlugins.indexOf(Plugin) === -1) {
-      Plugin.install(VXETable, options);
+      Plugin.install(VxeUI, options);
       installedPlugins.push(Plugin);
     }
   }
-  return VXETable;
+  return VxeUI;
 }
 
 /**
@@ -245571,18 +246068,19 @@ function reg(key) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   // 检测安装顺序是否正确
   if (false) {}
-  VXETable["_".concat(key)] = 1;
-}
-function getExportOrImpotType(types, flag) {
-  var rest = [];
-  _xeUtils.default.objectEach(types, function (val, type) {
-    if (val === 0 || val === flag) {
-      rest.push(type);
-    }
-  });
-  return rest;
+  VxeUI["_".concat(key)] = 1;
 }
 
+// function getExportOrImpotType (types, flag) {
+//   const rest = []
+//   XEUtils.objectEach(types, (val, type) => {
+//     if (val === 0 || val === flag) {
+//       rest.push(type)
+//     }
+//   })
+//   return rest
+// }
+
 /**
  * 全局参数设置
  */
@@ -245596,7 +246094,7 @@ var setConfig = exports.setConfig = function setConfig(options) {
     }
     _xeUtils.default.merge(_conf.default, options);
   }
-  return VXETable;
+  return VxeUI;
 };
 var VXETableConfig = /*#__PURE__*/function () {
   function VXETableConfig() {
@@ -245627,7 +246125,7 @@ var VXETableConfig = /*#__PURE__*/function () {
   }, {
     key: "exportTypes",
     get: function get() {
-      return getExportOrImpotType(_conf.default.export.types, 1);
+      return _xeUtils.default.keys(_conf.default.table.exportConfig._typeMaps);
     }
 
     /**
@@ -245636,7 +246134,7 @@ var VXETableConfig = /*#__PURE__*/function () {
   }, {
     key: "importTypes",
     get: function get() {
-      return getExportOrImpotType(_conf.default.export.types, 2);
+      return _xeUtils.default.keys(_conf.default.table.importConfig._typeMaps);
     }
   }]);
 }(); // 已废弃
@@ -245670,12 +246168,24 @@ function setIcon(options) {
   if (options) {
     Object.assign(_conf.default.icon, options);
   }
-  return VXETable;
+  return VxeUI;
 }
 var globalStore = exports.globalStore = {};
-var VXETable = exports.VXETable = {
+var components = {};
+function getComponent(name) {
+  return components[name] || null;
+}
+function component(comp) {
+  if (comp && comp.name) {
+    components[comp.name] = comp;
+  }
+}
+var version = exports.version = "3.8.8";
+var tableVersion = exports.tableVersion = version;
+var VxeUI = exports.VxeUI = {
   v: v,
-  version: "3.8.7",
+  version: version,
+  tableVersion: tableVersion,
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -245689,14 +246199,18 @@ var VXETable = exports.VXETable = {
   validators: _validators.validators,
   t: t,
   _t: _t,
+  setTheme: _theme.setTheme,
+  getTheme: _theme.getTheme,
+  getComponent: getComponent,
+  component: component,
   // 已废弃
   config: config,
   setup: setup,
   globalConfs: globalConfs
 };
-var VxeUI = exports.VxeUI = VXETable;
+var VXETable = exports.VXETable = VxeUI;
 (0, _theme.setTheme)('light');
-var _default = exports["default"] = VXETable;
+var _default = exports["default"] = VxeUI;
 
 /***/ }),
 
@@ -245843,8 +246357,12 @@ var _default = exports["default"] = {
     //   visibleMethod () {}
     // },
     customConfig: {
+      allowVisible: true,
+      allowResizable: true,
       allowFixed: true,
-      showFooter: true
+      allowSort: true,
+      showFooter: true,
+      placement: 'topRight'
       //  storage: false,
       //  checkMethod () {}
     },
@@ -245880,7 +246398,12 @@ var _default = exports["default"] = {
       showAsterisk: true
     },
     importConfig: {
-      _typeMaps: {},
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
       modes: ['insert', 'covering']
     },
     exportConfig: {
@@ -245946,11 +246469,12 @@ var _default = exports["default"] = {
     TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
-    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
     TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
-    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
-    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
     TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
+    TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
     // button
     BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
     BUTTON_LOADING: iconPrefix + 'spinner roll',
@@ -245994,9 +246518,9 @@ var _default = exports["default"] = {
     TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
     TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
     TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
-    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED: iconPrefix + 'fixed-left-fill',
+    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
     TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
-    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED: iconPrefix + 'fixed-right-fill',
+    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill',
     // form
     FORM_PREFIX: iconPrefix + 'question-circle-fill',
     FORM_SUFFIX: iconPrefix + 'question-circle-fill',
@@ -246047,6 +246571,7 @@ var _default = exports["default"] = {
     leaveDelay: 300
   },
   pager: {
+    pageSizePlacement: 'top'
     // size: null,
     // autoHidden: false,
     // perfect: true,
@@ -247446,6 +247971,7 @@ var _default = exports["default"] = Store;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
+exports.getTheme = getTheme;
 exports.setTheme = setTheme;
 var _conf = _interopRequireDefault(__webpack_require__(56895));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -247454,6 +247980,7 @@ function setTheme(name) {
   if (!theme || theme === 'default') {
     theme = 'light';
   }
+  _conf.default.theme = theme;
   if (typeof document !== 'undefined') {
     var documentElement = document.documentElement;
     if (documentElement) {
@@ -247461,6 +247988,9 @@ function setTheme(name) {
     }
   }
 }
+function getTheme() {
+  return _conf.default.theme;
+}
 
 /***/ }),
 
@@ -247754,7 +248284,7 @@ var _default = exports["default"] = {
               });
             };
             var posAndFinish = function posAndFinish() {
-              firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
+              firstErrParams.cell = _this2.getCellElement(firstErrParams.row, firstErrParams.column);
               _dom.default.scrollToView(firstErrParams.cell);
               _this2.handleValidError(firstErrParams).then(finish);
             };