vxe-table 3.8.8-beta.2 → 3.8.8-beta.3

package/lib/index.umd.js

@@ -11146,6 +11146,7 @@ var iconPrefix = 'vxe-icon-';
     // },
     customConfig: {
       allowFixed: true,
+      allowSort: true,
       showFooter: true
       //  storage: false,
       //  checkMethod () {}
@@ -11248,11 +11249,12 @@ var iconPrefix = 'vxe-icon-';
     TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
-    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked-fill',
     TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
-    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
-    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate-fill',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
     TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
+    TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
     // button
     BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
     BUTTON_LOADING: iconPrefix + 'spinner roll',
@@ -11296,9 +11298,9 @@ var iconPrefix = 'vxe-icon-';
     TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
     TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
     TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
-    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED: iconPrefix + 'fixed-left-fill',
+    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
     TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
-    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED: iconPrefix + 'fixed-right-fill',
+    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill',
     // form
     FORM_PREFIX: iconPrefix + 'question-circle-fill',
     FORM_SUFFIX: iconPrefix + 'question-circle-fill',
@@ -11479,7 +11481,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.8-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8-beta.3", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13159,7 +13161,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.8-beta.2",
+  version: "3.8.8-beta.3",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -13289,6 +13291,8 @@ var ColumnInfo = /*#__PURE__*/function () {
       renderSortNumber: 0,
       // 用于记录自定义列顺序
 
+      renderFixed: '',
+      renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -18489,13 +18493,19 @@ var Methods = {
     var id = this.id,
       customConfig = this.customConfig,
       customOpts = this.customOpts;
-    var storage = customOpts.storage;
+    var storage = customOpts.storage,
+      restoreStore = customOpts.restoreStore;
     var isAllStorage = storage === true;
     var storageOpts = isAllStorage ? {} : Object.assign({}, storage || {});
     var isCustomResizable = isAllStorage || storageOpts.resizable;
     var isCustomVisible = isAllStorage || storageOpts.visible;
     var isCustomFixed = isAllStorage || storageOpts.fixed;
     var isCustomSort = isAllStorage || storageOpts.sort;
+    if (storage && id && restoreStore) {
+      restoreStore({
+        id: id
+      });
+    }
     if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       var customMap = {};
       if (!id) {
@@ -23480,7 +23490,10 @@ function handleUupdateResize(_vm) {
         activeBtn: false,
         activeWrapper: false,
         visible: false,
-        maxHeight: 0
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
       },
       // 当前选中的筛选列
       filterStore: {
@@ -34608,6 +34621,8 @@ var Validator = VxeTableValidatorModule;
 ;// CONCATENATED MODULE: ./packages/custom/src/mixin.js
 
 
+
+
 /* harmony default export */ var custom_src_mixin = ({
   methods: {
     _openCustom: function _openCustom() {
@@ -34615,9 +34630,25 @@ var Validator = VxeTableValidatorModule;
       var initStore = this.initStore,
         customStore = this.customStore,
         collectColumn = this.collectColumn;
+      var sortMaps = {};
+      var fixedMaps = {};
+      var visibleMaps = {};
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
+        var 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;
+      this.customColumnList = collectColumn.slice(0);
       customStore.visible = true;
       initStore.custom = true;
-      this.customColumnList = collectColumn.slice(0);
       this.checkCustomStatus();
       this.calcMaxHeight();
       return this.$nextTick().then(function () {
@@ -34735,15 +34766,18 @@ function updateDropHint(_vm, evnt) {
     dragHintEl.style.left = "".concat(Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x), "px");
   }
 }
-function renderSimplePanel(h, _vm) {
-  var $xetable = _vm.$xetable,
+var renderSimplePanel = function renderSimplePanel(h, _vm) {
+  var _e = _vm._e,
+    $xetable = _vm.$xetable,
     customStore = _vm.customStore;
-  var customOpts = $xetable.customOpts,
-    customColumnList = $xetable.customColumnList,
+  var customColumnList = $xetable.customColumnList,
+    customOpts = $xetable.customOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var maxHeight = customStore.maxHeight;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod,
+    allowSort = customOpts.allowSort,
+    allowFixed = customOpts.allowFixed,
     trigger = customOpts.trigger;
   var colVNs = [];
   var customWrapperOns = {};
@@ -34757,7 +34791,7 @@ function renderSimplePanel(h, _vm) {
       column: column
     }) : true;
     if (isVisible) {
-      var isChecked = column.visible;
+      var isChecked = column.renderVisible;
       var isIndeterminate = column.halfVisible;
       var isColGroup = column.children && column.children.length;
       var colTitle = panel_formatText(column.getTitle(), 1);
@@ -34766,16 +34800,26 @@ function renderSimplePanel(h, _vm) {
       }) : false;
       colVNs.push(h('li', {
         key: column.id,
+        attrs: {
+          colid: column.id
+        },
         class: ['vxe-table-custom--option', "level--".concat(column.level), {
           'is--group': isColGroup
-        }]
+        }],
+        on: {
+          dragstart: _vm.sortDragstartEvent,
+          dragend: _vm.sortDragendEvent,
+          dragover: _vm.sortDragoverEvent
+        }
       }, [h('div', {
-        title: colTitle,
         class: ['vxe-table-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
+        attrs: {
+          title: conf.i18n('vxe.custom.setting.colVisible')
+        },
         on: {
           click: function click() {
             if (!isDisabled) {
@@ -34785,17 +34829,33 @@ function renderSimplePanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      }), h('span', {
-        class: 'vxe-checkbox--label'
-      }, colTitle)]), !parent && customOpts.allowFixed ? h('div', {
+      })]), allowSort && column.level === 1 ? h('div', {
+        class: 'vxe-table-custom--sort-option'
+      }, [h('span', {
+        class: 'vxe-table-custom--sort-btn',
+        attrs: {
+          title: conf.i18n('vxe.custom.setting.sortHelpTip')
+        },
+        on: {
+          mousedown: _vm.sortMousedownEvent,
+          mouseup: _vm.sortMouseupEvent
+        }
+      }, [h('i', {
+        class: conf.icon.TABLE_CUSTOM_SORT
+      })])]) : _e(), h('div', {
+        class: 'vxe-table-custom--checkbox-label',
+        attrs: {
+          title: colTitle
+        }
+      }, colTitle), !parent && allowFixed ? h('div', {
         class: 'vxe-table-custom--fixed-option'
       }, [h('span', {
-        class: ['vxe-table-custom--fixed-left-option', column.fixed === 'left' ? conf.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
-          'is--checked': column.fixed === 'left',
-          'is--disabled': isMaxFixedColumn && !column.fixed
+        class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? conf.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : conf.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
+          'is--checked': column.renderFixed === 'left',
+          'is--disabled': isMaxFixedColumn && !column.renderFixed
         }],
         attrs: {
-          title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
+          title: conf.i18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
           click: function click() {
@@ -34803,19 +34863,19 @@ function renderSimplePanel(h, _vm) {
           }
         }
       }), h('span', {
-        class: ['vxe-table-custom--fixed-right-option', column.fixed === 'right' ? conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
-          'is--checked': column.fixed === 'right',
-          'is--disabled': isMaxFixedColumn && !column.fixed
+        class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
+          'is--checked': column.renderFixed === 'right',
+          'is--disabled': isMaxFixedColumn && !column.renderFixed
         }],
         attrs: {
-          title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
+          title: conf.i18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
           click: function click() {
             _vm.changeFixedOption(column, 'right');
           }
         }
-      })]) : null]));
+      })]) : _e()]));
     }
   });
   var isAllChecked = customStore.isAll;
