vxe-table 4.7.4 → 4.7.6

package/lib/index.umd.js

@@ -1791,8 +1791,8 @@ var 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_default = /*#__PURE__*/__webpack_require__.n(external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_);
 ;// 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.4";
-external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.4";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.version = "4.7.6";
+external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.tableVersion = "4.7.6";
 external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -1848,6 +1848,7 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
     // },
     customConfig: {
       allowFixed: true,
+      allowSort: true,
       showFooter: true
       //  storage: false,
       //  checkMethod () {}
@@ -2005,6 +2006,7 @@ external_root_VxeUI_commonjs_vxe_pc_ui_commonjs2_vxe_pc_ui_amd_vxe_pc_ui_.VxeUI.
   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',
@@ -2361,6 +2363,8 @@ class ColumnInfo {
       // 列排序
       sortNumber: 0,
       renderSortNumber: 0,
+      renderFixed: '',
+      renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -6399,6 +6403,7 @@ const {
   setup(props) {
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', {});
     const {
+      props: tableProps,
       reactData
     } = $xeTable;
     const {
@@ -6425,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'),
@@ -6451,11 +6509,11 @@ const {
           escClosable: true
         }).then(type => {
           if (type === 'confirm') {
-            resetCustomEvent(evnt);
+            handleResetCustomEvent(evnt);
           }
         });
       } else {
-        resetCustomEvent(evnt);
+        handleResetCustomEvent(evnt);
       }
     };
     const handleOptionCheck = column => {
@@ -6468,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);
@@ -6489,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
@@ -6519,7 +6579,7 @@ const {
         if (!checkMethod || checkMethod({
           column
         })) {
-          column.visible = isAll;
+          column.renderVisible = isAll;
           column.halfVisible = false;
         }
       });
@@ -6554,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
@@ -6603,8 +6653,6 @@ const {
       }
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
-      // 更新顺序
-      updateColumnSort();
     };
     const sortDragoverEvent = evnt => {
       const trEl = evnt.currentTarget;
@@ -6652,6 +6700,8 @@ const {
       const {
         checkMethod,
         visibleMethod,
+        allowSort,
+        allowFixed,
         trigger
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
@@ -6667,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);
@@ -6676,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);
@@ -6693,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;
@@ -6726,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'
@@ -6741,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 {
@@ -6766,6 +6843,8 @@ const {
       } = reactData;
       const customOpts = computeCustomOpts.value;
       const {
+        allowSort,
+        allowFixed,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -6777,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;
@@ -6794,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', {
@@ -6814,6 +6880,7 @@ const {
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
+            title: panel_getI18n('vxe.custom.setting.colVisible'),
             onClick: () => {
               if (!isDisabled) {
                 changeCheckboxOption(column);
@@ -6821,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: [{
@@ -6840,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',
@@ -6877,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,
@@ -6896,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'
@@ -6912,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
@@ -7960,7 +8058,10 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
         activeBtn: false,
         activeWrapper: false,
         visible: false,
-        maxHeight: 0
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
       },
       customColumnList: [],
       // 当前选中的筛选列
@@ -8734,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 || {});
@@ -8742,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) {
@@ -14017,11 +14124,9 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
             columnWidthStorage = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
             // 排序只支持一级
             collectColumn.forEach(column => {
-              if (column.sortNumber !== column.renderSortNumber) {
-                const colKey = column.getKey();
-                if (colKey) {
-                  columnWidthStorage[colKey] = column.renderSortNumber;
-                }
+              const colKey = column.getKey();
+              if (colKey) {
+                columnWidthStorage[colKey] = column.renderSortNumber;
               }
             });
           }
@@ -19239,6 +19344,25 @@ export_hook_hooks.add('tableExportModule', {
           }
         });
       },
+      getPrintHtml(options) {
+        const printOpts = computePrintOpts.value;
+        const opts = Object.assign({
+          original: false
+          // beforePrintMethod
+        }, printOpts, options, {
+          type: 'html',
+          download: false,
+          remote: false,
+          print: true
+        });
+        return exportMethods.exportData(opts).then(({
+          content
+        }) => {
+          return {
+            html: content
+          };
+        });
+      },
       openImport(options) {
         const {
           treeConfig,
@@ -20368,6 +20492,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) {
@@ -20409,9 +20534,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());
@@ -20484,7 +20628,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;
@@ -21440,7 +21584,7 @@ const {
       customStore.activeBtn = false;
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
-          $xeTable.customColseEvent($event);
+          $xeTable.customCloseEvent($event);
         }
       }, 350);
     };