vxe-table 3.10.3 → 3.10.5

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default={methods:{_openCustom(){var{initStore:e,customStore:t,collectColumn:i}=this;let s={},o={},l={};return _xeUtils.default.eachTree(i,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,o[t]=e.fixed,l[t]=e.visible},{children:"children"}),t.oldSortMaps=s,t.oldFixedMaps=o,t.oldVisibleMaps=l,this.customColumnList=i.slice(0),t.visible=!0,e.custom=!0,this.checkCustomStatus(),this.calcMaxHeight(),this.$nextTick().then(()=>this.calcMaxHeight())},_closeCustom(){var{customStore:e,customOpts:t}=this;return e.visible&&(e.visible=!1,t.immediate||this.handleCustom()),this.$nextTick()},calcMaxHeight(){var{$el:e,customStore:t}=this;let i=0;e&&(i=e.clientHeight-28),t.maxHeight=Math.max(4,i)},checkCustomStatus(){var{customStore:e,collectColumn:t,customOpts:i}=this;let s=i.checkMethod;e.isAll=t.every(e=>!!s&&!s({column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&t.some(e=>(!s||s({column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xegrid||this).$emit("custom",{type:e,$table:this,$grid:this.$xegrid,$event:t})},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),this.emitCustomEvent("close",e)):(t.btnEl=e.target,this.openCustom(),this.emitCustomEvent("open",e))},customOpenEvent(e){var t=this.customStore;t.visible||(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),this.emitCustomEvent("open",e))},customColseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),this.emitCustomEvent("close",e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default={methods:{_openCustom(){var{initStore:e,customStore:t,collectColumn:i}=this;let s={},l={},r={};return _xeUtils.default.eachTree(i,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,l[t]=e.fixed,r[t]=e.visible},{children:"children"}),t.oldSortMaps=s,t.oldFixedMaps=l,t.oldVisibleMaps=r,this.customColumnList=i.slice(0),t.visible=!0,e.custom=!0,this.checkCustomStatus(),this.calcMaxHeight(),this.$nextTick().then(()=>this.calcMaxHeight())},_closeCustom(){var{customStore:e,customOpts:t}=this;return e.visible&&(e.visible=!1,t.immediate||this.handleCustom()),this.$nextTick()},_saveCustom(){var{customOpts:e,customColumnList:t}=this;let{allowVisible:r,allowSort:o,allowFixed:u,allowResizable:d}=e;return _xeUtils.default.eachTree(t,(e,t,i,s,l)=>{l?e.fixed=l.fixed:(o&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),d&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),r&&(e.visible=e.renderVisible)}),this.closeCustom(),this.saveCustomStore("confirm")},_cancelCustom(){var{customStore:e,customOpts:t,customColumnList:i}=this;let{oldSortMaps:l,oldFixedMaps:r,oldVisibleMaps:o}=e,{allowVisible:u,allowSort:d,allowFixed:h,allowResizable:n}=t;return _xeUtils.default.eachTree(i,e=>{var t=e.getKey(),i=!!o[t],s=r[t]||"";u&&(e.renderVisible=i,e.visible=i),h&&(e.renderFixed=s,e.fixed=s),d&&(e.renderSortNumber=l[t]||0),n&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),this.$nextTick()},_resetCustom(e){var{collectColumn:t,customOpts:i}=this;let s=i.checkMethod,l=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e},e);return _xeUtils.default.eachTree(t,e=>{l.resizable&&(e.resizeWidth=0),l.fixed&&(e.fixed=e.defaultFixed),l.sort&&(e.renderSortNumber=e.sortNumber),s&&!s({column:e})||(e.visible=e.defaultVisible),e.renderResizeWidth=e.renderWidth}),this.saveCustomStore("reset"),this.handleCustom()},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){var t=this,i=this.customStore,{customColumnList:s,customOpts:l}=this;let{checkMethod:r,visibleMethod:o}=l,u=!!e;l.immediate?(_xeUtils.default.eachTree(s,e=>{o&&!o({column:e})||r&&!r({column:e})||(e.visible=u,e.renderVisible=u,e.halfVisible=!1)}),i.isAll=u,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(s,e=>{o&&!o({column:e})||r&&!r({column:e})||(e.renderVisible=u,e.halfVisible=!1)}),i.isAll=u),t.checkCustomStatus()},calcMaxHeight(){var{$el:e,customStore:t}=this;let i=0;e&&(i=e.clientHeight-28),t.maxHeight=Math.max(88,i)},checkCustomStatus(){var{customStore:e,collectColumn:t,customOpts:i}=this;let s=i.checkMethod;e.isAll=t.every(e=>!!s&&!s({column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&t.some(e=>(!s||s({column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xegrid||this).$emit("custom",{type:e,$table:this,$grid:this.$xegrid,$event:t})},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),this.emitCustomEvent("close",e)):(t.btnEl=e.target,this.openCustom(),this.emitCustomEvent("open",e))},customOpenEvent(e){var t=this.customStore;t.visible||(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),this.emitCustomEvent("open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),this.emitCustomEvent("close",e))}}};

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

@@ -34,9 +34,9 @@ function updateDropHint(_vm, evnt) {
 }
 const renderSimplePanel = (h, _vm) => {
   const VxeUIButtonComponent = _ui.VxeUI.getComponent('VxeButton');
+  const $xeTable = _vm.$xeTable;
   const {
     _e,
-    $xetable,
     customStore,
     dragColumn
   } = _vm;
@@ -44,7 +44,7 @@ const renderSimplePanel = (h, _vm) => {
     customColumnList,
     customOpts,
     isMaxFixedColumn
-  } = $xetable;
+  } = $xeTable;
   const {
     maxHeight
   } = customStore;
@@ -57,6 +57,12 @@ const renderSimplePanel = (h, _vm) => {
     trigger,
     placement
   } = customOpts;
+  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 = {};
   // hover 触发
@@ -64,6 +70,15 @@ const renderSimplePanel = (h, _vm) => {
     customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent;
     customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent;
   }
+  const isAllChecked = customStore.isAll;
+  const isAllIndeterminate = customStore.isIndeterminate;
+  const params = {
+    $table: $xeTable,
+    $grid: $xeTable.xegrid,
+    columns: customColumnList,
+    isAllChecked,
+    isAllIndeterminate
+  };
   _xeUtils.default.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
       column
@@ -167,8 +182,6 @@ const renderSimplePanel = (h, _vm) => {
       })]) : _e()]));
     }
   });
