vxe-table 4.7.3 → 4.7.5

package/lib/index.umd.js

@@ -1690,25 +1690,25 @@ __webpack_require__.d(__webpack_exports__, {
   VxeUI: function() { return /* reexport */ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI; },
   _t: function() { return /* reexport */ _t; },
   clipboard: function() { return /* reexport */ clipboard; },
-  commands: function() { return /* reexport */ ui_commands; },
+  commands: function() { return /* reexport */ commands; },
   config: function() { return /* reexport */ config; },
   "default": function() { return /* binding */ entry_lib; },
   drawer: function() { return /* reexport */ drawer; },
-  formats: function() { return /* reexport */ ui_formats; },
-  getConfig: function() { return /* reexport */ ui_getConfig; },
-  getI18n: function() { return /* reexport */ ui_getI18n; },
-  getIcon: function() { return /* reexport */ ui_getIcon; },
+  formats: function() { return /* reexport */ formats; },
+  getConfig: function() { return /* reexport */ getConfig; },
+  getI18n: function() { return /* reexport */ getI18n; },
+  getIcon: function() { return /* reexport */ getIcon; },
   getTheme: function() { return /* reexport */ getTheme; },
-  globalEvents: function() { return /* reexport */ ui_globalEvents; },
-  globalResize: function() { return /* reexport */ ui_globalResize; },
-  hooks: function() { return /* reexport */ ui_hooks; },
+  globalEvents: function() { return /* reexport */ globalEvents; },
+  globalResize: function() { return /* reexport */ globalResize; },
+  hooks: function() { return /* reexport */ hooks; },
   install: function() { return /* reexport */ install; },
-  interceptor: function() { return /* reexport */ ui_interceptor; },
-  log: function() { return /* reexport */ ui_log; },
-  menus: function() { return /* reexport */ ui_menus; },
+  interceptor: function() { return /* reexport */ interceptor; },
+  log: function() { return /* reexport */ log; },
+  menus: function() { return /* reexport */ menus; },
   modal: function() { return /* reexport */ modal; },
   readFile: function() { return /* reexport */ readFile; },
-  renderer: function() { return /* reexport */ ui_renderer; },
+  renderer: function() { return /* reexport */ renderer; },
   saveFile: function() { return /* reexport */ saveFile; },
   setConfig: function() { return /* reexport */ setConfig; },
   setI18n: function() { return /* reexport */ setI18n; },
@@ -1718,7 +1718,7 @@ __webpack_require__.d(__webpack_exports__, {
   setup: function() { return /* reexport */ setup; },
   t: function() { return /* reexport */ t; },
   use: function() { return /* reexport */ use; },
-  validators: function() { return /* reexport */ ui_validators; }
+  validators: function() { return /* reexport */ validators; }
 });
 
 // NAMESPACE OBJECT: ./packages/components.ts
@@ -1739,24 +1739,24 @@ __webpack_require__.d(components_namespaceObject, {
   VxeUI: function() { return external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI; },
   _t: function() { return _t; },
   clipboard: function() { return clipboard; },
-  commands: function() { return ui_commands; },
+  commands: function() { return commands; },
   config: function() { return config; },
   drawer: function() { return drawer; },
-  formats: function() { return ui_formats; },
-  getConfig: function() { return ui_getConfig; },
-  getI18n: function() { return ui_getI18n; },
-  getIcon: function() { return ui_getIcon; },
+  formats: function() { return formats; },
+  getConfig: function() { return getConfig; },
+  getI18n: function() { return getI18n; },
+  getIcon: function() { return getIcon; },
   getTheme: function() { return getTheme; },
-  globalEvents: function() { return ui_globalEvents; },
-  globalResize: function() { return ui_globalResize; },
-  hooks: function() { return ui_hooks; },
+  globalEvents: function() { return globalEvents; },
+  globalResize: function() { return globalResize; },
+  hooks: function() { return hooks; },
   install: function() { return install; },
-  interceptor: function() { return ui_interceptor; },
-  log: function() { return ui_log; },
-  menus: function() { return ui_menus; },
+  interceptor: function() { return interceptor; },
+  log: function() { return log; },
+  menus: function() { return menus; },
   modal: function() { return modal; },
   readFile: function() { return readFile; },
-  renderer: function() { return ui_renderer; },
+  renderer: function() { return renderer; },
   saveFile: function() { return saveFile; },
   setConfig: function() { return setConfig; },
   setI18n: function() { return setI18n; },
@@ -1766,7 +1766,7 @@ __webpack_require__.d(components_namespaceObject, {
   setup: function() { return setup; },
   t: function() { return t; },
   use: function() { return use; },
-  validators: function() { return ui_validators; }
+  validators: function() { return validators; }
 });
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -1789,78 +1789,360 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"root":"VxeUI","commonjs":"vxe-pc-ui","commonjs2":"vxe-pc-ui","amd":"vxe-pc-ui"}
 var external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_ = __webpack_require__(2847);
 var external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_default = /*#__PURE__*/__webpack_require__.n(external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_);
-// EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
-var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(9274);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
-var es_array_push = __webpack_require__(4114);
-// EXTERNAL MODULE: external {"root":"XEUtils","commonjs":"xe-utils","commonjs2":"xe-utils","amd":"xe-utils"}
-var external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_ = __webpack_require__(8871);
-var external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default = /*#__PURE__*/__webpack_require__.n(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_);
-;// CONCATENATED MODULE: ./node_modules/dom-zindex/es/index.esm.js
-var storeEl = null;
-var storeId = 'z-index-manage';
-var storeMainKey = 'm';
-var storeSubKey = 's';
-var storeData = {
-  m: 1000,
-  s: 1000
-};
-function isDocument() {
-  return typeof document !== 'undefined';
-}
-function getDomMaxZIndex() {
-  var max = 0;
-  if (isDocument()) {
-    var allElem = document.body.getElementsByTagName('*');
-    for (var i = 0; i < allElem.length; i++) {
-      var elem = allElem[i];
-      if (elem && elem.style && elem.nodeType === 1) {
-        var zIndex = elem.style.zIndex;
-        if (zIndex && /^\d+$/.test(zIndex)) {
-          max = Math.max(max, Number(zIndex));
-        }
-      }
+;// CONCATENATED MODULE: ./packages/ui/index.ts
+
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.version = "4.7.5";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.5";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig({
+  emptyCell: '　',
+  table: {
+    fit: true,
+    showHeader: true,
+    animat: true,
+    delayHover: 250,
+    autoResize: true,
+    minHeight: 144,
+    // keepSource: false,
+    // showOverflow: null,
+    // showHeaderOverflow: null,
+    // showFooterOverflow: null,
+    // resizeInterval: 500,
+    // size: null,
+    // zIndex: null,
+    // stripe: false,
+    // border: false,
+    // round: false,
+    // emptyText: '暂无数据',
+    // emptyRender: {
+    //   name: ''
+    // },
+    // rowConfig: {
+    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
+    // },
+    resizeConfig: {
+      refreshDelay: 250
+    },
+    radioConfig: {
+      // trigger: 'default'
+      strict: true
+    },
+    checkboxConfig: {
+      // trigger: 'default',
+      strict: true
+    },
+    tooltipConfig: {
+      enterable: true
+    },
+    validConfig: {
+      showMessage: true,
+      autoClear: true,
+      autoPos: true,
+      message: 'inline',
+      msgMode: 'single'
+    },
+    columnConfig: {
+      maxFixedSize: 4
+    },
+    // menuConfig: {
+    //   visibleMethod () {}
+    // },
+    customConfig: {
+      allowFixed: true,
+      allowSort: true,
+      showFooter: true
+      //  storage: false,
+      //  checkMethod () {}
+    },
+    sortConfig: {
+      // remote: false,
+      // trigger: 'default',
+      // orders: ['asc', 'desc', null],
+      // sortMethod: null,
+      showIcon: true,
+      iconLayout: 'vertical'
+    },
+    filterConfig: {
+      // remote: false,
+      // filterMethod: null,
+      showIcon: true
+    },
+    treeConfig: {
+      rowField: 'id',
+      parentField: 'parentId',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
+      indent: 20,
+      showIcon: true
+    },
+    expandConfig: {
+      // trigger: 'default',
+      showIcon: true
+    },
+    editConfig: {
+      // mode: 'cell',
+      showIcon: true,
+      showAsterisk: true
+    },
+    importConfig: {
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
+      modes: ['insert', 'covering']
+    },
+    exportConfig: {
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
+      modes: ['current', 'selected']
+    },
+    printConfig: {
+      modes: ['current', 'selected']
+    },
+    mouseConfig: {
+      extension: true
+    },
+    keyboardConfig: {
+      isEsc: true
+    },
+    areaConfig: {
+      autoClear: true,
+      selectCellByHeader: true
+    },
+    clipConfig: {
+      isCopy: true,
+      isCut: true,
+      isPaste: true
+    },
+    fnrConfig: {
+      isFind: true,
+      isReplace: true
+    },
+    scrollX: {
+      // enabled: false,
+      gt: 60
+      // oSize: 0
+    },
+    scrollY: {
+      // enabled: false,
+      gt: 100
+      // oSize: 0
     }
-  }
-  return max;
-}
-function getDom() {
-  if (!storeEl) {
-    if (isDocument()) {
-      storeEl = document.getElementById(storeId);
-      if (!storeEl) {
-        storeEl = document.createElement('div');
-        storeEl.id = storeId;
-        storeEl.style.display = 'none';
-        document.body.appendChild(storeEl);
-        setCurrent(storeData.m);
-        setSubCurrent(storeData.s);
+  },
+  // export: {
+  //   types: {}
+  // },
+  grid: {
+    // size: null,
+    // zoomConfig: {
+    //   escRestore: true
+    // },
+    formConfig: {
+      enabled: true
+    },
+    pagerConfig: {
+      enabled: true
+      // perfect: false
+    },
+    toolbarConfig: {
+      enabled: true
+      // perfect: false
+    },
+    proxyConfig: {
+      enabled: true,
+      autoLoad: true,
+      message: true,
+      props: {
+        list: null,
+        result: 'result',
+        total: 'page.total',
+        message: 'message'
       }
+      // beforeItem: null,
+      // beforeColumn: null,
+      // beforeQuery: null,
+      // afterQuery: null,
+      // beforeDelete: null,
+      // afterDelete: null,
+      // beforeSave: null,
+      // afterSave: null
     }
+  },
+  toolbar: {
+    // size: null,
+    // import: {
+    //   mode: 'covering'
+    // },
+    // export: {
+    //   types: ['csv', 'html', 'xml', 'txt']
+    // },
+    // buttons: []
   }
-  return storeEl;
-}
-function createSetHandle(key) {
-  return function (value) {
-    if (value) {
-      value = Number(value);
-      storeData[key] = value;
-      var doc = getDom();
-      if (doc) {
-        if (doc.dataset) {
-          doc.dataset[key] = value + '';
-        } else {
-          doc.setAttribute('data-' + key, value + '');
-        }
-      }
-    }
-    return storeData[key];
-  };
-}
-var setCurrent = createSetHandle(storeMainKey);
-function createGetHandle(key, nextMethod) {
-  return function getCurrent(currZindex) {
-    var zIndex;
+});
+const iconPrefix = 'vxe-icon-';
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setIcon({
+  // table
+  TABLE_SORT_ASC: iconPrefix + 'caret-up',
+  TABLE_SORT_DESC: iconPrefix + 'caret-down',
+  TABLE_FILTER_NONE: iconPrefix + 'funnel',
+  TABLE_FILTER_MATCH: iconPrefix + 'funnel',
+  TABLE_EDIT: iconPrefix + 'edit',
+  TABLE_TITLE_PREFIX: iconPrefix + 'question-circle-fill',
+  TABLE_TITLE_SUFFIX: iconPrefix + 'question-circle-fill',
+  TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
+  TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
+  TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
+  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-fill',
+  TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
+  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',
+  // toolbar
+  TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
+  TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
+  TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
+  TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
+  TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
+  TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+  TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+  TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
+  TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
+  TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
+  TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
+  TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
+});
+const setTheme = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setTheme;
+const getTheme = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getTheme;
+const setConfig = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig;
+const getConfig = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getConfig;
+const setIcon = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setIcon;
+const getIcon = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getIcon;
+const setLanguage = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setLanguage;
+const setI18n = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setI18n;
+const getI18n = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getI18n;
+const globalEvents = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.globalEvents;
+const globalResize = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.globalResize;
+const renderer = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.renderer;
+const validators = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.validators;
+const menus = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.menus;
+const formats = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.formats;
+const commands = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.commands;
+const interceptor = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.interceptor;
+const clipboard = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.clipboard;
+const log = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.log;
+const hooks = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.hooks;
+const use = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.use;
+/**
+ * 已废弃
+ * @deprecated
+ */
+const setup = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setup;
+/**
+ * 已废弃
+ * @deprecated
+ */
+const config = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.config;
+/**
+ * 已废弃
+ * @deprecated
+ */
+const t = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.t;
+/**
+ * 已废弃
+ * @deprecated
+ */
+const _t = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI._t;
+/**
+ * 已废弃，兼容老版本
+ * @deprecated
+ */
+const VXETable = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
+const saveFile = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.readFile;
+const readFile = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.readFile;
+
+/* harmony default export */ var ui = ((/* unused pure expression or super */ null && (VxeUI)));
+// EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
+var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(9274);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
+var es_array_push = __webpack_require__(4114);
+// EXTERNAL MODULE: external {"root":"XEUtils","commonjs":"xe-utils","commonjs2":"xe-utils","amd":"xe-utils"}
+var external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_ = __webpack_require__(8871);
+var external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default = /*#__PURE__*/__webpack_require__.n(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_);
+;// CONCATENATED MODULE: ./node_modules/dom-zindex/es/index.esm.js
+var storeEl = null;
+var storeId = 'z-index-manage';
+var storeMainKey = 'm';
+var storeSubKey = 's';
+var storeData = {
+  m: 1000,
+  s: 1000
+};
+function isDocument() {
+  return typeof document !== 'undefined';
+}
+function getDomMaxZIndex() {
+  var max = 0;
+  if (isDocument()) {
+    var allElem = document.body.getElementsByTagName('*');
+    for (var i = 0; i < allElem.length; i++) {
+      var elem = allElem[i];
+      if (elem && elem.style && elem.nodeType === 1) {
+        var zIndex = elem.style.zIndex;
+        if (zIndex && /^\d+$/.test(zIndex)) {
+          max = Math.max(max, Number(zIndex));
+        }
+      }
+    }
+  }
+  return max;
+}
+function getDom() {
+  if (!storeEl) {
+    if (isDocument()) {
+      storeEl = document.getElementById(storeId);
+      if (!storeEl) {
+        storeEl = document.createElement('div');
+        storeEl.id = storeId;
+        storeEl.style.display = 'none';
+        document.body.appendChild(storeEl);
+        setCurrent(storeData.m);
+        setSubCurrent(storeData.s);
+      }
+    }
+  }
+  return storeEl;
+}
+function createSetHandle(key) {
+  return function (value) {
+    if (value) {
+      value = Number(value);
+      storeData[key] = value;
+      var doc = getDom();
+      if (doc) {
+        if (doc.dataset) {
+          doc.dataset[key] = value + '';
+        } else {
+          doc.setAttribute('data-' + key, value + '');
+        }
+      }
+    }
+    return storeData[key];
+  };
+}
+var setCurrent = createSetHandle(storeMainKey);
+function createGetHandle(key, nextMethod) {
+  return function getCurrent(currZindex) {
+    var zIndex;
     var doc = getDom();
     if (doc) {
       var domVal = doc.dataset ? doc.dataset[key] : doc.getAttribute('data-' + key);
@@ -1957,9 +2239,9 @@ function eqEmptyValue(cellValue) {
 
 
 const {
-  getI18n,
-  formats,
-  log
+  getI18n: columnInfo_getI18n,
+  formats: columnInfo_formats,
+  log: columnInfo_log
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 class ColumnInfo {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -1975,16 +2257,16 @@ class ColumnInfo {
     if (true) {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
       if (_vm.type && types.indexOf(_vm.type) === -1) {
-        log.warn('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        columnInfo_log.warn('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
       }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.cellRender) || _vm.cellRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.cellRender)) {
-        log.warn('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        columnInfo_log.warn('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
       }
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.editRender) || _vm.editRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(_vm.editRender)) {
-        log.warn('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        columnInfo_log.warn('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
       }
       if (_vm.cellRender && _vm.editRender) {
-        log.warn('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
+        columnInfo_log.warn('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
       }
       if (_vm.type === 'expand') {
         const {
@@ -1998,19 +2280,19 @@ class ColumnInfo {
         } = $xeTable.getComputeMaps();
         const treeOpts = computeTreeOpts.value;
         if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-          log.err('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+          columnInfo_log.err('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
         }
       }
       if (formatter) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-          const gFormatOpts = formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
+          const gFormatOpts = columnInfo_formats.get(formatter) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter];
           if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.cellFormatMethod)) {
-            log.err('vxe.error.notFormats', [formatter]);
+            columnInfo_log.err('vxe.error.notFormats', [formatter]);
           }
         } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-          const gFormatOpts = formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
+          const gFormatOpts = columnInfo_formats.get(formatter[0]) || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default())[formatter[0]];
           if (!gFormatOpts || !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(gFormatOpts.cellFormatMethod)) {
-            log.err('vxe.error.notFormats', [formatter[0]]);
+            columnInfo_log.err('vxe.error.notFormats', [formatter[0]]);
           }
         }
       }
@@ -2081,6 +2363,8 @@ class ColumnInfo {
       // 列排序
       sortNumber: 0,
       renderSortNumber: 0,
+      renderFixed: '',
+      renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -2108,7 +2392,7 @@ class ColumnInfo {
     }
   }
   getTitle() {
-    return getFuncText(this.title || (this.type === 'seq' ? getI18n('vxe.table.seqTitle') : ''));
+    return getFuncText(this.title || (this.type === 'seq' ? columnInfo_getI18n('vxe.table.seqTitle') : ''));
   }
   getKey() {
     return this.field || (this.type ? `type=${this.type}` : null);
@@ -2793,8 +3077,8 @@ function getSlotVNs(vns) {
 
 const {
   getI18n: cell_getI18n,
-  getIcon,
-  renderer
+  getIcon: cell_getIcon,
+  renderer: cell_renderer
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 function renderTitlePrefixIcon(params) {
   const {
@@ -2803,7 +3087,7 @@ function renderTitlePrefixIcon(params) {
   } = params;
   const titlePrefix = column.titlePrefix || column.titleHelp;
   return titlePrefix ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-    class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
+    class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
     onMouseenter(evnt) {
       $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
     },
@@ -2819,7 +3103,7 @@ function renderTitleSuffixIcon(params) {
   } = params;
   const titleSuffix = column.titleSuffix;
   return titleSuffix ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-    class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
+    class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
     onMouseenter(evnt) {
       $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
     },
@@ -2903,7 +3187,7 @@ function getFooterContent(params) {
     return $table.callSlot(footerSlot, params);
   }
   if (renderOpts) {
-    const compConf = renderer.get(renderOpts.name);
+    const compConf = cell_renderer.get(renderOpts.name);
     if (compConf && compConf.renderFooter) {
       return getSlotVNs(compConf.renderFooter(renderOpts, params));
     }
@@ -3008,7 +3292,7 @@ const Cell = {
       return renderTitleContent(params, $table.callSlot(headerSlot, params));
     }
     if (renderOpts) {
-      const compConf = renderer.get(renderOpts.name);
+      const compConf = cell_renderer.get(renderOpts.name);
       if (compConf && compConf.renderHeader) {
         return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
       }
@@ -3036,7 +3320,7 @@ const Cell = {
     }
     if (renderOpts) {
       const funName = editRender ? 'renderCell' : 'renderDefault';
-      const compConf = renderer.get(renderOpts.name);
+      const compConf = cell_renderer.get(renderOpts.name);
       const compFn = compConf ? compConf[funName] : null;
       if (compFn) {
         return getSlotVNs(compFn(renderOpts, Object.assign({
@@ -3134,7 +3418,7 @@ const Cell = {
       class: 'vxe-tree--btn-wrapper',
       ...ons
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || getIcon().TABLE_TREE_LOADED : isAceived ? iconOpen || getIcon().TABLE_TREE_OPEN : iconClose || getIcon().TABLE_TREE_CLOSE]
+      class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
     })])] : null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
       class: 'vxe-tree-cell'
     }, cellVNodes)])];
@@ -3263,7 +3547,7 @@ const Cell = {
     const radioVNs = [];
     if (isVisible) {
       radioVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-        class: ['vxe-radio--icon', isChecked ? getIcon().TABLE_RADIO_CHECKED : getIcon().TABLE_RADIO_UNCHECKED]
+        class: ['vxe-radio--icon', isChecked ? cell_getIcon().TABLE_RADIO_CHECKED : cell_getIcon().TABLE_RADIO_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -3344,7 +3628,7 @@ const Cell = {
       title: cell_getI18n('vxe.table.allTitle'),
       ...ons
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
     })].concat(titleSlot || headerTitle ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: 'vxe-checkbox--label'
     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)] : []))]);
@@ -3421,7 +3705,7 @@ const Cell = {
     const checkVNs = [];
     if (isVisible) {
       checkVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-        class: ['vxe-checkbox--icon', indeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', indeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -3515,7 +3799,7 @@ const Cell = {
     const checkVNs = [];
     if (isVisible) {
       checkVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-        class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+        class: ['vxe-checkbox--icon', isIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }));
       if (defaultSlot || labelField) {
         checkVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -3592,7 +3876,7 @@ const Cell = {
         $table.triggerRowExpandEvent(evnt, params);
       }
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || getIcon().TABLE_EXPAND_LOADED : isAceived ? iconOpen || getIcon().TABLE_EXPAND_OPEN : iconClose || getIcon().TABLE_EXPAND_CLOSE]
+      class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
     })]) : null, defaultSlot || labelField ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: 'vxe-table--expand-label'
     }, defaultSlot ? $table.callSlot(defaultSlot, params) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, labelField)) : null];
@@ -3611,7 +3895,7 @@ const Cell = {
       return $table.callSlot(contentSlot, params);
     }
     if (contentRender) {
-      const compConf = renderer.get(contentRender.name);
+      const compConf = cell_renderer.get(contentRender.name);
       if (compConf && compConf.renderExpand) {
         return getSlotVNs(compConf.renderExpand(contentRender, params));
       }
@@ -3675,7 +3959,7 @@ const Cell = {
       return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-        class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
+        class: ['vxe-sort--asc-btn', iconAsc || cell_getIcon().TABLE_SORT_ASC, {
           'sort--active': order === 'asc'
         }],
         title: cell_getI18n('vxe.table.sortAsc'),
@@ -3684,7 +3968,7 @@ const Cell = {
           $table.triggerSortEvent(evnt, column, 'asc');
         }
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-        class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
+        class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
           'sort--active': order === 'desc'
         }],
         title: cell_getI18n('vxe.table.sortDesc'),
@@ -3728,7 +4012,7 @@ const Cell = {
         'is--active': filterStore.visible && filterStore.column === column
       }]
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-filter--btn', hasFilter ? iconMatch || getIcon().TABLE_FILTER_MATCH : iconNone || getIcon().TABLE_FILTER_NONE],
+      class: ['vxe-filter--btn', hasFilter ? iconMatch || cell_getIcon().TABLE_FILTER_MATCH : iconNone || cell_getIcon().TABLE_FILTER_NONE],
       title: cell_getI18n('vxe.table.filter'),
       onClick(evnt) {
         if ($table.triggerFilterEvent) {
@@ -3771,7 +4055,7 @@ const Cell = {
     return (isEnableConf(editConfig) ? [isRequired && editOpts.showAsterisk ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
       class: 'vxe-cell--required-icon'
     }) : null, isEnableConf(editRender) && editOpts.showIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-cell--edit-icon', editOpts.icon || getIcon().TABLE_EDIT]
+      class: ['vxe-cell--edit-icon', editOpts.icon || cell_getIcon().TABLE_EDIT]
     }) : null] : []).concat(Cell.renderDefaultHeader(params)).concat(sortable ? Cell.renderSortIcon(params) : []).concat(filters ? Cell.renderFilterIcon(params) : []);
   },
   // 行格编辑模式