@@ -34825,7 +34885,7 @@ function renderSimplePanel(h, _vm) {
     class: ['vxe-table-custom-wrapper', {
       'is--active': customStore.visible
     }]
-  }, [h('ul', {
+  }, customStore.visible ? [h('ul', {
     class: 'vxe-table-custom--header'
   }, [h('li', {
     class: 'vxe-table-custom--option'
@@ -34844,34 +34904,52 @@ function renderSimplePanel(h, _vm) {
     class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
+  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('div', {
+    ref: 'bodyElemRef',
+    class: 'vxe-table-custom--list-wrapper'
+  }, [h('transition-group', {
     class: 'vxe-table-custom--body',
+    props: {
+      name: 'vxe-table-custom--list',
+      tag: 'ul'
+    },
     style: maxHeight ? {
       maxHeight: "".concat(maxHeight, "px")
     } : {},
     on: customWrapperOns
-  }, colVNs), customOpts.showFooter ? h('div', {
+  }, colVNs), h('div', {
+    ref: 'dragHintElemRef',
+    class: 'vxe-table-custom-popup--drag-hint'
+  }, conf.i18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
   }, [h('button', {
     class: 'btn--reset',
     on: {
       click: _vm.resetCustomEvent
     }
-  }, customOpts.resetButtonText || conf.i18n('vxe.toolbar.customRestore')), h('button', {
+  }, customOpts.resetButtonText || conf.i18n('vxe.table.customRestore')), customOpts.immediate ? _e() : h('button', {
+    class: 'btn--cancel',
+    on: {
+      click: _vm.cancelCustomEvent
+    }
+  }, customOpts.resetButtonText || conf.i18n('vxe.table.customCancel')), h('button', {
     class: 'btn--confirm',
     on: {
       click: _vm.confirmCustomEvent
     }
-  }, customOpts.confirmButtonText || conf.i18n('vxe.toolbar.customConfirm'))]) : null]);
-}
-function renderPopupPanel(h, _vm) {
-  var $xetable = _vm.$xetable,
+  }, customOpts.confirmButtonText || conf.i18n('vxe.table.customConfirm'))]) : null] : []);
+};
+var renderPopupPanel = function renderPopupPanel(h, _vm) {
+  var _e = _vm._e,
+    $xetable = _vm.$xetable,
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
     customColumnList = $xetable.customColumnList,
     columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var checkMethod = customOpts.checkMethod,
+  var allowSort = customOpts.allowSort,
+    allowFixed = customOpts.allowFixed,
+    checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
   var trVNs = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
@@ -34879,7 +34957,7 @@ function renderPopupPanel(h, _vm) {
       column: column
     }) : true;
     if (isVisible) {
-      var isChecked = column.visible;
+      var isChecked = column.renderVisible;
       var isIndeterminate = column.halfVisible;
       var colTitle = panel_formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
@@ -34888,35 +34966,18 @@ function renderPopupPanel(h, _vm) {
       }) : false;
       trVNs.push(h('tr', {
         key: column.id,
-        class: ["vxe-table-custom-popup--row level--".concat(column.level), {
-          'is--group': isColGroup
-        }],
         attrs: {
           colid: column.id
         },
+        class: ["vxe-table-custom-popup--row level--".concat(column.level), {
+          'is--group': isColGroup
+        }],
         on: {
           dragstart: _vm.sortDragstartEvent,
           dragend: _vm.sortDragendEvent,
           dragover: _vm.sortDragoverEvent
         }
       }, [h('td', {
-        class: 'vxe-table-custom-popup--column-item col--sort'
-      }, [column.level === 1 ? h('span', {
-        class: 'vxe-table-custom-popup--column-sort-btn',
-        on: {
-          mousedown: _vm.sortMousedownEvent,
-          mouseup: _vm.sortMouseupEvent
-        }
-      }, [h('i', {
-        class: 'vxe-icon-sort'
-      })]) : null]), h('td', {
-        class: 'vxe-table-custom-popup--column-item col--name'
-      }, [h('div', {
-        class: 'vxe-table-custom-popup--name',
-        attrs: {
-          title: colTitle
-        }
-      }, colTitle)]), h('td', {
         class: 'vxe-table-custom-popup--column-item col--visible'
       }, [h('div', {
         class: ['vxe-table-custom--checkbox-option', {
@@ -34924,6 +34985,9 @@ function renderPopupPanel(h, _vm) {
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
+        attrs: {
+          title: conf.i18n('vxe.custom.setting.colVisible')
+        },
         on: {
           click: function click() {
             if (!isDisabled) {
@@ -34933,11 +34997,31 @@ function renderPopupPanel(h, _vm) {
         }
       }, [h('span', {
         class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
-      })])]), h('td', {
+      })])]), allowSort ? h('td', {
+        class: 'vxe-table-custom-popup--column-item col--sort'
+      }, [column.level === 1 ? h('span', {
+        class: 'vxe-table-custom-popup--column-sort-btn',
+        attrs: {
+          title: conf.i18n('vxe.custom.setting.sortHelpTip')
+        },
+        on: {
+          mousedown: _vm.sortMousedownEvent,
+          mouseup: _vm.sortMouseupEvent
+        }
+      }, [h('i', {
+        class: conf.icon.TABLE_CUSTOM_SORT
+      })]) : null]) : _e(), h('td', {
+        class: 'vxe-table-custom-popup--column-item col--name'
+      }, [h('div', {
+        class: 'vxe-table-custom-popup--name',
+        attrs: {
+          title: colTitle
+        }
+      }, colTitle)]), allowFixed ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--fixed'
-      }, [!parent && customOpts.allowFixed ? h('vxe-radio-group', {
+      }, [!parent ? h('vxe-radio-group', {
         props: {
-          value: column.fixed || '',
+          value: column.renderFixed || '',
           type: 'button',
           size: 'mini',
           options: [{
@@ -34955,21 +35039,22 @@ function renderPopupPanel(h, _vm) {
         },
         on: {
           input: function input(value) {
-            column.fixed = value;
-          },
-          change: function change() {
-            _vm.changePopupFixedOption(column);
-          }
+            column.renderFixed = value;
+          } // onChange () {
+          //   changePopupFixedOption(column)
+          // }
         }
-      }) : null])]));
+      }) : null]) : _e()]));
     }
   });
