vxe-table 4.7.4 → 4.7.5

package/lib/table/module/custom/panel.js

@@ -25,6 +25,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
   setup(props) {
     const $xeTable = (0, _vue.inject)('$xeTable', {});
     const {
+      props: tableProps,
       reactData
     } = $xeTable;
     const {
@@ -51,25 +52,78 @@ var _default = exports.default = (0, _vue.defineComponent)({
       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;
+      _xeUtils.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 (_ui.VxeUI.modal) {
         _ui.VxeUI.modal.confirm({
           content: getI18n('vxe.custom.cstmConfirmRestore'),
@@ -77,11 +131,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
           escClosable: true
         }).then(type => {
           if (type === 'confirm') {
-            resetCustomEvent(evnt);
+            handleResetCustomEvent(evnt);
           }
         });
       } else {
-        resetCustomEvent(evnt);
+        handleResetCustomEvent(evnt);
       }
     };
     const handleOptionCheck = column => {
@@ -94,17 +148,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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;
       _xeUtils.default.eachTree([column], item => {
-        item.visible = isChecked;
+        item.renderVisible = isChecked;
         item.halfVisible = false;
       });
       handleOptionCheck(column);
@@ -115,20 +169,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     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
@@ -145,7 +201,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!checkMethod || checkMethod({
           column
         })) {
-          column.visible = isAll;
+          column.renderVisible = isAll;
           column.halfVisible = false;
         }
       });
@@ -180,16 +236,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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
@@ -229,8 +275,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
       (0, _dom.removeClass)(trEl, 'active--drag-target');
       (0, _dom.removeClass)(trEl, 'active--drag-origin');
-      // 更新顺序
-      updateColumnSort();
     };
     const sortDragoverEvent = evnt => {
       const trEl = evnt.currentTarget;
@@ -278,6 +322,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         checkMethod,
         visibleMethod,
+        allowSort,
+        allowFixed,
         trigger
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
@@ -293,7 +339,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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 = (0, _utils.formatText)(column.getTitle(), 1);
@@ -302,16 +348,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }) : false;
           colVNs.push((0, _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, _vue.h)('div', {
-            title: colTitle,
             class: ['vxe-table-custom--checkbox-option', {
               'is--checked': isChecked,
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
+            title: getI18n('vxe.custom.setting.colVisible'),
             onClick: () => {
               if (!isDisabled) {
                 changeCheckboxOption(column);
@@ -319,29 +369,39 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           }, [(0, _vue.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-          }), (0, _vue.h)('span', {
-            class: 'vxe-checkbox--label'
-          }, colTitle)]), !parent && customOpts.allowFixed ? (0, _vue.h)('div', {
+          })]), allowSort && column.level === 1 ? (0, _vue.h)('div', {
+            class: 'vxe-table-custom--sort-option'
+          }, [(0, _vue.h)('span', {
+            class: 'vxe-table-custom--sort-btn',
+            title: getI18n('vxe.custom.setting.sortHelpTip'),
+            onMousedown: sortMousedownEvent,
+            onMouseup: sortMouseupEvent
+          }, [(0, _vue.h)('i', {
+            class: getIcon().TABLE_CUSTOM_SORT
+          })])]) : (0, _vue.createCommentVNode)(), (0, _vue.h)('div', {
+            class: 'vxe-table-custom--checkbox-label',
+            title: colTitle
+          }, colTitle), !parent && allowFixed ? (0, _vue.h)('div', {
             class: 'vxe-table-custom--fixed-option'
           }, [(0, _vue.h)('span', {
-            class: ['vxe-table-custom--fixed-left-option', column.fixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : 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' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT, {
+              'is--checked': column.renderFixed === 'left',
+              'is--disabled': isMaxFixedColumn && !column.renderFixed
             }],
-            title: getI18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
+            title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'),
             onClick: () => {
               changeFixedOption(column, 'left');
             }
           }), (0, _vue.h)('span', {
-            class: ['vxe-table-custom--fixed-right-option', column.fixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : 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' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT, {
+              'is--checked': column.renderFixed === 'right',
+              'is--disabled': isMaxFixedColumn && !column.renderFixed
             }],
-            title: getI18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
+            title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'),
             onClick: () => {
               changeFixedOption(column, 'right');
             }
-          })]) : null]));
+          })]) : (0, _vue.createCommentVNode)()]));
         }
       });
       const isAllChecked = customStore.isAll;
@@ -352,7 +412,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         class: ['vxe-table-custom-wrapper', {
           'is--active': customStore.visible
         }]