@@ -3832,7 +4116,7 @@ const Cell = {
     } = column;
     const defaultSlot = slots ? slots.default : null;
     const editSlot = slots ? slots.edit : null;
-    const compConf = renderer.get(editRender.name);
+    const compConf = cell_renderer.get(editRender.name);
     if (isEdit) {
       if (editSlot) {
         return $table.callSlot(editSlot, params);
@@ -5855,7 +6139,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 ;// CONCATENATED MODULE: ./packages/table/src/props.ts
 
 const {
-  getConfig
+  getConfig: props_getConfig
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
 /* harmony default export */ var props = ({
   /** 基本属性 */
@@ -5867,81 +6151,81 @@ const {
   // 表格的最小高度
   minHeight: {
     type: [Number, String],
-    default: () => getConfig().table.minHeight
+    default: () => props_getConfig().table.minHeight
   },
   // 表格的最大高度
   maxHeight: [Number, String],
   // 已废弃，被 column-config.resizable 替换
   resizable: {
     type: Boolean,
-    default: () => getConfig().table.resizable
+    default: () => props_getConfig().table.resizable
   },
   // 是否带有斑马纹
   stripe: {
     type: Boolean,
-    default: () => getConfig().table.stripe
+    default: () => props_getConfig().table.stripe
   },
   // 是否带有边框
   border: {
     type: [Boolean, String],
-    default: () => getConfig().table.border
+    default: () => props_getConfig().table.border
   },
   // 是否圆角边框
   round: {
     type: Boolean,
-    default: () => getConfig().table.round
+    default: () => props_getConfig().table.round
   },
   // 表格的尺寸
   size: {
     type: String,
-    default: () => getConfig().table.size || getConfig().size
+    default: () => props_getConfig().table.size || props_getConfig().size
   },
   // 列的宽度是否自撑开（可能会被废弃的参数，不要使用）
   fit: {
     type: Boolean,
-    default: () => getConfig().table.fit
+    default: () => props_getConfig().table.fit
   },
   // 表格是否加载中
   loading: Boolean,
   // 所有的列对其方式
   align: {
     type: String,
-    default: () => getConfig().table.align
+    default: () => props_getConfig().table.align
   },
   // 所有的表头列的对齐方式
   headerAlign: {
     type: String,
-    default: () => getConfig().table.headerAlign
+    default: () => props_getConfig().table.headerAlign
   },
   // 所有的表尾列的对齐方式
   footerAlign: {
     type: String,
-    default: () => getConfig().table.footerAlign
+    default: () => props_getConfig().table.footerAlign
   },
   // 是否显示表头
   showHeader: {
     type: Boolean,
-    default: () => getConfig().table.showHeader
+    default: () => props_getConfig().table.showHeader
   },
   // （即将废弃）是否要高亮当前选中行
   highlightCurrentRow: {
     type: Boolean,
-    default: () => getConfig().table.highlightCurrentRow
+    default: () => props_getConfig().table.highlightCurrentRow
   },
   // （即将废弃）鼠标移到行是否要高亮显示
   highlightHoverRow: {
     type: Boolean,
-    default: () => getConfig().table.highlightHoverRow
+    default: () => props_getConfig().table.highlightHoverRow
   },
   // （即将废弃）是否要高亮当前选中列
   highlightCurrentColumn: {
     type: Boolean,
-    default: () => getConfig().table.highlightCurrentColumn
+    default: () => props_getConfig().table.highlightCurrentColumn
   },
   // （即将废弃）鼠标移到列是否要高亮显示
   highlightHoverColumn: {
     type: Boolean,
-    default: () => getConfig().table.highlightHoverColumn
+    default: () => props_getConfig().table.highlightHoverColumn
   },
   // （即将废弃）激活单元格编辑时是否高亮显示
   highlightCell: Boolean,
@@ -5986,17 +6270,17 @@ const {
   // 设置所有内容过长时显示为省略号
   showOverflow: {
     type: [Boolean, String],
-    default: () => getConfig().table.showOverflow
+    default: () => props_getConfig().table.showOverflow
   },
   // 设置表头所有内容过长时显示为省略号
   showHeaderOverflow: {
     type: [Boolean, String],
-    default: () => getConfig().table.showHeaderOverflow
+    default: () => props_getConfig().table.showHeaderOverflow
   },
   // 设置表尾所有内容过长时显示为省略号
   showFooterOverflow: {
     type: [Boolean, String],
-    default: () => getConfig().table.showFooterOverflow
+    default: () => props_getConfig().table.showFooterOverflow
   },
   /** 高级属性 */
   // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
@@ -6006,21 +6290,21 @@ const {
   // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
   rowId: {
     type: String,
-    default: () => getConfig().table.rowId
+    default: () => props_getConfig().table.rowId
   },
   zIndex: Number,
   emptyText: {
     type: String,
-    default: () => getConfig().table.emptyText
+    default: () => props_getConfig().table.emptyText
   },
   keepSource: {
     type: Boolean,
-    default: () => getConfig().table.keepSource
+    default: () => props_getConfig().table.keepSource
   },
   // 是否自动监听父容器变化去更新响应式表格宽高
   autoResize: {
     type: Boolean,
-    default: () => getConfig().table.autoResize
+    default: () => props_getConfig().table.autoResize
   },
   // 是否自动根据状态属性去更新响应式表格宽高
   syncResize: [Boolean, String, Number],
@@ -6085,12 +6369,12 @@ const {
   // （即将废弃）优化相关
   animat: {
     type: Boolean,
-    default: () => getConfig().table.animat
+    default: () => props_getConfig().table.animat
   },
   // （可能会被废弃的参数，不要使用）
   delayHover: {
     type: Number,
-    default: () => getConfig().table.delayHover
+    default: () => props_getConfig().table.delayHover
   },
   // 额外的参数
   params: Object
@@ -6119,6 +6403,7 @@ const {
   setup(props) {
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', {});
     const {
+      props: tableProps,
       reactData
     } = $xeTable;
     const {
@@ -6145,25 +6430,78 @@ const {
       customStore.activeWrapper = false;
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
-          $xeTable.customColseEvent(evnt);
+          $xeTable.customCloseEvent(evnt);
         }
       }, 300);
     };
+    const getStoreData = () => {
+      return {};
+    };
+    const handleSaveStore = type => {
+      const {
+        id
+      } = tableProps;
+      const customOpts = computeCustomOpts.value;
+      const {
+        storage,
+        updateStore
+      } = customOpts;
+      if (storage && id && updateStore) {
+        updateStore({
+          id,
+          type,
+          storeData: getStoreData()
+        });
+      }
+    };
     const confirmCustomEvent = evnt => {
-      updateColumnSort();
+      const {
+        customColumnList
+      } = reactData;
+      customColumnList.forEach((column, index) => {
+        const sortIndex = index + 1;
+        column.renderSortNumber = sortIndex;
+        column.fixed = column.renderFixed;
+        column.visible = column.renderVisible;
+      });
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', evnt);
+      handleSaveStore('confirm');
     };
     const cancelCustomEvent = evnt => {
+      const {
+        customStore
+      } = props;
+      const {
+        customColumnList
+      } = reactData;
+      const {
+        oldSortMaps,
+        oldFixedMaps,
+        oldVisibleMaps
+      } = customStore;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+        const colid = column.getKey();
+        const visible = !!oldVisibleMaps[colid];
+        const fixed = oldFixedMaps[colid] || '';
+        column.renderVisible = visible;
+        column.visible = visible;
+        column.renderFixed = fixed;
+        column.fixed = fixed;
+        column.renderSortNumber = oldSortMaps[colid] || 0;
+      }, {
+        children: 'children'
+      });
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', evnt);
     };
-    const resetCustomEvent = evnt => {
+    const handleResetCustomEvent = evnt => {
       $xeTable.resetColumn(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
+      handleSaveStore('confirm');
     };
-    const resetPopupCustomEvent = evnt => {
+    const resetCustomEvent = evnt => {
       if (external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.modal) {
         external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.modal.confirm({
           content: panel_getI18n('vxe.custom.cstmConfirmRestore'),
@@ -6171,11 +6509,11 @@ const {
           escClosable: true
         }).then(type => {
           if (type === 'confirm') {
-            resetCustomEvent(evnt);
+            handleResetCustomEvent(evnt);
           }
         });
       } else {
-        resetCustomEvent(evnt);
+        handleResetCustomEvent(evnt);
       }
     };
     const handleOptionCheck = column => {
@@ -6188,17 +6526,17 @@ const {
           parent
         } = matchObj;
         if (parent.children && parent.children.length) {
-          parent.visible = parent.children.every(column => column.visible);
-          parent.halfVisible = !parent.visible && parent.children.some(column => column.visible || column.halfVisible);
+          parent.renderVisible = parent.children.every(column => column.renderVisible);
+          parent.halfVisible = !parent.renderVisible && parent.children.some(column => column.renderVisible || column.halfVisible);
           handleOptionCheck(parent);
         }
       }
     };
     const changeCheckboxOption = column => {
-      const isChecked = !column.visible;
+      const isChecked = !column.renderVisible;
       const customOpts = computeCustomOpts.value;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
-        item.visible = isChecked;
+        item.renderVisible = isChecked;
         item.halfVisible = false;
       });
       handleOptionCheck(column);
@@ -6209,20 +6547,22 @@ const {
     };
     const changeFixedOption = (column, colFixed) => {
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
-      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)
         }
       }
     };
-    const changePopupFixedOption = column => {
-      const isMaxFixedColumn = computeIsMaxFixedColumn.value;
-      if (!isMaxFixedColumn) {
-        $xeTable.setColumnFixed(column, column.fixed);
-      }
-    };
+    // const changePopupFixedOption = () => {
+    //   const isMaxFixedColumn = computeIsMaxFixedColumn.value
+    //   if (!isMaxFixedColumn) {
+    //     // $xeTable.setColumnFixed(column, column.fixed)
+    //   }
+    // }
     const allCustomEvent = () => {
       const {
         customStore
@@ -6239,7 +6579,7 @@ const {
         if (!checkMethod || checkMethod({
           column
         })) {
-          column.visible = isAll;
+          column.renderVisible = isAll;
           column.halfVisible = false;
         }
       });
@@ -6274,16 +6614,6 @@ const {
         evnt.dataTransfer.setDragImage(img, 0, 0);
       }
     };
-    const updateColumnSort = () => {
-      const {
-        customColumnList
-      } = reactData;
-      // 更新顺序
-      customColumnList.forEach((column, index) => {
-        const sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-      });
-    };
     const sortDragendEvent = evnt => {
       const {
         customColumnList
@@ -6323,8 +6653,6 @@ const {
       }
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
-      // 更新顺序
-      updateColumnSort();
     };
     const sortDragoverEvent = evnt => {
       const trEl = evnt.currentTarget;
@@ -6372,6 +6700,8 @@ const {
       const {
         checkMethod,
         visibleMethod,
+        allowSort,
+        allowFixed,
         trigger
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
@@ -6387,7 +6717,7 @@ const {
           column
         }) : true;
         if (isVisible) {
-          const isChecked = column.visible;
+          const isChecked = column.renderVisible;
           const isIndeterminate = column.halfVisible;
           const isColGroup = column.children && column.children.length;
           const colTitle = formatText(column.getTitle(), 1);
@@ -6396,16 +6726,20 @@ const {
           }) : false;
           colVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
             key: column.id,
+            colid: column.id,
             class: ['vxe-table-custom--option', `level--${column.level}`, {
               'is--group': isColGroup
-            }]
+            }],
+            onDragstart: sortDragstartEvent,
+            onDragend: sortDragendEvent,
+            onDragover: sortDragoverEvent
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            title: colTitle,
             class: ['vxe-table-custom--checkbox-option', {
               'is--checked': isChecked,
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
+            title: panel_getI18n('vxe.custom.setting.colVisible'),
             onClick: () => {
               if (!isDisabled) {
                 changeCheckboxOption(column);
@@ -6413,29 +6747,39 @@ const {
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: 'vxe-checkbox--label'
-          }, colTitle)]), !parent && customOpts.allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })]), allowSort && column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom--sort-option'
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: 'vxe-table-custom--sort-btn',
+            title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
+            onMousedown: sortMousedownEvent,
+            onMouseup: sortMouseupEvent
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+            class: panel_getIcon().TABLE_CUSTOM_SORT
+          })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom--checkbox-label',
+            title: colTitle
+          }, colTitle), !parent && allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom--fixed-option'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: ['vxe-table-custom--fixed-left-option', column.fixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT, {
-              'is--checked': column.fixed === 'left',
-              'is--disabled': isMaxFixedColumn && !column.fixed
+            class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT, {
+              'is--checked': column.renderFixed === 'left',
+              'is--disabled': isMaxFixedColumn && !column.renderFixed
             }],