+  var isAllChecked = customStore.isAll;
+  var isAllIndeterminate = customStore.isIndeterminate;
   return h('vxe-modal', {
     key: 'popup',
     props: {
+      className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
       value: customStore.visible,
       title: conf.i18n('vxe.custom.cstmTitle'),
-      className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
       width: '40vw',
       minWidth: 520,
       height: '50vh',
@@ -34997,20 +35082,39 @@ function renderPopupPanel(h, _vm) {
           style: {
             width: '80px'
           }
-        }), h('col'), h('col', {
+        }), allowSort ? h('col', {
           style: {
             width: '80px'
           }
-        }), h('col', {
+        }) : _e(), h('col', {
+          style: {
+            minWidth: '120px'
+          }
+        }), allowFixed ? h('col', {
           style: {
             width: '200px'
           }
-        })]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
+        }) : _e()]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('div', {
+          class: ['vxe-table-custom--checkbox-option', {
+            'is--checked': isAllChecked,
+            'is--indeterminate': isAllIndeterminate
+          }],
+          attrs: {
+            title: conf.i18n('vxe.table.allTitle')
+          },
+          on: {
+            click: _vm.allCustomEvent
+          }
+        }, [h('span', {
+          class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
+        }), h('span', {
+          class: 'vxe-checkbox--label'
+        }, conf.i18n('vxe.toolbar.customAll'))])]), allowSort ? h('th', {}, [h('span', {
           class: 'vxe-table-custom-popup--table-sort-help-title'
         }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
           props: {
             enterable: true,
-            content: '点击并拖动图标可以调整列的排序'
+            content: conf.i18n('vxe.custom.setting.sortHelpTip')
           },
           scopedSlots: {
             default: function _default() {
@@ -35019,7 +35123,7 @@ function renderPopupPanel(h, _vm) {
               });
             }
           }
-        })]), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), h('th', {}, conf.i18n('vxe.custom.setting.colVisible')), h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
+        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -35038,7 +35142,7 @@ function renderPopupPanel(h, _vm) {
             content: customOpts.resetButtonText || conf.i18n('vxe.custom.cstmRestore')
           },
           on: {
-            click: _vm.resetPopupCustomEvent
+            click: _vm.resetCustomEvent
           }
         }), h('vxe-button', {
           props: {
@@ -35059,7 +35163,7 @@ function renderPopupPanel(h, _vm) {
       }
     }
   });