-      }, [(0, _vue.h)('ul', {
+      }, customStore.visible ? [(0, _vue.h)('ul', {
         class: 'vxe-table-custom--header'
       }, [(0, _vue.h)('li', {
         class: 'vxe-table-custom--option'
@@ -367,20 +427,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
         class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
       }), (0, _vue.h)('span', {
         class: 'vxe-checkbox--label'
-      }, getI18n('vxe.toolbar.customAll'))])])]), (0, _vue.h)('ul', Object.assign({
+      }, getI18n('vxe.toolbar.customAll'))])])]), (0, _vue.h)('div', {
+        ref: bodyElemRef,
+        class: 'vxe-table-custom--list-wrapper'
+      }, [(0, _vue.h)(_vue.TransitionGroup, Object.assign({
         class: 'vxe-table-custom--body',
+        name: 'vxe-table-custom--list',
+        tag: 'ul',
         style: maxHeight ? {
           maxHeight: `${maxHeight}px`
         } : {}
-      }, customWrapperOns), colVNs), customOpts.showFooter ? (0, _vue.h)('div', {
+      }, customWrapperOns), {
+        default: () => colVNs
+      }), (0, _vue.h)('div', {
+        ref: dragHintElemRef,
+        class: 'vxe-table-custom-popup--drag-hint'
+      }, getI18n('vxe.custom.cstmDragTarget', [dragColumn.value ? dragColumn.value.getTitle() : '']))]), customOpts.showFooter ? (0, _vue.h)('div', {
         class: 'vxe-table-custom--footer'
       }, [(0, _vue.h)('button', {
         class: 'btn--reset',
         onClick: resetCustomEvent
-      }, customOpts.resetButtonText || getI18n('vxe.toolbar.customRestore')), (0, _vue.h)('button', {
+      }, customOpts.resetButtonText || getI18n('vxe.table.customRestore')), customOpts.immediate ? (0, _vue.createCommentVNode)() : (0, _vue.h)('button', {
+        class: 'btn--cancel',
+        onClick: cancelCustomEvent
+      }, customOpts.resetButtonText || getI18n('vxe.table.customCancel')), (0, _vue.h)('button', {
         class: 'btn--confirm',
         onClick: confirmCustomEvent
-      }, customOpts.confirmButtonText || getI18n('vxe.toolbar.customConfirm'))]) : null]);
+      }, customOpts.confirmButtonText || getI18n('vxe.table.customConfirm'))]) : null] : []);
     };
     const renderPopupPanel = () => {
       const {
@@ -391,6 +464,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = reactData;
       const customOpts = computeCustomOpts.value;
       const {
+        allowSort,
+        allowFixed,
         checkMethod,
         visibleMethod
       } = customOpts;
@@ -402,7 +477,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           column
         }) : true;
         if (isVisible) {
-          const isChecked = column.visible;
+          const isChecked = column.renderVisible;
           const isIndeterminate = column.halfVisible;
           const colTitle = (0, _utils.formatText)(column.getTitle(), 1);
           const isColGroup = column.children && column.children.length;
@@ -419,19 +494,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
             onDragend: sortDragendEvent,
             onDragover: sortDragoverEvent
           }, [(0, _vue.h)('td', {
-            class: 'vxe-table-custom-popup--column-item col--sort'
-          }, [column.level === 1 ? (0, _vue.h)('span', {
-            class: 'vxe-table-custom-popup--column-sort-btn',
-            onMousedown: sortMousedownEvent,
-            onMouseup: sortMouseupEvent
-          }, [(0, _vue.h)('i', {
-            class: 'vxe-icon-sort'
-          })]) : null]), (0, _vue.h)('td', {
-            class: 'vxe-table-custom-popup--column-item col--name'
-          }, [(0, _vue.h)('div', {
-            class: 'vxe-table-custom-popup--name',
-            title: colTitle
-          }, colTitle)]), (0, _vue.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--visible'
           }, [(0, _vue.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
@@ -439,6 +501,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
+            title: getI18n('vxe.custom.setting.colVisible'),
             onClick: () => {
               if (!isDisabled) {
                 changeCheckboxOption(column);
@@ -446,10 +509,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           }, [(0, _vue.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-          })])]), (0, _vue.h)('td', {
+          })])]), allowSort ? (0, _vue.h)('td', {
+            class: 'vxe-table-custom-popup--column-item col--sort'
+          }, [column.level === 1 ? (0, _vue.h)('span', {
+            class: 'vxe-table-custom-popup--column-sort-btn',
+            title: getI18n('vxe.custom.setting.sortHelpTip'),
+            onMousedown: sortMousedownEvent,
+            onMouseup: sortMouseupEvent
+          }, [(0, _vue.h)('i', {
+            class: getIcon().TABLE_CUSTOM_SORT
+          })]) : null]) : (0, _vue.createCommentVNode)(), (0, _vue.h)('td', {
+            class: 'vxe-table-custom-popup--column-item col--name'
+          }, [(0, _vue.h)('div', {
+            class: 'vxe-table-custom-popup--name',
+            title: colTitle
+          }, colTitle)]), allowFixed ? (0, _vue.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--fixed'
-          }, [!parent && customOpts.allowFixed ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-radio-group'), {
-            modelValue: column.fixed || '',
+          }, [!parent ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-radio-group'), {
+            modelValue: column.renderFixed || '',
             type: 'button',
             size: 'mini',
             options: [{
@@ -465,14 +542,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
               disabled: isMaxFixedColumn
             }],
             'onUpdate:modelValue'(value) {
-              column.fixed = value;
-            },
-            onChange() {
-              changePopupFixedOption(column);
+              column.renderFixed = value;
             }
-          }) : null])]));
+            // onChange () {
+            //   changePopupFixedOption(column)
+            // }
+          }) : null]) : (0, _vue.createCommentVNode)()]));
         }
       });
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
       return (0, _vue.h)((0, _vue.resolveComponent)('vxe-modal'), {
         key: 'popup',
         className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
@@ -502,15 +581,30 @@ var _default = exports.default = (0, _vue.defineComponent)({
             style: {
               width: '80px'
             }
-          }), (0, _vue.h)('col', {}), (0, _vue.h)('col', {
+          }), allowSort ? (0, _vue.h)('col', {
             style: {
               width: '80px'
             }
-          }), (0, _vue.h)('col', {
+          }) : (0, _vue.createCommentVNode)(), (0, _vue.h)('col', {
+            style: {
+              minWidth: '120px'
+            }
+          }), allowFixed ? (0, _vue.h)('col', {
             style: {
               width: '200px'
             }
-          })]), (0, _vue.h)('thead', {}, [(0, _vue.h)('tr', {}, [(0, _vue.h)('th', {}, [(0, _vue.h)('span', {
+          }) : (0, _vue.createCommentVNode)()]), (0, _vue.h)('thead', {}, [(0, _vue.h)('tr', {}, [(0, _vue.h)('th', {}, [(0, _vue.h)('div', {
+            class: ['vxe-table-custom--checkbox-option', {
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
+            }],
+            title: getI18n('vxe.table.allTitle'),
+            onClick: allCustomEvent
+          }, [(0, _vue.h)('span', {
+            class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+          }), (0, _vue.h)('span', {
+            class: 'vxe-checkbox--label'
+          }, getI18n('vxe.toolbar.customAll'))])]), allowSort ? (0, _vue.h)('th', {}, [(0, _vue.h)('span', {
             class: 'vxe-table-custom-popup--table-sort-help-title'
           }, getI18n('vxe.custom.setting.colSort')), (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), {
             enterable: true,
@@ -521,7 +615,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
               });
             }
-          })]), (0, _vue.h)('th', {}, getI18n('vxe.custom.setting.colTitle')), (0, _vue.h)('th', {}, getI18n('vxe.custom.setting.colVisible')), (0, _vue.h)('th', {}, getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), (0, _vue.h)(_vue.TransitionGroup, {
+          })]) : (0, _vue.createCommentVNode)(), (0, _vue.h)('th', {}, getI18n('vxe.custom.setting.colTitle')), allowFixed ? (0, _vue.h)('th', {}, getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0, _vue.createCommentVNode)()])]), (0, _vue.h)(_vue.TransitionGroup, {
             class: 'vxe-table-custom--body',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
@@ -537,7 +631,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             class: 'vxe-table-custom-popup--footer'
           }, [(0, _vue.h)((0, _vue.resolveComponent)('vxe-button'), {
             content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore'),
-            onClick: resetPopupCustomEvent
+            onClick: resetCustomEvent
           }), (0, _vue.h)((0, _vue.resolveComponent)('vxe-button'), {
             content: customOpts.resetButtonText || getI18n('vxe.custom.cstmCancel'),
             onClick: cancelCustomEvent

package/lib/table/module/custom/panel.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getI18n,getIcon}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"TableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},setup(c){const n=(0,_vue.inject)("$xeTable",{}),f=n["reactData"],{computeCustomOpts:C,computeColumnOpts:I,computeIsMaxFixedColumn:T}=n.getComputeMaps(),E=(0,_vue.ref)(),k=(0,_vue.ref)(),B=(0,_vue.ref)(),O=(0,_vue.ref)();let r;const y=e=>{var t=c["customStore"];t.activeWrapper=!0,n.customOpenEvent(e)},A=e=>{const t=c["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||n.customColseEvent(e)},300)},L=e=>{v(),n.closeCustom(),n.emitCustomEvent("confirm",e)},H=e=>{n.closeCustom(),n.emitCustomEvent("cancel",e)},D=e=>{n.resetColumn(!0),n.closeCustom(),n.emitCustomEvent("reset",e)},F=t=>{_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&D(t)}):D(t)},l=t=>{var e=f["customColumnList"],e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e["parent"],e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),l(e))},M=e=>{const t=!e.visible;var o=C.value;_xeUtils.default.eachTree([e],e=>{e.visible=t,e.halfVisible=!1}),l(e),o.immediate&&n.handleCustom(),n.checkCustomStatus()},R=(e,t)=>{var o=T.value;e.fixed===t?n.clearColumnFixed(e):o&&!e.fixed||n.setColumnFixed(e,t)},N=e=>{T.value||n.setColumnFixed(e,e.fixed)},U=()=>{var e=c["customStore"],t=f["customColumnList"];const o=C.value["checkMethod"],l=!e.isAll;_xeUtils.default.eachTree(t,e=>{o&&!o({column:e})||(e.visible=l,e.halfVisible=!1)}),e.isAll=l,n.checkCustomStatus()},V=e=>{var e=e.currentTarget.parentNode.parentNode,t=e.getAttribute("colid"),t=n.getColumnById(t);e.draggable=!0,O.value=t,(0,_dom.addClass)(e,"active--drag-origin")},w=e=>{var e=e.currentTarget.parentNode.parentNode,t=B.value;e.draggable=!1,(O.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},K=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},v=()=>{var e=f["customColumnList"];e.forEach((e,t)=>{e.renderSortNumber=t+1})},S=e=>{var t=f["customColumnList"],e=e.currentTarget,o=B.value;if(r){if(r!==e){var l=r.getAttribute("drag-pos"),s=e.getAttribute("colid");const a=n.getColumnById(s);if(!a)return;var s=_xeUtils.default.findIndexOf(t,e=>e.id===a.id),i=r.getAttribute("colid");const u=n.getColumnById(i);if(!u)return;t.splice(s,1);i=_xeUtils.default.findIndexOf(t,e=>e.id===u.id);t.splice(i+("bottom"===l?1:0),0,a)}r.draggable=!1,r.removeAttribute("drag-pos"),(0,_dom.removeClass)(r,"active--drag-target")}O.value=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),v()},X=e=>{var t=e.currentTarget,o=(r!==t&&(0,_dom.removeClass)(r,"active--drag-target"),t.getAttribute("colid")),o=n.getColumnById(o);o&&1===o.level&&(e.preventDefault(),o=e.clientY-t.getBoundingClientRect().y<t.clientHeight/2?"top":"bottom",(0,_dom.addClass)(t,"active--drag-target"),t.setAttribute("drag-pos",o),r=t);{o=e;var l=B.value,s=k.value;s&&l&&(e=(t=s.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(t.clientHeight-t.scrollTop-l.clientHeight,o.clientY-e.y)+"px",l.style.left=Math.min(t.clientWidth-t.scrollLeft-l.clientWidth-16,o.clientX-e.x)+"px")}};return()=>{if("popup"===C.value.mode){const i=c["customStore"];var e=f["customColumnList"];const r=C.value,{checkMethod:v,visibleMethod:d}=r,a=I.value,m=T.value,p=[];return _xeUtils.default.eachTree(e,(t,e,o,l,s)=>{if(!d||d({column:t})){var i=t.visible,a=t.halfVisible,u=(0,_utils.formatText)(t.getTitle(),1),c=t.children&&t.children.length;const n=!!v&&!v({column:t});p.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":c}],onDragstart:K,onDragend:S,onDragover:X},[(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",{class:"vxe-table-custom-popup--column-sort-btn",onMousedown:V,onMouseup:w},[(0,_vue.h)("i",{class:"vxe-icon-sort"})]):null]),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--name"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--name",title:u},u)]),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--visible"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":n}],onClick:()=>{n||M(t)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[!s&&r.allowFixed?(0,_vue.h)((0,_vue.resolveComponent)("vxe-radio-group"),{modelValue:t.fixed||"",type:"button",size:"mini",options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:m},{label:getI18n("vxe.custom.setting.fixedUnset"),value:""},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:m}],"onUpdate:modelValue"(e){t.fixed=e},onChange(){N(t)}}):null])]))}}),(0,_vue.h)((0,_vue.resolveComponent)("vxe-modal"),{key:"popup",className:"vxe-table-custom-popup-wrapper vxe-table--ignore-clear",modelValue:i.visible,title:getI18n("vxe.custom.cstmTitle"),width:"40vw",minWidth:520,height:"50vh",minHeight:300,mask:!0,lockView:!0,showFooter:!0,resize:!0,escClosable:!0,destroyOnClose:!0,"onUpdate:modelValue"(e){i.visible=e}},{default:()=>(0,_vue.h)("div",{ref:k,class:"vxe-table-custom-popup--body"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-wrapper"},[(0,_vue.h)("table",{},[(0,_vue.h)("colgroup",{},[(0,_vue.h)("col",{style:{width:"80px"}}),(0,_vue.h)("col",{}),(0,_vue.h)("col",{style:{width:"80px"}}),(0,_vue.h)("col",{style:{width:"200px"}})]),(0,_vue.h)("thead",{},[(0,_vue.h)("tr",{},[(0,_vue.h)("th",{},[(0,_vue.h)("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip")},{default:()=>(0,_vue.h)("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})})]),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colTitle")),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colVisible")),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colFixed",[a.maxFixedSize||0]))])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--body",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>p})])]),(0,_vue.h)("div",{ref:B,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[O.value?O.value.getTitle():""]))]),footer:()=>(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{content:r.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:F}),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{content:r.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:H}),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{status:"primary",content:r.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:L})])})}{var e=c["customStore"],t=f["customColumnList"];const x=C.value;var o=e["maxHeight"];const{checkMethod:h,visibleMethod:g,trigger:u}=x,_=T.value,b=[];var l={},t=("hover"===u&&(l.onMouseenter=y,l.onMouseleave=A),_xeUtils.default.eachTree(t,(e,t,o,l,s)=>{if(!g||g({column:e})){var i=e.visible,a=e.halfVisible,u=e.children&&e.children.length,c=(0,_utils.formatText)(e.getTitle(),1);const n=!!h&&!h({column:e});b.push((0,_vue.h)("li",{key:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--group":u}]},[(0,_vue.h)("div",{title:c,class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":n}],onClick:()=>{n||M(e)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},c)]),!s&&x.allowFixed?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[(0,_vue.h)("span",{class:["vxe-table-custom--fixed-left-option","left"===e.fixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.fixed,"is--disabled":_&&!e.fixed}],title:getI18n("left"===e.fixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{R(e,"left")}}),(0,_vue.h)("span",{class:["vxe-table-custom--fixed-right-option","right"===e.fixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.fixed,"is--disabled":_&&!e.fixed}],title:getI18n("right"===e.fixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{R(e,"right")}})]):null]))}}),e.isAll),s=e.isIndeterminate;return(0,_vue.h)("div",{ref:E,key:"simple",class:["vxe-table-custom-wrapper",{"is--active":e.visible}]},[(0,_vue.h)("ul",{class:"vxe-table-custom--header"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":t,"is--indeterminate":s}],title:getI18n("vxe.table.allTitle"),onClick:U},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",s?getIcon().TABLE_CHECKBOX_INDETERMINATE:t?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])])]),(0,_vue.h)("ul",Object.assign({class:"vxe-table-custom--body",style:o?{maxHeight:o+"px"}:{}},l),b),x.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},[(0,_vue.h)("button",{class:"btn--reset",onClick:D},x.resetButtonText||getI18n("vxe.toolbar.customRestore")),(0,_vue.h)("button",{class:"btn--confirm",onClick:L},x.confirmButtonText||getI18n("vxe.toolbar.customConfirm"))]):null]);return}}}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getI18n,getIcon}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"TableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},setup(E){const r=(0,_vue.inject)("$xeTable",{}),{props:s,reactData:B}=r,{computeCustomOpts:k,computeColumnOpts:O,computeIsMaxFixedColumn:V}=r.getComputeMaps(),A=(0,_vue.ref)(),y=(0,_vue.ref)(),L=(0,_vue.ref)(),F=(0,_vue.ref)();let u;const H=e=>{var t=E["customStore"];t.activeWrapper=!0,r.customOpenEvent(e)},D=e=>{const t=E["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||r.customCloseEvent(e)},300)},o=e=>{var t=s["id"],{storage:o,updateStore:l}=k.value;o&&t&&l&&l({id:t,type:e,storeData:{}})},N=e=>{var t=B["customColumnList"];t.forEach((e,t)=>{e.renderSortNumber=t+1,e.fixed=e.renderFixed,e.visible=e.renderVisible}),r.closeCustom(),r.emitCustomEvent("confirm",e),o("confirm")},M=e=>{var t=E["customStore"],o=B["customColumnList"];const{oldSortMaps:s,oldFixedMaps:i,oldVisibleMaps:a}=t;_xeUtils.default.eachTree(o,e=>{var t=e.getKey(),o=!!a[t],l=i[t]||"";e.renderVisible=o,e.visible=o,e.renderFixed=l,e.fixed=l,e.renderSortNumber=s[t]||0},{children:"children"}),r.closeCustom(),r.emitCustomEvent("cancel",e)},l=e=>{r.resetColumn(!0),r.closeCustom(),r.emitCustomEvent("reset",e),o("confirm")},S=t=>{_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&l(t)}):l(t)},i=t=>{var e=B["customColumnList"],e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e["parent"],e.children)&&e.children.length&&(e.renderVisible=e.children.every(e=>e.renderVisible),e.halfVisible=!e.renderVisible&&e.children.some(e=>e.renderVisible||e.halfVisible),i(e))},K=e=>{const t=!e.renderVisible;var o=k.value;_xeUtils.default.eachTree([e],e=>{e.renderVisible=t,e.halfVisible=!1}),i(e),o.immediate&&r.handleCustom(),r.checkCustomStatus()},R=(e,t)=>{var o=V.value;e.renderFixed===t?e.renderFixed="":o&&!e.renderFixed||(e.renderFixed=t)},U=()=>{var e=E["customStore"],t=B["customColumnList"];const o=k.value["checkMethod"],l=!e.isAll;_xeUtils.default.eachTree(t,e=>{o&&!o({column:e})||(e.renderVisible=l,e.halfVisible=!1)}),e.isAll=l,r.checkCustomStatus()},w=e=>{var e=e.currentTarget.parentNode.parentNode,t=e.getAttribute("colid"),t=r.getColumnById(t);e.draggable=!0,F.value=t,(0,_dom.addClass)(e,"active--drag-origin")},X=e=>{var e=e.currentTarget.parentNode.parentNode,t=L.value;e.draggable=!1,(F.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},q=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},W=e=>{var t=B["customColumnList"],e=e.currentTarget,o=L.value;if(u){if(u!==e){var l=u.getAttribute("drag-pos"),s=e.getAttribute("colid");const a=r.getColumnById(s);if(!a)return;var s=_xeUtils.default.findIndexOf(t,e=>e.id===a.id),i=u.getAttribute("colid");const n=r.getColumnById(i);if(!n)return;t.splice(s,1);i=_xeUtils.default.findIndexOf(t,e=>e.id===n.id);t.splice(i+("bottom"===l?1:0),0,a)}u.draggable=!1,u.removeAttribute("drag-pos"),(0,_dom.removeClass)(u,"active--drag-target")}F.value=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin")},j=e=>{var t=e.currentTarget,o=(u!==t&&(0,_dom.removeClass)(u,"active--drag-target"),t.getAttribute("colid")),o=r.getColumnById(o);o&&1===o.level&&(e.preventDefault(),o=e.clientY-t.getBoundingClientRect().y<t.clientHeight/2?"top":"bottom",(0,_dom.addClass)(t,"active--drag-target"),t.setAttribute("drag-pos",o),u=t);{o=e;var l=L.value,s=y.value;s&&l&&(e=(t=s.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(t.clientHeight-t.scrollTop-l.clientHeight,o.clientY-e.y)+"px",l.style.left=Math.min(t.clientWidth-t.scrollLeft-l.clientWidth-16,o.clientX-e.x)+"px")}};return()=>{if("popup"===k.value.mode){const a=E["customStore"];var e=B["customColumnList"];const n=k.value,{allowSort:c,allowFixed:v,checkMethod:d,visibleMethod:m}=n,r=O.value,p=V.value,x=[],u=(_xeUtils.default.eachTree(e,(t,e,o,l,s)=>{if(!m||m({column:t})){var i=t.renderVisible,a=t.halfVisible,n=(0,_utils.formatText)(t.getTitle(),1),r=t.children&&t.children.length;const u=!!d&&!d({column:t});x.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":r}],onDragstart:q,onDragend:W,onDragover:j},[(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--visible"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||K(t)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]),c?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",{class:"vxe-table-custom-popup--column-sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:w,onMouseup:X},[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})]):null]):(0,_vue.createCommentVNode)(),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--name"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--name",title:n},n)]),v?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[s?null:(0,_vue.h)((0,_vue.resolveComponent)("vxe-radio-group"),{modelValue:t.renderFixed||"",type:"button",size:"mini",options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:p},{label:getI18n("vxe.custom.setting.fixedUnset"),value:""},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:p}],"onUpdate:modelValue"(e){t.renderFixed=e}})]):(0,_vue.createCommentVNode)()]))}}),a.isAll),_=a.isIndeterminate;return(0,_vue.h)((0,_vue.resolveComponent)("vxe-modal"),{key:"popup",className:"vxe-table-custom-popup-wrapper vxe-table--ignore-clear",modelValue:a.visible,title:getI18n("vxe.custom.cstmTitle"),width:"40vw",minWidth:520,height:"50vh",minHeight:300,mask:!0,lockView:!0,showFooter:!0,resize:!0,escClosable:!0,destroyOnClose:!0,"onUpdate:modelValue"(e){a.visible=e}},{default:()=>(0,_vue.h)("div",{ref:y,class:"vxe-table-custom-popup--body"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-wrapper"},[(0,_vue.h)("table",{},[(0,_vue.h)("colgroup",{},[(0,_vue.h)("col",{style:{width:"80px"}}),c?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),(0,_vue.h)("col",{style:{minWidth:"120px"}}),v?(0,_vue.h)("col",{style:{width:"200px"}}):(0,_vue.createCommentVNode)()]),(0,_vue.h)("thead",{},[(0,_vue.h)("tr",{},[(0,_vue.h)("th",{},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":u,"is--indeterminate":_}],title:getI18n("vxe.table.allTitle"),onClick:U},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",_?getIcon().TABLE_CHECKBOX_INDETERMINATE:u?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]),c?(0,_vue.h)("th",{},[(0,_vue.h)("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip")},{default:()=>(0,_vue.h)("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})})]):(0,_vue.createCommentVNode)(),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colTitle")),v?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colFixed",[r.maxFixedSize||0])):(0,_vue.createCommentVNode)()])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--body",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>x})])]),(0,_vue.h)("div",{ref:L,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[F.value?F.value.getTitle():""]))]),footer:()=>(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{content:n.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:S}),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{content:n.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:M}),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{status:"primary",content:n.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:N})])})}{var e=E["customStore"],t=B["customColumnList"],o=k.value,l=e["maxHeight"];const{checkMethod:h,visibleMethod:g,allowSort:b,allowFixed:C,trigger:f}=o,T=V.value,I=[];var s={},t=("hover"===f&&(s.onMouseenter=H,s.onMouseleave=D),_xeUtils.default.eachTree(t,(e,t,o,l,s)=>{if(!g||g({column:e})){var i=e.renderVisible,a=e.halfVisible,n=e.children&&e.children.length,r=(0,_utils.formatText)(e.getTitle(),1);const u=!!h&&!h({column:e});I.push((0,_vue.h)("li",{key:e.id,colid:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--group":n}],onDragstart:q,onDragend:W,onDragover:j},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||K(e)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]),b&&1===e.level?(0,_vue.h)("div",{class:"vxe-table-custom--sort-option"},[(0,_vue.h)("span",{class:"vxe-table-custom--sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:w,onMouseup:X},[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):(0,_vue.createCommentVNode)(),(0,_vue.h)("div",{class:"vxe-table-custom--checkbox-label",title:r},r),!s&&C?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[(0,_vue.h)("span",{class:["vxe-table-custom--fixed-left-option","left"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.renderFixed,"is--disabled":T&&!e.renderFixed}],title:getI18n("left"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{R(e,"left")}}),(0,_vue.h)("span",{class:["vxe-table-custom--fixed-right-option","right"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.renderFixed,"is--disabled":T&&!e.renderFixed}],title:getI18n("right"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{R(e,"right")}})]):(0,_vue.createCommentVNode)()]))}}),e.isAll),i=e.isIndeterminate;return(0,_vue.h)("div",{ref:A,key:"simple",class:["vxe-table-custom-wrapper",{"is--active":e.visible}]},e.visible?[(0,_vue.h)("ul",{class:"vxe-table-custom--header"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":t,"is--indeterminate":i}],title:getI18n("vxe.table.allTitle"),onClick:U},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",i?getIcon().TABLE_CHECKBOX_INDETERMINATE:t?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])])]),(0,_vue.h)("div",{ref:y,class:"vxe-table-custom--list-wrapper"},[(0,_vue.h)(_vue.TransitionGroup,Object.assign({class:"vxe-table-custom--body",name:"vxe-table-custom--list",tag:"ul",style:l?{maxHeight:l+"px"}:{}},s),{default:()=>I}),(0,_vue.h)("div",{ref:L,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[F.value?F.value.getTitle():""]))]),o.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},[(0,_vue.h)("button",{class:"btn--reset",onClick:S},o.resetButtonText||getI18n("vxe.table.customRestore")),o.immediate?(0,_vue.createCommentVNode)():(0,_vue.h)("button",{class:"btn--cancel",onClick:M},o.resetButtonText||getI18n("vxe.table.customCancel")),(0,_vue.h)("button",{class:"btn--confirm",onClick:N},o.confirmButtonText||getI18n("vxe.table.customConfirm"))]):null]:[]);return}}}});