-            title: panel_getI18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
+            title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
             onClick: () => {
               changeFixedOption(column, 'left');
             }
           }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: ['vxe-table-custom--fixed-right-option', column.fixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT, {
-              'is--checked': column.fixed === 'right',
-              'is--disabled': isMaxFixedColumn && !column.fixed
+            class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT, {
+              'is--checked': column.renderFixed === 'right',
+              'is--disabled': isMaxFixedColumn && !column.renderFixed
             }],
-            title: panel_getI18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
+            title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
             onClick: () => {
               changeFixedOption(column, 'right');
             }
-          })]) : null]));
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
       const isAllChecked = customStore.isAll;
@@ -6446,7 +6790,7 @@ const {
         class: ['vxe-table-custom-wrapper', {
           'is--active': customStore.visible
         }]
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+      }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
         class: 'vxe-table-custom--header'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
         class: 'vxe-table-custom--option'
@@ -6461,21 +6805,34 @@ const {
         class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, panel_getI18n('vxe.toolbar.customAll'))])])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+      }, panel_getI18n('vxe.toolbar.customAll'))])])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        ref: bodyElemRef,
+        class: 'vxe-table-custom--list-wrapper'
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
         class: 'vxe-table-custom--body',
+        name: 'vxe-table-custom--list',
+        tag: 'ul',
         style: maxHeight ? {
           maxHeight: `${maxHeight}px`
         } : {},
         ...customWrapperOns