-  const isAllChecked = customStore.isAll;
-  const isAllIndeterminate = customStore.isIndeterminate;
   return h('div', {
     key: 'simple',
     class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
@@ -177,8 +190,10 @@ const renderSimplePanel = (h, _vm) => {
     style: maxHeight && !['left', 'right'].includes(placement) ? {
       maxHeight: `${maxHeight}px`
     } : {}
-  }, customStore.visible ? [h('ul', {
+  }, customStore.visible ? [h('div', {
     class: 'vxe-table-custom--header'
+  }, headerSlot ? $xeTable.callSlot(headerSlot, params, h) : [h('ul', {
+    class: 'vxe-table-custom--panel-list'
   }, [h('li', {
     class: 'vxe-table-custom--option'
   }, [allowVisible ? h('div', {
@@ -198,21 +213,29 @@ const renderSimplePanel = (h, _vm) => {
     class: 'vxe-checkbox--label'
   }, getI18n('vxe.toolbar.customAll'))]) : h('span', {
     class: 'vxe-checkbox--label'
-  }, getI18n('vxe.table.customTitle'))])]), h('div', {
+  }, getI18n('vxe.table.customTitle'))])])]), h('div', {
     ref: 'bodyElemRef',
-    class: 'vxe-table-custom--list-wrapper'
-  }, [h('transition-group', {
-    class: 'vxe-table-custom--body',
+    class: 'vxe-table-custom--body'
+  }, [topSlot ? h('div', {
+    class: 'vxe-table-custom--panel-top'
+  }, $xeTable.callSlot(topSlot, params, h)) : renderEmptyElement($xeTable), defaultSlot ? h('div', {
+    class: 'vxe-table-custom--panel-body'
+  }, $xeTable.callSlot(defaultSlot, params, h)) : h('transition-group', {
+    class: 'vxe-table-custom--panel-list',
     props: {
       name: 'vxe-table-custom--list',
       tag: 'ul'
     },
     on: customWrapperOns
-  }, colVNs), h('div', {
+  }, colVNs), bottomSlot ? h('div', {
+    class: 'vxe-table-custom--panel-bottom'
+  }, $xeTable.callSlot(bottomSlot, params, h)) : renderEmptyElement($xeTable), h('div', {
     ref: 'dragHintElemRef',
     class: 'vxe-table-custom-popup--drag-hint'
   }, getI18n('vxe.custom.cstmDragTarget', [dragColumn && dragColumn.type !== 'html' ? dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
+  }, footerSlot ? $xeTable.callSlot(footerSlot, params, h) : [h('div', {
+    class: 'vxe-table-custom--footer-buttons'
   }, [h(VxeUIButtonComponent, {
     props: {
       mode: 'text',
@@ -246,7 +269,7 @@ const renderSimplePanel = (h, _vm) => {
     on: {
       click: _vm.confirmCustomEvent
     }
-  })]) : null] : []);
+  })])]) : null] : []);
 };
 const renderPopupPanel = (h, _vm) => {
   const VxeUIModalComponent = _ui.VxeUI.getComponent('VxeModal');
@@ -254,9 +277,9 @@ const renderPopupPanel = (h, _vm) => {
   const VxeUIInputComponent = _ui.VxeUI.getComponent('VxeInput');
   const VxeUITooltipComponent = _ui.VxeUI.getComponent('VxeTooltip');
   const $xeTableCustomPanel = _vm;
+  const $xeTable = _vm.$xeTable;
   const {
     _e,
-    $xetable,
     customStore
   } = _vm;
   const {
@@ -264,7 +287,7 @@ const renderPopupPanel = (h, _vm) => {
     customColumnList,
     columnOpts,
     isMaxFixedColumn
-  } = $xetable;
+  } = $xeTable;
   const {
     modalOptions,
     allowVisible,
@@ -278,7 +301,22 @@ const renderPopupPanel = (h, _vm) => {
     maxFixedSize
   } = columnOpts;
   const modalOpts = Object.assign({}, modalOptions);
+  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 params = {
+    $table: $xeTable,
+    $grid: $xeTable.xegrid,
+    columns: customColumnList,
+    isAllChecked,
+    isAllIndeterminate
+  };
   _xeUtils.default.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
       column
@@ -397,8 +435,105 @@ const renderPopupPanel = (h, _vm) => {
       })]) : _e()]));
     }
   });