-}
+};
 /* harmony default export */ var custom_src_panel = ({
   name: 'VxeTableCustomPanel',
   props: {
@@ -35106,23 +35210,66 @@ function renderPopupPanel(h, _vm) {
         }
       }, 300);
     },
+    getStoreData: function getStoreData() {
+      return {};
+    },
+    handleSaveStore: function handleSaveStore(type) {
+      var $xetable = this.$xetable;
+      var id = $xetable.id,
+        customOpts = $xetable.customOpts;
+      var storage = customOpts.storage,
+        updateStore = customOpts.updateStore;
+      if (storage && id && updateStore) {
+        updateStore({
+          id: id,
+          type: type,
+          storeData: this.getStoreData()
+        });
+      }
+    },
     confirmCustomEvent: function confirmCustomEvent(evnt) {
       var $xetable = this.$xetable;
+      var customColumnList = $xetable.customColumnList;
+      customColumnList.forEach(function (column, index) {
+        var sortIndex = index + 1;
+        column.renderSortNumber = sortIndex;
+        column.fixed = column.renderFixed;
+        column.visible = column.renderVisible;
+      });
       $xetable.closeCustom();
       $xetable.emitCustomEvent('confirm', evnt);
+      this.handleSaveStore('confirm');
     },
     cancelCustomEvent: function cancelCustomEvent(evnt) {
       var $xetable = this.$xetable;
+      var customStore = $xetable.customStore,
+        customColumnList = $xetable.customColumnList;
+      var oldSortMaps = customStore.oldSortMaps,
+        oldFixedMaps = customStore.oldFixedMaps,
+        oldVisibleMaps = customStore.oldVisibleMaps;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column) {
+        var colid = column.getKey();
+        var visible = !!oldVisibleMaps[colid];
+        var fixed = oldFixedMaps[colid] || '';
+        column.renderVisible = visible;
+        column.visible = visible;
+        column.renderFixed = fixed;
+        column.fixed = fixed;
+        column.renderSortNumber = oldSortMaps[colid] || 0;
+      }, {
+        children: 'children'
+      });
       $xetable.closeCustom();
       $xetable.emitCustomEvent('cancel', evnt);
     },