-      }, colVNs), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, {
+        default: () => colVNs
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        ref: dragHintElemRef,
+        class: 'vxe-table-custom-popup--drag-hint'
+      }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn.value ? dragColumn.value.getTitle() : '']))]), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--footer'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         class: 'btn--reset',
         onClick: resetCustomEvent
-      }, customOpts.resetButtonText || panel_getI18n('vxe.toolbar.customRestore')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+      }, customOpts.resetButtonText || panel_getI18n('vxe.table.customRestore')), customOpts.immediate ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+        class: 'btn--cancel',
+        onClick: cancelCustomEvent
+      }, customOpts.resetButtonText || panel_getI18n('vxe.table.customCancel')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         class: 'btn--confirm',
         onClick: confirmCustomEvent
-      }, customOpts.confirmButtonText || panel_getI18n('vxe.toolbar.customConfirm'))]) : null]);
+      }, customOpts.confirmButtonText || panel_getI18n('vxe.table.customConfirm'))]) : null] : []);
     };
     const renderPopupPanel = () => {
       const {
@@ -6486,6 +6843,8 @@ const {
       } = reactData;
       const customOpts = computeCustomOpts.value;
       const {
+        allowSort,
+        allowFixed,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -6497,7 +6856,7 @@ const {
           column
         }) : true;
         if (isVisible) {
-          const isChecked = column.visible;
+          const isChecked = column.renderVisible;
           const isIndeterminate = column.halfVisible;
           const colTitle = formatText(column.getTitle(), 1);
           const isColGroup = column.children && column.children.length;
@@ -6514,19 +6873,6 @@ const {
             onDragend: sortDragendEvent,
             onDragover: sortDragoverEvent
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-            class: 'vxe-table-custom-popup--column-item col--sort'
-          }, [column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-            class: 'vxe-table-custom-popup--column-sort-btn',
-            onMousedown: sortMousedownEvent,
-            onMouseup: sortMouseupEvent
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-            class: 'vxe-icon-sort'
-          })]) : null]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-            class: 'vxe-table-custom-popup--column-item col--name'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: 'vxe-table-custom-popup--name',
-            title: colTitle
-          }, colTitle)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--visible'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
@@ -6534,6 +6880,7 @@ const {
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
+            title: panel_getI18n('vxe.custom.setting.colVisible'),
             onClick: () => {
               if (!isDisabled) {
                 changeCheckboxOption(column);
@@ -6541,10 +6888,24 @@ const {
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+          })])]), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+            class: 'vxe-table-custom-popup--column-item col--sort'
+          }, [column.level === 1 ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: 'vxe-table-custom-popup--column-sort-btn',
+            title: panel_getI18n('vxe.custom.setting.sortHelpTip'),
+            onMousedown: sortMousedownEvent,
+            onMouseup: sortMouseupEvent
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+            class: panel_getIcon().TABLE_CUSTOM_SORT
+          })]) : null]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
+            class: 'vxe-table-custom-popup--column-item col--name'
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom-popup--name',
+            title: colTitle
+          }, colTitle)]), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--fixed'
-          }, [!parent && customOpts.allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-radio-group'), {
-            modelValue: column.fixed || '',
+          }, [!parent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-radio-group'), {
+            modelValue: column.renderFixed || '',
             type: 'button',
             size: 'mini',
             options: [{
@@ -6560,14 +6921,16 @@ const {
               disabled: isMaxFixedColumn
             }],
             'onUpdate:modelValue'(value) {
-              column.fixed = value;
-            },
-            onChange() {
-              changePopupFixedOption(column);
+              column.renderFixed = value;
             }
-          }) : null])]));
+            // onChange () {
+            //   changePopupFixedOption(column)
+            // }
+          }) : null]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-modal'), {
         key: 'popup',
         className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
