vxe-table 4.8.2 → 4.8.5

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.2";
+const version = "4.8.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2228,6 +2228,7 @@ core_.VxeUI.setIcon({
   TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
   TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
   TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
+  TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
   TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
@@ -2387,7 +2388,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.2"}`;
+const log_version = `table v${"4.8.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3364,6 +3365,7 @@ function renderCellDragIcon(params) {
   } = $table.getComputeMaps();
   const dragOpts = computeDragOpts.value;
   const {
+    rowIcon,
     rowDisabledMethod
   } = dragOpts;
   const isDisabled = rowDisabledMethod && rowDisabledMethod(params);
@@ -3379,7 +3381,7 @@ function renderCellDragIcon(params) {
     },
     onMouseup: $table.handleCellDragMouseupEvent
   }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-    class: 'vxe-table-icon-drag-handle'
+    class: rowIcon || cell_getIcon().TABLE_DRAG_ROW
   })]);
 }
 function renderCellBaseVNs(params, content) {
@@ -6703,7 +6705,8 @@ const {
 
 const {
   getI18n: panel_getI18n,
-  getIcon: panel_getIcon
+  getIcon: panel_getIcon,
+  renderEmptyElement: panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var panel = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'TableCustomPanel',
@@ -6755,44 +6758,9 @@ const {
     const confirmCustomEvent = ({
       $event
     }) => {
-      const {
-        customColumnList
-      } = reactData;
-      const customOpts = computeCustomOpts.value;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (parent) {
-          // 更新子列信息
-          column.fixed = parent.fixed;
-        } else {
-          if (allowSort) {
-            const sortIndex = index + 1;
-            column.renderSortNumber = sortIndex;
-          }
-          if (allowFixed) {
-            column.fixed = column.renderFixed;
-          }
-        }
-        if (allowResizable) {
-          if (column.renderVisible && (!column.children || column.children.length)) {
-            if (column.renderResizeWidth !== column.renderWidth) {
-              column.resizeWidth = column.renderResizeWidth;
-              column.renderWidth = column.renderResizeWidth;
-            }
-          }
-        }
-        if (allowVisible) {
-          column.visible = column.renderVisible;
-        }
-      });
+      $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
-      $xeTable.saveCustomStore('confirm');
     };
     const cancelCloseEvent = ({
       $event
@@ -6803,50 +6771,12 @@ const {
     const cancelCustomEvent = ({
       $event
     }) => {
-      const {
-        customStore
-      } = props;
-      const {
-        customColumnList
-      } = reactData;
-      const {
-        oldSortMaps,
-        oldFixedMaps,
-        oldVisibleMaps
-      } = customStore;
-      const customOpts = computeCustomOpts.value;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      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] || '';
-        if (allowVisible) {
-          column.renderVisible = visible;
-          column.visible = visible;
-        }
-        if (allowFixed) {
-          column.renderFixed = fixed;
-          column.fixed = fixed;
-        }
-        if (allowSort) {
-          column.renderSortNumber = oldSortMaps[colid] || 0;
-        }
-        if (allowResizable) {
-          column.renderResizeWidth = column.renderWidth;
-        }
-      }, {
-        children: 'children'
-      });
+      $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
     };
     const handleResetCustomEvent = evnt => {
-      $xeTable.resetColumn(true);
+      $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
     };
@@ -6937,55 +6867,7 @@ const {
       }
     };
     const allOptionEvent = () => {
-      const {
-        customStore
-      } = props;
-      const {
-        customColumnList
-      } = reactData;
-      const customOpts = computeCustomOpts.value;
-      const {
-        checkMethod,
-        visibleMethod
-      } = customOpts;
-      const isAll = !customStore.isAll;
-      if (customOpts.immediate) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.visible = isAll;
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-        $xeTable.handleCustom();
-        $xeTable.saveCustomStore('update:visible');
-      } else {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-      }
-      $xeTable.checkCustomStatus();
+      $xeTable.toggleCustomAllCheckbox();
     };
     const sortMousedownEvent = evnt => {
       const btnEl = evnt.currentTarget;
@@ -6996,6 +6878,7 @@ const {
       trEl.draggable = true;
       dragColumnRef.value = column;
       addClass(trEl, 'active--drag-origin');
+      updateDropHint(evnt);
     };
     const sortMouseupEvent = evnt => {
       const btnEl = evnt.currentTarget;
@@ -7119,13 +7002,29 @@ const {
         placement
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+      const slots = customOpts.slots || {};
+      const headerSlot = slots.header;
+      const topSlot = slots.top;
+      const bottomSlot = slots.bottom;
+      const defaultSlot = slots.default;
+      const footerSlot = slots.footer;
       const colVNs = [];
       const customWrapperOns = {};
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
       // hover 触发
       if (trigger === 'hover') {
         customWrapperOns.onMouseenter = handleWrapperMouseenterEvent;
         customWrapperOns.onMouseleave = handleWrapperMouseleaveEvent;
       }
+      const params = {
+        $table: $xeTable,
+        $grid: $xeTable.xegrid,
+        columns: customColumnList,
+        isAllChecked,
+        isAllIndeterminate
+      };
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({
           column
@@ -7206,9 +7105,6 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
-      const isAllChecked = customStore.isAll;
-      const isAllIndeterminate = customStore.isIndeterminate;
-      const dragColumn = dragColumnRef.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         key: 'simple',
@@ -7218,8 +7114,10 @@ const {
         style: maxHeight && !['left', 'right'].includes(placement) ? {
           maxHeight: `${maxHeight}px`
         } : {}
-      }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+      }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--header'
+      }, headerSlot ? $xeTable.callSlot(headerSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+        class: 'vxe-table-custom--panel-list'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
         class: 'vxe-table-custom--option'
       }, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7235,21 +7133,29 @@ const {
         class: 'vxe-checkbox--label'
       }, panel_getI18n('vxe.toolbar.customAll'))]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, panel_getI18n('vxe.table.customTitle'))])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, panel_getI18n('vxe.table.customTitle'))])])]), (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',
+        class: 'vxe-table-custom--body'
+      }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-top'
+      }, $xeTable.callSlot(topSlot, params)) : panel_renderEmptyElement($xeTable), defaultSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-body'
+      }, $xeTable.callSlot(defaultSlot, params)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+        class: 'vxe-table-custom--panel-list',
         name: 'vxe-table-custom--list',
         tag: 'ul',
         ...customWrapperOns
       }, {
         default: () => colVNs
-      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-bottom'
+      }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), (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 && dragColumn.type !== 'html' ? dragColumn.getTitle() : '']))]), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--footer'
+      }, footerSlot ? $xeTable.callSlot(footerSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--footer-buttons'
       }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
         mode: 'text',
         content: customOpts.resetButtonText || panel_getI18n('vxe.table.customRestore'),
@@ -7267,7 +7173,7 @@ const {
         status: 'primary',
         content: customOpts.confirmButtonText || panel_getI18n('vxe.table.customConfirm'),
         onClick: confirmCustomEvent
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : null] : []);
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]) : null] : []);
     };
     const renderPopupPanel = () => {
       const {
@@ -7297,7 +7203,23 @@ const {
       const modalOpts = Object.assign({}, modalOptions);
       const drawerOpts = Object.assign({}, drawerOptions);
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+      const slots = customOpts.slots || {};
+      const headerSlot = slots.header;
+      const topSlot = slots.top;
+      const bottomSlot = slots.bottom;
+      const defaultSlot = slots.default;
+      const footerSlot = slots.footer;
       const trVNs = [];
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
+      const params = {
+        $table: $xeTable,
+        $grid: $xeTable.xegrid,
+        columns: customColumnList,
+        isAllChecked,
+        isAllIndeterminate
+      };
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({
           column
@@ -7394,36 +7316,28 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
-      const isAllChecked = customStore.isAll;
-      const isAllIndeterminate = customStore.isIndeterminate;
-      const dragColumn = dragColumnRef.value;
       const scopedSlots = {
         default: () => {
+          if (defaultSlot) {
+            return $xeTable.callSlot(defaultSlot, params);
+          }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: bodyElemRef,
             class: 'vxe-table-custom-popup--body'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom-popup--table-top'
+          }, $xeTable.callSlot(topSlot, params)) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--table-wrapper'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {}, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '80px'
-            }
+            class: 'vxe-table-custom-popup--table-col-seq'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '80px'
-            }
+            class: 'vxe-table-custom-popup--table-col-sort'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              minWidth: '120px'
-            }
+            class: 'vxe-table-custom-popup--table-col-title'
           }), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '140px'
-            }
+            class: 'vxe-table-custom-popup--table-col-width'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '200px'
-            }
+            class: 'vxe-table-custom-popup--table-col-fixed'
           }) : (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', {}, [allowVisible ? (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,
@@ -7448,17 +7362,22 @@ const {
               });
             }
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (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')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : (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',
+            class: 'vxe-table-custom--panel-list',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
           }, {
             default: () => trVNs
-          })])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })])]), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom-popup--table-bottom'
+          }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), (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 ? dragColumn.getTitle() : '']))]);
         },
         footer: () => {
+          if (footerSlot) {
+            return $xeTable.callSlot(footerSlot, params);
+          }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--footer'
           }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
@@ -7474,6 +7393,9 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
         }
       };
+      if (headerSlot) {
+        scopedSlots.header = () => $xeTable.callSlot(headerSlot, params);
+      }
       if (mode === 'drawer') {
         return VxeUIDrawerComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIDrawerComponent, {
           key: 'drawer',
@@ -11105,7 +11027,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             $table: $xeTable,
             row
           })).then(childRecords => {
-            rowRest.treeLoaded = true;
+            if (rowRest) {
+              rowRest.treeLoaded = true;
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
             }
@@ -11135,7 +11059,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const {
               treeExpandLazyLoadedMaps
             } = reactData;
-            rowRest.treeLoaded = false;
+            if (rowRest) {
+              rowRest.treeLoaded = false;
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
             }
@@ -12774,38 +12700,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 如果已关联工具栏，则会同步更新
        */
       resetColumn(options) {
-        const {
-          collectColumn
-        } = internalData;
-        const customOpts = computeCustomOpts.value;
-        const {
-          checkMethod
-        } = customOpts;
-        const opts = Object.assign({
-          visible: true,
-          resizable: options === true,
-          fixed: options === true,
-          sort: options === true
-        }, options);
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
-          if (opts.resizable) {
-            column.resizeWidth = 0;
-          }
-          if (opts.fixed) {
-            column.fixed = column.defaultFixed;
-          }
-          if (opts.sort) {
-            column.renderSortNumber = column.sortNumber;
-          }
-          if (!checkMethod || checkMethod({
-            column
-          })) {
-            column.visible = column.defaultVisible;
-          }
-          column.renderResizeWidth = column.renderWidth;
-        });
-        $xeTable.saveCustomStore('reset');
-        return tablePrivateMethods.handleCustom();
+        warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
+        return $xeTable.resetCustom(options);
       },
       /**
        * 刷新列信息
@@ -22126,7 +22022,7 @@ validator_hook_hooks.add('tableValidatorModule', {
 
 
 
-const tableCustomMethodKeys = ['openCustom', 'closeCustom'];
+const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 core_.VxeUI.hooks.add('tableCustomModule', {
   setupTable($xeTable) {
     const {
@@ -22150,7 +22046,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       if (el) {
         tableHeight = el.clientHeight - 28;
       }
-      customStore.maxHeight = Math.max(4, tableHeight);
+      customStore.maxHeight = Math.max(88, tableHeight);
     };
     const openCustom = () => {
       const {
@@ -22197,9 +22093,183 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
+    const saveCustom = () => {
+      const {
+        customColumnList
+      } = reactData;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
+          if (allowSort) {
+            const sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+              column.renderWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
+      });
+      return $xeTable.saveCustomStore('confirm');
+    };
+    const cancelCustom = () => {
+      const {
+        customColumnList,
+        customStore
+      } = reactData;
+      const {
+        oldSortMaps,
+        oldFixedMaps,
+        oldVisibleMaps
+      } = customStore;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      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] || '';
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
+      }, {
+        children: 'children'
+      });
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const setCustomAllCheckbox = checked => {
+      const {
+        customStore
+      } = reactData;
+      const {
+        customColumnList
+      } = reactData;
+      const customOpts = computeCustomOpts.value;
+      const {
+        checkMethod,
+        visibleMethod
+      } = customOpts;
+      const isAll = !!checked;
+      if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.visible = isAll;
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:visible');
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+      }
+      $xeTable.checkCustomStatus();
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     const customMethods = {
       openCustom,
-      closeCustom
+      closeCustom,
+      saveCustom,
+      cancelCustom,
+      resetCustom(options) {
+        const {
+          collectColumn
+        } = internalData;
+        const customOpts = computeCustomOpts.value;
+        const {
+          checkMethod
+        } = customOpts;
+        const opts = Object.assign({
+          visible: true,
+          resizable: options === true,
+          fixed: options === true,
+          sort: options === true
+        }, options);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+          if (opts.resizable) {
+            column.resizeWidth = 0;
+          }
+          if (opts.fixed) {
+            column.fixed = column.defaultFixed;
+          }
+          if (opts.sort) {
+            column.renderSortNumber = column.sortNumber;
+          }
+          if (!checkMethod || checkMethod({
+            column
+          })) {
+            column.visible = column.defaultVisible;
+          }
+          column.renderResizeWidth = column.renderWidth;
+        });
+        $xeTable.saveCustomStore('reset');
+        return $xeTable.handleCustom();
+      },
+      toggleCustomAllCheckbox() {
+        const {
+          customStore
+        } = reactData;
+        const isAll = !customStore.isAll;
+        return setCustomAllCheckbox(isAll);
+      },
+      setCustomAllCheckbox
     };
     const checkCustomStatus = () => {
       const {
@@ -24815,7 +24885,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             $xeTable.openExport(btnParams);
             break;
           case 'reset_custom':
-            return $xeTable.resetColumn(true);
+            return $xeTable.resetCustom(true);
           case '_init':
           case 'reload':
           case 'query':