-    resetCustomEvent: function resetCustomEvent(evnt) {
+    handleResetCustomEvent: function handleResetCustomEvent(evnt) {
       var $xetable = this.$xetable;
       $xetable.resetColumn(true);
       $xetable.closeCustom();
       $xetable.emitCustomEvent('reset', evnt);
+      this.handleSaveStore('confirm');
     },
-    resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
+    resetCustomEvent: function resetCustomEvent(evnt) {
       var _this = this;
       if (v_x_e_table.modal) {
         v_x_e_table.modal.confirm({
@@ -35131,7 +35278,23 @@ function renderPopupPanel(h, _vm) {
           escClosable: true
         }).then(function (type) {
           if (type === 'confirm') {
-            _this.resetCustomEvent(evnt);
+            _this.handleResetCustomEvent(evnt);
+          }
+        });
+      } else {
+        this.handleResetCustomEvent(evnt);
+      }
+    },
+    resetPopupCustomEvent: function resetPopupCustomEvent(evnt) {
+      var _this2 = this;
+      if (v_x_e_table.modal) {
+        v_x_e_table.modal.confirm({
+          content: conf.i18n('vxe.custom.cstmConfirmRestore'),
+          className: 'vxe-table--ignore-clear',
+          escClosable: true
+        }).then(function (type) {
+          if (type === 'confirm') {
+            _this2.resetCustomEvent(evnt);
           }
         });
       } else {
@@ -35160,9 +35323,9 @@ function renderPopupPanel(h, _vm) {
     changeCheckboxOption: function changeCheckboxOption(column) {
       var $xetable = this.$xetable;
       var customOpts = $xetable.customOpts;
-      var isChecked = !column.visible;
+      var isChecked = !column.renderVisible;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (item) {
-        item.visible = isChecked;
+        item.renderVisible = isChecked;
         item.halfVisible = false;
       });
       this.handleOptionCheck(column);
@@ -35174,21 +35337,23 @@ function renderPopupPanel(h, _vm) {
     changeFixedOption: function changeFixedOption(column, colFixed) {
       var $xetable = this.$xetable;
       var isMaxFixedColumn = $xetable.isMaxFixedColumn;
-      if (column.fixed === colFixed) {
-        $xetable.clearColumnFixed(column);
+      if (column.renderFixed === colFixed) {
+        column.renderFixed = '';
+        // $xeTable.clearColumnFixed(column)
       } else {
-        if (!isMaxFixedColumn || column.fixed) {
-          $xetable.setColumnFixed(column, colFixed);
+        if (!isMaxFixedColumn || column.renderFixed) {
+          column.renderFixed = colFixed;
+          // $xeTable.setColumnFixed(column, colFixed)
         }
       }
     },
-    changePopupFixedOption: function changePopupFixedOption(column) {
-      var $xetable = this.$xetable;
-      var isMaxFixedColumn = $xetable.isMaxFixedColumn;
-      if (!isMaxFixedColumn) {
-        $xetable.setColumnFixed(column, column.fixed);
-      }
-    },
+    // changePopupFixedOption  (column) {
+    //   const { $xetable } = this
+    //   const { isMaxFixedColumn } = $xetable
+    //   if (!isMaxFixedColumn) {
+    //     $xetable.setColumnFixed(column, column.fixed)
+    //   }
+    // },
     allCustomEvent: function allCustomEvent() {
       var $xetable = this.$xetable,
         customStore = this.customStore;
@@ -35200,7 +35365,7 @@ function renderPopupPanel(h, _vm) {
         if (!checkMethod || checkMethod({
           column: column
         })) {
-          column.visible = isAll;
+          column.renderVisible = isAll;
           column.halfVisible = false;
         }
       });
@@ -35279,8 +35444,6 @@ function renderPopupPanel(h, _vm) {
       }
       panel_removeClass(trEl, 'active--drag-target');
       panel_removeClass(trEl, 'active--drag-origin');
-      // 更新顺序
-      this.updateColumnSort();
     },
     sortDragoverEvent: function sortDragoverEvent(evnt) {
       var $xetable = this.$xetable,
@@ -35301,15 +35464,6 @@ function renderPopupPanel(h, _vm) {
         this.prevDropTrEl = trEl;
       }
       updateDropHint(this, evnt);
-    },
-    updateColumnSort: function updateColumnSort() {
-      var $xetable = this.$xetable;
-      var customColumnList = $xetable.customColumnList;
-      // 更新顺序
-      customColumnList.forEach(function (column, index) {
-        var sortIndex = index + 1;
-        column.renderSortNumber = sortIndex;
-      });
     }
   }
 });
@@ -37605,7 +37759,7 @@ var Toolbar = VxeToolbar;
     renderEnd: function renderEnd(h) {
       return h('button', {
         class: ['vxe-pager--prev-btn', {
-          'is--disabled': this.currentPage <= 1
+          'is--disabled': this.currentPage >= this.pageCount
         }],
         attrs: {
           type: 'button',
@@ -42044,7 +42198,8 @@ var Pulldown = VxePulldown;
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '重置',
+      customCancel: '取消',
+      customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
     },
     grid: {