@@ -6597,15 +6960,30 @@ const {
             style: {
               width: '80px'
             }
-          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {}), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+          }), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
             style: {
               width: '80px'
             }
-          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
+            style: {
+              minWidth: '120px'
+            }
+          }), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
             style: {
               width: '200px'
             }
-          })]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: ['vxe-table-custom--checkbox-option', {
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
+            }],
+            title: panel_getI18n('vxe.table.allTitle'),
+            onClick: allCustomEvent
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
+          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+            class: 'vxe-checkbox--label'
+          }, panel_getI18n('vxe.toolbar.customAll'))])]), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-table-custom-popup--table-sort-help-title'
           }, panel_getI18n('vxe.custom.setting.colSort')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-tooltip'), {
             enterable: true,
@@ -6616,7 +6994,7 @@ const {
                 class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
               });
             }
-          })]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colVisible')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+          })]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             class: 'vxe-table-custom--body',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
@@ -6632,7 +7010,7 @@ const {
             class: 'vxe-table-custom-popup--footer'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-button'), {
             content: customOpts.resetButtonText || panel_getI18n('vxe.custom.cstmRestore'),
-            onClick: resetPopupCustomEvent
+            onClick: resetCustomEvent
           }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-button'), {
             content: customOpts.resetButtonText || panel_getI18n('vxe.custom.cstmCancel'),
             onClick: cancelCustomEvent
@@ -7568,10 +7946,10 @@ const {
   renderer: table_renderer,
   formats: table_formats,
   createEvent,
-  globalResize,
-  interceptor,
-  hooks,
-  globalEvents,
+  globalResize: table_globalResize,
+  interceptor: table_interceptor,
+  hooks: table_hooks,
+  globalEvents: table_globalEvents,
   GLOBAL_EVENT_KEYS,
   log: table_log,
   useFns
@@ -7680,7 +8058,10 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         activeBtn: false,
         activeWrapper: false,
         visible: false,
-        maxHeight: 0
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
       },
       customColumnList: [],
       // 当前选中的筛选列