-  const isAllChecked = customStore.isAll;
-  const isAllIndeterminate = customStore.isIndeterminate;
+  const scopedSlots = {
+    default: () => {
+      if (defaultSlot) {
+        return $xeTable.callSlot(defaultSlot, params, h);
+      }
+      return h('div', {
+        ref: 'bodyElemRef',
+        class: 'vxe-table-custom-popup--body'
+      }, [topSlot ? h('div', {
+        class: 'vxe-table-custom-popup--table-top'
+      }, $xeTable.callSlot(topSlot, params, h)) : renderEmptyElement($xeTable), h('div', {
+        class: 'vxe-table-custom-popup--table-wrapper'
+      }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
+        class: 'vxe-table-custom-popup--table-col-seq'
+      }) : _e(), allowSort ? h('col', {
+        class: 'vxe-table-custom-popup--table-col-sort'
+      }) : _e(), h('col', {
+        class: 'vxe-table-custom-popup--table-col-title'
+      }), allowResizable ? h('col', {
+        class: 'vxe-table-custom-popup--table-col-width'
+      }) : _e(), allowFixed ? h('col', {
+        class: 'vxe-table-custom-popup--table-col-fixed'
+      }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
+        class: ['vxe-table-custom--checkbox-option', {
+          'is--checked': isAllChecked,
+          'is--indeterminate': isAllIndeterminate
+        }],
+        attrs: {
+          title: getI18n('vxe.table.allTitle')
+        },
+        on: {
+          click: _vm.allOptionEvent
+        }
+      }, [h('span', {
+        class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+      }), h('span', {
+        class: 'vxe-checkbox--label'
+      }, getI18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
+        class: 'vxe-table-custom-popup--table-sort-help-title'
+      }, getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? h(VxeUITooltipComponent, {
+        props: {
+          enterable: true,
+          content: getI18n('vxe.custom.setting.sortHelpTip'),
+          popupClassName: 'vxe-table--ignore-clear'
+        },
+        scopedSlots: {
+          default: () => {
+            return h('i', {
+              class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
+            });
+          }
+        }
+      }) : renderEmptyElement($xeTableCustomPanel)]) : _e(), h('th', {}, getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, getI18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : _e()])]), h('transition-group', {
+        class: 'vxe-table-custom--panel-list',
+        props: {
+          tag: 'tbody',
+          name: 'vxe-table-custom--list'
+        }
+      }, trVNs)])]), bottomSlot ? h('div', {
+        class: 'vxe-table-custom-popup--table-bottom'
+      }, $xeTable.callSlot(bottomSlot, params, h)) : renderEmptyElement($xeTable), h('div', {
+        ref: 'dragHintElemRef',
+        class: 'vxe-table-custom-popup--drag-hint'
+      }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]);
+    },
+    footer: () => {
+      if (footerSlot) {
+        return $xeTable.callSlot(footerSlot, params, h);
+      }
+      return h('div', {
+        class: 'vxe-table-custom-popup--footer'
+      }, [h(VxeUIButtonComponent, {
+        props: {
+          content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
+        },
+        on: {
+          click: _vm.resetCustomEvent
+        }
+      }), h(VxeUIButtonComponent, {
+        props: {
+          content: customOpts.resetButtonText || getI18n('vxe.custom.cstmCancel')
+        },
+        on: {
+          click: _vm.cancelCustomEvent
+        }
+      }), h(VxeUIButtonComponent, {
+        props: {
+          status: 'primary',
+          content: customOpts.confirmButtonText || getI18n('vxe.custom.cstmConfirm')
+        },
+        on: {
+          click: _vm.confirmCustomEvent
+        }
+      })]);
+    }
+  };
+  if (headerSlot) {
+    scopedSlots.header = () => $xeTable.callSlot(headerSlot, params, h);
+  }
   return VxeUIModalComponent ? h(VxeUIModalComponent, {
     key: 'modal',
     props: {
@@ -409,10 +544,12 @@ const renderPopupPanel = (h, _vm) => {
       minWidth: modalOpts.minWidth || 700,
       height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
       minHeight: modalOpts.minHeight || 400,
-      showZoom: !!modalOpts.showZoom,
-      mask: !!modalOpts.mask,
-      lockView: !!modalOpts.lockView,
-      resize: !!modalOpts.resize,
+      showZoom: modalOpts.showZoom,
+      showMaximize: modalOpts.showMaximize,
+      showMinimize: modalOpts.showMinimize,
+      mask: modalOpts.mask,
+      lockView: modalOpts.lockView,
+      resize: modalOpts.resize,
       escClosable: !!modalOpts.escClosable,
       destroyOnClose: true,
       showFooter: true
@@ -422,102 +559,7 @@ const renderPopupPanel = (h, _vm) => {
         customStore.visible = value;
       }
     },
-    scopedSlots: {
-      default: () => {
-        return h('div', {
-          ref: 'bodyElemRef',
-          class: 'vxe-table-custom-popup--body'
-        }, [h('div', {
-          class: 'vxe-table-custom-popup--table-wrapper'
-        }, [h('table', {}, [h('colgroup', {}, [allowVisible ? h('col', {
-          style: {
-            width: '80px'
-          }
-        }) : _e(), allowSort ? h('col', {
-          style: {
-            width: '80px'
-          }
-        }) : _e(), h('col', {
-          style: {
-            minWidth: '120px'
-          }
-        }), allowResizable ? h('col', {
-          style: {
-            width: '140px'
-          }
-        }) : _e(), allowFixed ? h('col', {
-          style: {
-            width: '200px'
-          }
-        }) : _e()]), h('thead', {}, [h('tr', {}, [allowVisible ? h('th', {}, [h('div', {
-          class: ['vxe-table-custom--checkbox-option', {
-            'is--checked': isAllChecked,
-            'is--indeterminate': isAllIndeterminate
-          }],
-          attrs: {
-            title: getI18n('vxe.table.allTitle')
-          },
-          on: {
-            click: _vm.allOptionEvent
-          }
-        }, [h('span', {
-          class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-        }), h('span', {
-          class: 'vxe-checkbox--label'
-        }, getI18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
-          class: 'vxe-table-custom-popup--table-sort-help-title'
-        }, getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? h(VxeUITooltipComponent, {
-          props: {
-            enterable: true,
-            content: getI18n('vxe.custom.setting.sortHelpTip'),
-            popupClassName: 'vxe-table--ignore-clear'
-          },
-          scopedSlots: {
-            default: () => {
-              return h('i', {
-                class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
-              });
-            }
-          }
-        }) : renderEmptyElement($xeTableCustomPanel)]) : _e(), h('th', {}, getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, getI18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : _e()])]), h('transition-group', {
-          class: 'vxe-table-custom--body',
-          props: {
-            tag: 'tbody',
-            name: 'vxe-table-custom--list'
-          }
-        }, trVNs)])]), h('div', {
-          ref: 'dragHintElemRef',
-          class: 'vxe-table-custom-popup--drag-hint'
-        }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]);
-      },
-      footer: () => {
-        return h('div', {
-          class: 'vxe-table-custom-popup--footer'
-        }, [h(VxeUIButtonComponent, {
-          props: {
-            content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
-          },
-          on: {
-            click: _vm.resetCustomEvent
-          }
-        }), h(VxeUIButtonComponent, {
-          props: {
-            content: customOpts.resetButtonText || getI18n('vxe.custom.cstmCancel')
-          },
-          on: {
-            click: _vm.cancelCustomEvent
-          }
-        }), h(VxeUIButtonComponent, {
-          props: {
-            status: 'primary',
-            content: customOpts.confirmButtonText || getI18n('vxe.custom.cstmConfirm')
-          },
-          on: {
-            click: _vm.confirmCustomEvent
-          }
-        })]);
-      }
-    }
+    scopedSlots
   }) : renderEmptyElement($xeTableCustomPanel);
 };
 var _default = exports.default = {
@@ -529,6 +571,9 @@ var _default = exports.default = {
     }
   },
   inject: {
+    $xeTable: {
+      default: null
+    },
     $xetable: {
       default: null
     }
@@ -607,114 +652,41 @@ var _default = exports.default = {
       customStore.activeWrapper = false;
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
-          $xetable.customColseEvent(evnt);
+          $xetable.customCloseEvent(evnt);
         }
       }, 300);
     },
     getStoreData() {
       return {};
     },
-    confirmCustomEvent(evnt) {
-      const {
-        $xetable
-      } = this;
-      const {
-        customOpts,
-        customColumnList
-      } = $xetable;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      _xeUtils.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.closeCustom();
-      $xetable.emitCustomEvent('confirm', evnt);
-      $xetable.saveCustomStore('confirm');
+    confirmCustomEvent({
+      $event
+    }) {
+      const $xeTable = this.$xeTable;
+      $xeTable.saveCustom();
+      $xeTable.closeCustom();
+      $xeTable.emitCustomEvent('confirm', $event);
     },
     cancelCloseEvent({
       $event
     }) {
-      const {
-        $xetable
-      } = this;
-      $xetable.closeCustom();
-      $xetable.emitCustomEvent('cancel', $event);
+      const $xeTable = this.$xeTable;
+      $xeTable.closeCustom();
+      $xeTable.emitCustomEvent('close', $event);
     },
-    cancelCustomEvent(evnt) {
-      const {
-        $xetable
-      } = this;
-      const {
-        customStore,
-        customOpts,
-        customColumnList
-      } = $xetable;
-      const {
-        oldSortMaps,
-        oldFixedMaps,
-        oldVisibleMaps
-      } = customStore;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      _xeUtils.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.closeCustom();
-      $xetable.emitCustomEvent('cancel', evnt);
+    cancelCustomEvent({
+      $event
+    }) {
+      const $xeTable = this.$xeTable;
+      $xeTable.cancelCustom();
+      $xeTable.closeCustom();
+      $xeTable.emitCustomEvent('cancel', $event);
     },
     handleResetCustomEvent(evnt) {
       const {
         $xetable
       } = this;
-      $xetable.resetColumn(true);
+      $xetable.resetCustom(true);
       $xetable.closeCustom();
       $xetable.emitCustomEvent('reset', evnt);
     },
@@ -832,55 +804,9 @@ var _default = exports.default = {
     },
     allOptionEvent() {
       const {
-        $xetable,
-        customStore
+        $xetable
       } = this;
-      const {
-        customColumnList,
-        customOpts
-      } = $xetable;
-      const {
-        checkMethod,
-        visibleMethod
-      } = customOpts;
-      const isAll = !customStore.isAll;
-      if (customOpts.immediate) {
-        _xeUtils.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 {
-        _xeUtils.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();
     },
     sortMousedownEvent(evnt) {
       const {
@@ -894,6 +820,7 @@ var _default = exports.default = {
       trEl.draggable = true;
       this.dragColumn = column;
       (0, _dom.addClass)(trEl, 'active--drag-origin');
+      updateDropHint(this, evnt);
     },
     sortMouseupEvent(evnt) {
       const btnEl = evnt.currentTarget;