package/lib/table/src/columnInfo.js

@@ -134,6 +134,8 @@ class ColumnInfo {
       // 列排序
       sortNumber: 0,
       renderSortNumber: 0,
+      renderFixed: '',
+      renderVisible: false,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,

package/lib/table/src/columnInfo.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getI18n,formats,log}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:l,renderFooter:o,renderData:i}={}){var d,n=e.xegrid,s=r.formatter,a=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(d=["seq","checkbox","radio","expand","html"],r.type&&-1===d.indexOf(r.type)&&log.warn("vxe.error.errProp",["type="+r.type,d.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&log.warn("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&log.warn("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&log.warn("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(d=e["props"],d=d["treeConfig"],e=e.getComputeMaps()["computeTreeOpts"],e=e.value,d)&&(e.showLine||e.line)&&log.err("vxe.error.errConflicts",["tree-config.showLine","column.type=expand"]),s)&&(_xeUtils.default.isString(s)?(d=formats.get(s)||_xeUtils.default[s])&&_xeUtils.default.isFunction(d.cellFormatMethod)||log.err("vxe.error.notFormats",[s]):!_xeUtils.default.isArray(s)||(e=formats.get(s[0])||_xeUtils.default[s[0]])&&_xeUtils.default.isFunction(e.cellFormatMethod)||log.err("vxe.error.notFormats",[s[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:s,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:a,halfVisible:!1,defaultVisible:a,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:l||r.renderCell,renderFooter:o||r.renderFooter,renderData:i,slots:r.slots}),n&&(d=n.getComputeMaps()["computeProxyOpts"],(e=d.value).beforeColumn)&&e.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){return this.field||(this.type?"type="+this.type:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getI18n,formats,log}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:l,renderFooter:o,renderData:i}={}){var d,n=e.xegrid,s=r.formatter,a=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(d=["seq","checkbox","radio","expand","html"],r.type&&-1===d.indexOf(r.type)&&log.warn("vxe.error.errProp",["type="+r.type,d.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&log.warn("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&log.warn("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&log.warn("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(d=e["props"],d=d["treeConfig"],e=e.getComputeMaps()["computeTreeOpts"],e=e.value,d)&&(e.showLine||e.line)&&log.err("vxe.error.errConflicts",["tree-config.showLine","column.type=expand"]),s)&&(_xeUtils.default.isString(s)?(d=formats.get(s)||_xeUtils.default[s])&&_xeUtils.default.isFunction(d.cellFormatMethod)||log.err("vxe.error.notFormats",[s]):!_xeUtils.default.isArray(s)||(e=formats.get(s[0])||_xeUtils.default[s[0]])&&_xeUtils.default.isFunction(e.cellFormatMethod)||log.err("vxe.error.notFormats",[s[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:s,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:a,halfVisible:!1,defaultVisible:a,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:l||r.renderCell,renderFooter:o||r.renderFooter,renderData:i,slots:r.slots}),n&&(d=n.getComputeMaps()["computeProxyOpts"],(e=d.value).beforeColumn)&&e.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){return this.field||(this.type?"type="+this.type:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/table.js

@@ -141,7 +141,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         activeBtn: false,
         activeWrapper: false,
         visible: false,
-        maxHeight: 0
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
       },
       customColumnList: [],
       // 当前选中的筛选列
@@ -913,7 +916,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = props;
       const customOpts = computeCustomOpts.value;
       const {
-        storage
+        storage,
+        restoreStore
       } = customOpts;
       const isAllCustom = storage === true;
       const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
@@ -921,6 +925,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       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) {