@@ -8454,7 +8835,8 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       } = props;
       const customOpts = computeCustomOpts.value;
       const {
-        storage
+        storage,
+        restoreStore
       } = customOpts;
       const isAllCustom = storage === true;
       const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
@@ -8462,6 +8844,11 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       const isCustomVisible = isAllCustom || storageOpts.visible;
       const isCustomFixed = isAllCustom || storageOpts.fixed;
       const isCustomSort = isAllCustom || storageOpts.sort;
+      if (storage && id && restoreStore) {
+        restoreStore({
+          id
+        });
+      }
       if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
         const customMap = {};
         if (!id) {
@@ -12965,7 +13352,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       const {
         actived
       } = editStore;
-      const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
+      const isEsc = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
       if (isEsc) {
         tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
           tableMethods.dispatchEvent('keydown-start', {}, evnt);
@@ -13028,18 +13415,18 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           } = editStore;
           const childrenField = treeOpts.children || treeOpts.childrenField;
           const keyCode = evnt.keyCode;
-          const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
-          const isBack = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
-          const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
-          const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
-          const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
-          const isLeftArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
-          const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
-          const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
-          const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
-          const isDel = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
-          const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
-          const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
+          const isEsc = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
+          const isBack = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
+          const isTab = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
+          const isEnter = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
+          const isSpacebar = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
+          const isLeftArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
+          const isUpArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
+          const isRightArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
+          const isDwArrow = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
+          const isDel = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
+          const isF2 = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
+          const isContextMenu = table_globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
           const hasMetaKey = evnt.metaKey;
           const hasCtrlKey = evnt.ctrlKey;
           const hasShiftKey = evnt.shiftKey;
@@ -13853,10 +14240,10 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         reactData.reColumnFlag++;
       },
       preventEvent(evnt, type, args, next, end) {
-        let evntList = interceptor.get(type);
+        let evntList = table_interceptor.get(type);
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
-          evntList = interceptor.get('event.clearActived');
+          evntList = table_interceptor.get('event.clearActived');
           if (true) {
             if (evntList.length) {
               table_log.warn('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
@@ -15189,7 +15576,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         }
       });
     });
-    hooks.forEach(options => {
+    table_hooks.forEach(options => {
       const {
         setupTable
       } = options;
@@ -15381,7 +15768,7 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
             leading: true,
             trailing: true
           }) : null;
-          resizeObserver = globalResize.create(handleOptimizeResize ? () => {
+          resizeObserver = table_globalResize.create(handleOptimizeResize ? () => {
             if (props.autoResize) {
               requestAnimationFrame(handleOptimizeResize);
             }
@@ -15398,16 +15785,16 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           }
         }
       });
-      globalEvents.on($xeTable, 'paste', handleGlobalPasteEvent);
-      globalEvents.on($xeTable, 'copy', handleGlobalCopyEvent);
-      globalEvents.on($xeTable, 'cut', handleGlobalCutEvent);
-      globalEvents.on($xeTable, 'mousedown', handleGlobalMousedownEvent);
-      globalEvents.on($xeTable, 'blur', handleGlobalBlurEvent);
-      globalEvents.on($xeTable, 'mousewheel', handleGlobalMousewheelEvent);
-      globalEvents.on($xeTable, 'keydown', handleGlobalKeydownEvent);
-      globalEvents.on($xeTable, 'resize', handleGlobalResizeEvent);
+      table_globalEvents.on($xeTable, 'paste', handleGlobalPasteEvent);
+      table_globalEvents.on($xeTable, 'copy', handleGlobalCopyEvent);
+      table_globalEvents.on($xeTable, 'cut', handleGlobalCutEvent);
+      table_globalEvents.on($xeTable, 'mousedown', handleGlobalMousedownEvent);
+      table_globalEvents.on($xeTable, 'blur', handleGlobalBlurEvent);
+      table_globalEvents.on($xeTable, 'mousewheel', handleGlobalMousewheelEvent);
+      table_globalEvents.on($xeTable, 'keydown', handleGlobalKeydownEvent);
+      table_globalEvents.on($xeTable, 'resize', handleGlobalResizeEvent);
       if ($xeTable.handleGlobalContextmenuEvent) {
-        globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
+        table_globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
       }
       tablePrivateMethods.preventEvent(null, 'mounted', {
         $table: $xeTable
@@ -15426,15 +15813,15 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
       });
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
-      globalEvents.off($xeTable, 'paste');
-      globalEvents.off($xeTable, 'copy');
-      globalEvents.off($xeTable, 'cut');
-      globalEvents.off($xeTable, 'mousedown');
-      globalEvents.off($xeTable, 'blur');
-      globalEvents.off($xeTable, 'mousewheel');
-      globalEvents.off($xeTable, 'keydown');
-      globalEvents.off($xeTable, 'resize');
-      globalEvents.off($xeTable, 'contextmenu');
+      table_globalEvents.off($xeTable, 'paste');
+      table_globalEvents.off($xeTable, 'copy');
+      table_globalEvents.off($xeTable, 'cut');
+      table_globalEvents.off($xeTable, 'mousedown');
+      table_globalEvents.off($xeTable, 'blur');
+      table_globalEvents.off($xeTable, 'mousewheel');
+      table_globalEvents.off($xeTable, 'keydown');
+      table_globalEvents.off($xeTable, 'resize');
+      table_globalEvents.off($xeTable, 'contextmenu');
       tablePrivateMethods.preventEvent(null, 'unmounted', {
         $table: $xeTable
       });
@@ -16046,7 +16433,7 @@ hook_hooks.add('tableFilterModule', {
 
 
 const {
-  menus,
+  menus: hook_menus,
   hooks: menu_hook_hooks,
   globalEvents: hook_globalEvents,
   GLOBAL_EVENT_KEYS: hook_GLOBAL_EVENT_KEYS
@@ -16386,7 +16773,7 @@ menu_hook_hooks.add('tableMenuModule', {
       ctxMenuLinkEvent(evnt, menu) {
         // 如果一级菜单有配置 code 则允许点击，否则不能点击
         if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
-          const gMenuOpts = menus.get(menu.code);
+          const gMenuOpts = hook_menus.get(menu.code);
           const params = Object.assign({}, internalData._currMenuParams, {
             menu,
             $table: $xeTable,
@@ -19510,7 +19897,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
 
 const {
   getConfig: validator_hook_getConfig,
-  validators,
+  validators: hook_validators,
   hooks: validator_hook_hooks,
   log: validator_hook_log
 } = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
@@ -19892,7 +20279,7 @@ validator_hook_hooks.add('tableValidatorModule', {
                   };
                   let customValid;
                   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
-                    const gvItem = validators.get(validator);
+                    const gvItem = hook_validators.get(validator);
                     if (gvItem) {
                       if (gvItem.cellValidatorMethod) {
                         customValid = gvItem.cellValidatorMethod(validParams);
@@ -20088,6 +20475,7 @@ validator_hook_hooks.add('tableValidatorModule', {
 ;// CONCATENATED MODULE: ./packages/table/module/custom/hook.ts
 
 
+
 const tableCustomMethodKeys = ['openCustom', 'closeCustom'];
 external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.hooks.add('tableCustomModule', {
   setupTable($xeTable) {
@@ -20129,9 +20517,28 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
         initStore,
         customStore
       } = reactData;
+      const {
+        collectColumn
+      } = internalData;
+      const sortMaps = {};
+      const fixedMaps = {};
+      const visibleMaps = {};
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+        const colid = column.getKey();
+        column.renderFixed = column.fixed;
+        column.renderVisible = column.visible;
+        sortMaps[colid] = column.renderSortNumber;
+        fixedMaps[colid] = column.fixed;
+        visibleMaps[colid] = column.visible;
+      }, {
+        children: 'children'
+      });
+      customStore.oldSortMaps = sortMaps;
+      customStore.oldFixedMaps = fixedMaps;
+      customStore.oldVisibleMaps = visibleMaps;
+      reactData.customColumnList = collectColumn.slice(0);
       customStore.visible = true;
       initStore.custom = true;
-      reactData.customColumnList = internalData.collectColumn.slice(0);
       checkCustomStatus();
       calcMaxHeight();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => calcMaxHeight());
@@ -20204,7 +20611,7 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
           $xeTable.emitCustomEvent('open', evnt);
         }
       },
-      customColseEvent(evnt) {
+      customCloseEvent(evnt) {
         const {
           customStore
         } = reactData;
@@ -21030,7 +21437,7 @@ const {
   getIcon: toolbar_getIcon,
   getI18n: toolbar_getI18n,
   renderer: toolbar_renderer,
-  commands,
+  commands: toolbar_commands,
   log: toolbar_log,
   createEvent: toolbar_createEvent,
   useFns: toolbar_useFns
@@ -21160,7 +21567,7 @@ const {
       customStore.activeBtn = false;
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
-          $xeTable.customColseEvent($event);
+          $xeTable.customCloseEvent($event);
         }
       }, 350);
     };
@@ -21203,7 +21610,7 @@ const {
         if ($xeGrid) {
           $xeGrid.triggerToolbarBtnEvent(item, evnt);
         } else {
-          const gCommandOpts = commands.get(code);
+          const gCommandOpts = toolbar_commands.get(code);
           const params = {
             code,
             button: item,
@@ -21232,7 +21639,7 @@ const {
         if ($xeGrid) {
           $xeGrid.triggerToolbarTolEvent(item, evnt);
         } else {
-          const gCommandOpts = commands.get(code);
+          const gCommandOpts = toolbar_commands.get(code);
           const params = {
             code,
             tool: item,
@@ -22817,464 +23224,184 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         return gridMethods.loadColumn(columns);
       };
     }
-    const gridPrivateMethods = {
-      extendTableMethods,
-      callSlot(slotFunc, params) {
-        if (slotFunc) {
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(slotFunc)) {
-            slotFunc = slots[slotFunc] || null;
-          }
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
-            return getSlotVNs(slotFunc(params));
-          }
-        }
-        return [];
-      },
-      /**
-       * 获取需要排除的高度
-       */
-      getExcludeHeight() {
-        const {
-          height
-        } = props;
-        const {
-          isZMax
-        } = reactData;
-        const el = refElem.value;
-        const formWrapper = refFormWrapper.value;
-        const toolbarWrapper = refToolbarWrapper.value;
-        const topWrapper = refTopWrapper.value;
-        const bottomWrapper = refBottomWrapper.value;
-        const pagerWrapper = refPagerWrapper.value;
-        const parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize(el.parentNode);
-        return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
-      },
-      getParentHeight() {
-        const el = refElem.value;
-        if (el) {
-          return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - gridPrivateMethods.getExcludeHeight();
-        }
-        return 0;
-      },
-      triggerToolbarCommitEvent(params, evnt) {
-        const {
-          code
-        } = params;
-        return gridMethods.commitProxy(params, evnt).then(rest => {
-          if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
-            gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', {
-              ...rest,
-              isReload: code === 'reload'
-            }, evnt);
-          }
-        });
-      },
-      triggerToolbarBtnEvent(button, evnt) {
-        gridPrivateMethods.triggerToolbarCommitEvent(button, evnt);
-        gridMethods.dispatchEvent('toolbar-button-click', {
-          code: button.code,
-          button
-        }, evnt);
-      },
-      triggerToolbarTolEvent(tool, evnt) {
-        gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt);
-        gridMethods.dispatchEvent('toolbar-tool-click', {
-          code: tool.code,
-          tool
-        }, evnt);
-      },
-      triggerZoomEvent(evnt) {
-        gridMethods.zoom();
-        gridMethods.dispatchEvent('zoom', {
-          type: reactData.isZMax ? 'max' : 'revert'
-        }, evnt);
-      }
-    };
-    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods);
-    const columnFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.columns ? props.columns.length : -1, () => {
-      columnFlag.value++;
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.columns, () => {
-      columnFlag.value++;
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(columnFlag, () => {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => $xeGrid.loadColumn(props.columns || []));
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.toolbarConfig, () => {
-      initToolbar();
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.pagerConfig, () => {
-      initPages();
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.proxyConfig, () => {
-      initProxy();
-    });
-    const handleGlobalKeydownEvent = evnt => {
-      const zoomOpts = computeZoomOpts.value;
-      const isEsc = grid_globalEvents.hasKey(evnt, grid_GLOBAL_EVENT_KEYS.ESCAPE);
-      if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
-        gridPrivateMethods.triggerZoomEvent(evnt);
-      }
-    };
-    grid_hooks.forEach(options => {
-      const {
-        setupGrid
-      } = options;
-      if (setupGrid) {
-        const hookRest = setupGrid($xeGrid);
-        if (hookRest && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(hookRest)) {
-          Object.assign($xeGrid, hookRest);
-        }
-      }
-    });
-    initPages();
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-        const {
-          data,
-          columns,
-          proxyConfig
-        } = props;
-        const proxyOpts = computeProxyOpts.value;
-        const formOpts = computeFormOpts.value;
-        if (isEnableConf(proxyConfig) && (data || proxyOpts.form && formOpts.data)) {
-          grid_log.err('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
-        }
-        // if (process.env.VUE_APP_VXE_ENV === 'development') {
-        //   if (proxyOpts.props) {
-        //     warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
-        //   }
-        // }
-        if (columns && columns.length) {
-          $xeGrid.loadColumn(columns);
-        }
-        initToolbar();
-      });
-      grid_globalEvents.on($xeGrid, 'keydown', handleGlobalKeydownEvent);
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
-      grid_globalEvents.off($xeGrid, 'keydown');
-    });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-      initProxy();
-    });
-    const renderVN = () => {
-      const vSize = computeSize.value;
-      const styles = computeStyles.value;
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        ref: refElem,
-        class: ['vxe-grid', {
-          [`size--${vSize}`]: vSize,
-          'is--animat': !!props.animat,
-          'is--round': props.round,
-          'is--maximize': reactData.isZMax,
-          'is--loading': props.loading || reactData.tableLoading
-        }],
-        style: styles
-      }, renderLayout());
-    };
-    $xeGrid.renderVN = renderVN;
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeGrid', $xeGrid);
-    return $xeGrid;
-  },
-  render() {
-    return this.renderVN();
-  }
-}));
-;// CONCATENATED MODULE: ./packages/grid/index.ts
-
-
-const VxeGrid = Object.assign({}, grid, {
-  install(app) {
-    app.component(grid.name, grid);
-  }
-});
-if (external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.dynamicApp) {
-  external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.dynamicApp.component(grid.name, grid);
-}
-const Grid = VxeGrid;
-/* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
-;// CONCATENATED MODULE: ./packages/ui/index.ts
-
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.version = "4.7.3";
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.3";
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig({
-  emptyCell: '　',
-  table: {
-    fit: true,
-    showHeader: true,
-    animat: true,
-    delayHover: 250,
-    autoResize: true,
-    minHeight: 144,
-    // keepSource: false,
-    // showOverflow: null,
-    // showHeaderOverflow: null,
-    // showFooterOverflow: null,
-    // resizeInterval: 500,
-    // size: null,
-    // zIndex: null,
-    // stripe: false,
-    // border: false,
-    // round: false,
-    // emptyText: '暂无数据',
-    // emptyRender: {
-    //   name: ''
-    // },
-    // rowConfig: {
-    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
-    // },
-    resizeConfig: {
-      refreshDelay: 250
-    },
-    radioConfig: {
-      // trigger: 'default'
-      strict: true
-    },
-    checkboxConfig: {
-      // trigger: 'default',
-      strict: true
-    },
-    tooltipConfig: {
-      enterable: true
-    },
-    validConfig: {
-      showMessage: true,
-      autoClear: true,
-      autoPos: true,
-      message: 'inline',
-      msgMode: 'single'
-    },
-    columnConfig: {
-      maxFixedSize: 4
-    },
-    // menuConfig: {
-    //   visibleMethod () {}
-    // },
-    customConfig: {
-      allowFixed: true,
-      showFooter: true
-      //  storage: false,
-      //  checkMethod () {}
-    },
-    sortConfig: {
-      // remote: false,
-      // trigger: 'default',
-      // orders: ['asc', 'desc', null],
-      // sortMethod: null,
-      showIcon: true,
-      iconLayout: 'vertical'
-    },
-    filterConfig: {
-      // remote: false,
-      // filterMethod: null,
-      showIcon: true
-    },
-    treeConfig: {
-      rowField: 'id',
-      parentField: 'parentId',
-      childrenField: 'children',
-      hasChildField: 'hasChild',
-      mapChildrenField: '_X_ROW_CHILD',
-      indent: 20,
-      showIcon: true
-    },
-    expandConfig: {
-      // trigger: 'default',
-      showIcon: true
-    },
-    editConfig: {
-      // mode: 'cell',
-      showIcon: true,
-      showAsterisk: true
-    },
-    importConfig: {
-      _typeMaps: {
-        csv: 1,
-        html: 1,
-        xml: 1,
-        txt: 1
-      },
-      modes: ['insert', 'covering']
-    },
-    exportConfig: {
-      _typeMaps: {
-        csv: 1,
-        html: 1,
-        xml: 1,
-        txt: 1
-      },
-      modes: ['current', 'selected']
-    },
-    printConfig: {
-      modes: ['current', 'selected']
-    },
-    mouseConfig: {
-      extension: true
-    },
-    keyboardConfig: {
-      isEsc: true
-    },
-    areaConfig: {
-      autoClear: true,
-      selectCellByHeader: true
-    },
-    clipConfig: {
-      isCopy: true,
-      isCut: true,
-      isPaste: true
-    },
-    fnrConfig: {
-      isFind: true,
-      isReplace: true
-    },
-    scrollX: {
-      // enabled: false,
-      gt: 60
-      // oSize: 0
-    },
-    scrollY: {
-      // enabled: false,
-      gt: 100
-      // oSize: 0
-    }
-  },
-  // export: {
-  //   types: {}
-  // },
-  grid: {
-    // size: null,
-    // zoomConfig: {
-    //   escRestore: true
-    // },
-    formConfig: {
-      enabled: true
-    },
-    pagerConfig: {
-      enabled: true
-      // perfect: false
-    },
-    toolbarConfig: {
-      enabled: true
-      // perfect: false
-    },
-    proxyConfig: {
-      enabled: true,
-      autoLoad: true,
-      message: true,
-      props: {
-        list: null,
-        result: 'result',
-        total: 'page.total',
-        message: 'message'
-      }
-      // beforeItem: null,
-      // beforeColumn: null,
-      // beforeQuery: null,
-      // afterQuery: null,
-      // beforeDelete: null,
-      // afterDelete: null,
-      // beforeSave: null,
-      // afterSave: null
-    }
+    const gridPrivateMethods = {
+      extendTableMethods,
+      callSlot(slotFunc, params) {
+        if (slotFunc) {
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(slotFunc)) {
+            slotFunc = slots[slotFunc] || null;
+          }
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
+            return getSlotVNs(slotFunc(params));
+          }
+        }
+        return [];
+      },
+      /**
+       * 获取需要排除的高度
+       */
+      getExcludeHeight() {
+        const {
+          height
+        } = props;
+        const {
+          isZMax
+        } = reactData;
+        const el = refElem.value;
+        const formWrapper = refFormWrapper.value;
+        const toolbarWrapper = refToolbarWrapper.value;
+        const topWrapper = refTopWrapper.value;
+        const bottomWrapper = refBottomWrapper.value;
+        const pagerWrapper = refPagerWrapper.value;
+        const parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize(el.parentNode);
+        return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
+      },
+      getParentHeight() {
+        const el = refElem.value;
+        if (el) {
+          return (reactData.isZMax ? getDomNode().visibleHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(el.parentNode).height)) - gridPrivateMethods.getExcludeHeight();
+        }
+        return 0;
+      },
+      triggerToolbarCommitEvent(params, evnt) {
+        const {
+          code
+        } = params;
+        return gridMethods.commitProxy(params, evnt).then(rest => {
+          if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
+            gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', {
+              ...rest,
+              isReload: code === 'reload'
+            }, evnt);
+          }
+        });
+      },
+      triggerToolbarBtnEvent(button, evnt) {
+        gridPrivateMethods.triggerToolbarCommitEvent(button, evnt);
+        gridMethods.dispatchEvent('toolbar-button-click', {
+          code: button.code,
+          button
+        }, evnt);
+      },
+      triggerToolbarTolEvent(tool, evnt) {
+        gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt);
+        gridMethods.dispatchEvent('toolbar-tool-click', {
+          code: tool.code,
+          tool
+        }, evnt);
+      },
+      triggerZoomEvent(evnt) {
+        gridMethods.zoom();
+        gridMethods.dispatchEvent('zoom', {
+          type: reactData.isZMax ? 'max' : 'revert'
+        }, evnt);
+      }
+    };
+    Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods);
+    const columnFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.columns ? props.columns.length : -1, () => {
+      columnFlag.value++;
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.columns, () => {
+      columnFlag.value++;
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(columnFlag, () => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => $xeGrid.loadColumn(props.columns || []));
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.toolbarConfig, () => {
+      initToolbar();
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.pagerConfig, () => {
+      initPages();
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.proxyConfig, () => {
+      initProxy();
+    });
+    const handleGlobalKeydownEvent = evnt => {
+      const zoomOpts = computeZoomOpts.value;
+      const isEsc = grid_globalEvents.hasKey(evnt, grid_GLOBAL_EVENT_KEYS.ESCAPE);
+      if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
+        gridPrivateMethods.triggerZoomEvent(evnt);
+      }
+    };
+    grid_hooks.forEach(options => {
+      const {
+        setupGrid
+      } = options;
+      if (setupGrid) {
+        const hookRest = setupGrid($xeGrid);
+        if (hookRest && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(hookRest)) {
+          Object.assign($xeGrid, hookRest);
+        }
+      }
+    });
+    initPages();
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        const {
+          data,
+          columns,
+          proxyConfig
+        } = props;
+        const proxyOpts = computeProxyOpts.value;
+        const formOpts = computeFormOpts.value;
+        if (isEnableConf(proxyConfig) && (data || proxyOpts.form && formOpts.data)) {
+          grid_log.err('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
+        }
+        // if (process.env.VUE_APP_VXE_ENV === 'development') {
+        //   if (proxyOpts.props) {
+        //     warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
+        //   }
+        // }
+        if (columns && columns.length) {
+          $xeGrid.loadColumn(columns);
+        }
+        initToolbar();
+      });
+      grid_globalEvents.on($xeGrid, 'keydown', handleGlobalKeydownEvent);
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
+      grid_globalEvents.off($xeGrid, 'keydown');
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+      initProxy();
+    });
+    const renderVN = () => {
+      const vSize = computeSize.value;
+      const styles = computeStyles.value;
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        ref: refElem,
+        class: ['vxe-grid', {
+          [`size--${vSize}`]: vSize,
+          'is--animat': !!props.animat,
+          'is--round': props.round,
+          'is--maximize': reactData.isZMax,
+          'is--loading': props.loading || reactData.tableLoading
+        }],
+        style: styles
+      }, renderLayout());
+    };
+    $xeGrid.renderVN = renderVN;
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeGrid', $xeGrid);
+    return $xeGrid;
   },
-  toolbar: {
-    // size: null,
-    // import: {
-    //   mode: 'covering'
-    // },
-    // export: {
-    //   types: ['csv', 'html', 'xml', 'txt']
-    // },
-    // buttons: []
+  render() {
+    return this.renderVN();
   }
-});
-const iconPrefix = 'vxe-icon-';
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setIcon({
-  // table
-  TABLE_SORT_ASC: iconPrefix + 'caret-up',
-  TABLE_SORT_DESC: iconPrefix + 'caret-down',
-  TABLE_FILTER_NONE: iconPrefix + 'funnel',
-  TABLE_FILTER_MATCH: iconPrefix + 'funnel',
-  TABLE_EDIT: iconPrefix + 'edit',
-  TABLE_TITLE_PREFIX: iconPrefix + 'question-circle-fill',
-  TABLE_TITLE_SUFFIX: iconPrefix + 'question-circle-fill',
-  TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
-  TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
-  TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
-  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-fill',
-  TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
-  TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
-  TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
-  TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
-  // toolbar
-  TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
-  TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
-  TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
-  TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
-  TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
-  TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
-  TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
-  TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
-  TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
-  TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
-  TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
-  TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
-});
-const setTheme = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setTheme;
-const getTheme = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getTheme;
-const setConfig = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig;
-const ui_getConfig = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getConfig;
-const setIcon = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setIcon;
-const ui_getIcon = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getIcon;
-const setLanguage = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setLanguage;
-const setI18n = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setI18n;
-const ui_getI18n = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.getI18n;
-const ui_globalEvents = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.globalEvents;
-const ui_globalResize = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.globalResize;
-const ui_renderer = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.renderer;
-const ui_validators = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.validators;
-const ui_menus = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.menus;
-const ui_formats = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.formats;
-const ui_commands = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.commands;
-const ui_interceptor = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.interceptor;
-const clipboard = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.clipboard;
-const ui_log = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.log;
-const ui_hooks = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.hooks;
-const use = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.use;
-/**
- * 已废弃
- * @deprecated
- */
-const setup = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setup;
-/**
- * 已废弃
- * @deprecated
- */
-const config = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.config;
-/**
- * 已废弃
- * @deprecated
- */
-const t = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.t;
-/**
- * 已废弃
- * @deprecated
- */
-const _t = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI._t;
-/**
- * 已废弃，兼容老版本
- * @deprecated
- */
-const VXETable = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI;
-const saveFile = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.readFile;
-const readFile = external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.readFile;
+}));
+;// CONCATENATED MODULE: ./packages/grid/index.ts
 
-/* harmony default export */ var ui = ((/* unused pure expression or super */ null && (VxeUI)));
+
+const VxeGrid = Object.assign({}, grid, {
+  install(app) {
+    app.component(grid.name, grid);
+  }
+});
+if (external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.dynamicApp) {
+  external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.dynamicApp.component(grid.name, grid);
+}
+const Grid = VxeGrid;
+/* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
 ;// CONCATENATED MODULE: ./packages/components.ts