vxe-table 3.10.3 → 3.10.5

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.3";
+const version = "3.10.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2450,6 +2450,7 @@ core_.VxeUI.setIcon({
   TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
   TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
   TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
+  TABLE_DRAG_ROW: iconPrefix + 'drag-handle',
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
   TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
@@ -2767,7 +2768,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.3"}`;
+const log_version = `table v${"3.10.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3518,6 +3519,7 @@ function renderCellDragIcon(h, params) {
   } = params;
   const dragOpts = $table.computeDragOpts;
   const {
+    rowIcon,
     rowDisabledMethod
   } = dragOpts;
   const isDisabled = rowDisabledMethod && rowDisabledMethod(params);
@@ -3535,7 +3537,7 @@ function renderCellDragIcon(h, params) {
       mouseup: $table.handleCellDragMouseupEvent
     }
   }, [h('i', {
-    class: 'vxe-table-icon-drag-handle'
+    class: rowIcon || cell_getIcon().TABLE_DRAG_ROW
   })]);
 }
 function renderCellBaseVNs(h, params, content) {
@@ -6994,38 +6996,8 @@ const Methods = {
    * 如果已关联工具栏，则会同步更新
    */
   resetColumn(options) {
-    const {
-      collectColumn,
-      customOpts
-    } = this;
-    const {
-      checkMethod
-    } = customOpts;
-    const opts = Object.assign({
-      visible: true,
-      resizable: options === true,
-      fixed: options === true,
-      sort: options === true
-    }, options);
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
-      if (opts.resizable) {
-        column.resizeWidth = 0;
-      }
-      if (opts.fixed) {
-        column.fixed = column.defaultFixed;
-      }
-      if (opts.sort) {
-        column.renderSortNumber = column.sortNumber;
-      }
-      if (!checkMethod || checkMethod({
-        column
-      })) {
-        column.visible = column.defaultVisible;
-      }
-      column.renderResizeWidth = column.renderWidth;
-    });
-    this.saveCustomStore('reset');
-    return this.handleCustom();
+    warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
+    return this.resetCustom(options);
   },
   handleCustom() {
     const {
@@ -11158,7 +11130,9 @@ const Methods = {
           $table: $xeTable,
           row
         })).then(childRecords => {
-          rowRest.treeLoaded = true;
+          if (rowRest) {
+            rowRest.treeLoaded = true;
+          }
           if (treeExpandLazyLoadedMaps[rowid]) {
             delete treeExpandLazyLoadedMaps[rowid];
           }
@@ -11188,7 +11162,9 @@ const Methods = {
           const {
             treeExpandLazyLoadedMaps
           } = this;
-          rowRest.treeLoaded = false;
+          if (rowRest) {
+            rowRest.treeLoaded = false;
+          }
           if (treeExpandLazyLoadedMaps[rowid]) {
             delete treeExpandLazyLoadedMaps[rowid];
           }
@@ -12213,7 +12189,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (true) {
@@ -14167,9 +14143,9 @@ function updateDropHint(_vm, evnt) {
 }
 const renderSimplePanel = (h, _vm) => {
   const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
+  const $xeTable = _vm.$xeTable;
   const {
     _e,
-    $xetable,
     customStore,
     dragColumn
   } = _vm;
@@ -14177,7 +14153,7 @@ const renderSimplePanel = (h, _vm) => {
     customColumnList,
     customOpts,
     isMaxFixedColumn
-  } = $xetable;
+  } = $xeTable;
   const {
     maxHeight
   } = customStore;
@@ -14190,6 +14166,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 触发
@@ -14197,6 +14179,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
+  };
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
       column
@@ -14300,8 +14291,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}`, {
@@ -14310,8 +14299,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', {
@@ -14331,21 +14322,29 @@ const renderSimplePanel = (h, _vm) => {
     class: 'vxe-checkbox--label'
   }, panel_getI18n('vxe.toolbar.customAll'))]) : h('span', {
     class: 'vxe-checkbox--label'
-  }, panel_getI18n('vxe.table.customTitle'))])]), h('div', {
+  }, panel_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)) : panel_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)) : panel_renderEmptyElement($xeTable), h('div', {
     ref: 'dragHintElemRef',
     class: 'vxe-table-custom-popup--drag-hint'
   }, panel_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',
@@ -14379,7 +14378,7 @@ const renderSimplePanel = (h, _vm) => {
     on: {
       click: _vm.confirmCustomEvent
     }
-  })]) : null] : []);
+  })])]) : null] : []);
 };
 const renderPopupPanel = (h, _vm) => {
   const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
@@ -14387,9 +14386,9 @@ const renderPopupPanel = (h, _vm) => {
   const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
   const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
   const $xeTableCustomPanel = _vm;
+  const $xeTable = _vm.$xeTable;
   const {
     _e,
-    $xetable,
     customStore
   } = _vm;
   const {
@@ -14397,7 +14396,7 @@ const renderPopupPanel = (h, _vm) => {
     customColumnList,
     columnOpts,
     isMaxFixedColumn
-  } = $xetable;
+  } = $xeTable;
   const {
     modalOptions,
     allowVisible,
@@ -14411,7 +14410,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
+  };
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({
       column
@@ -14530,8 +14544,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)) : panel_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: panel_getI18n('vxe.table.allTitle')
+        },
+        on: {
+          click: _vm.allOptionEvent
+        }
+      }, [h('span', {
+        class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
+      }), h('span', {
+        class: 'vxe-checkbox--label'
+      }, panel_getI18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
+        class: 'vxe-table-custom-popup--table-sort-help-title'
+      }, panel_getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? h(VxeUITooltipComponent, {
+        props: {
+          enterable: true,
+          content: panel_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'
+            });
+          }
+        }
+      }) : panel_renderEmptyElement($xeTableCustomPanel)]) : _e(), h('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, panel_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)) : panel_renderEmptyElement($xeTable), h('div', {
+        ref: 'dragHintElemRef',
+        class: 'vxe-table-custom-popup--drag-hint'
+      }, panel_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 || panel_getI18n('vxe.custom.cstmRestore')
+        },
+        on: {
+          click: _vm.resetCustomEvent
+        }
+      }), h(VxeUIButtonComponent, {
+        props: {
+          content: customOpts.resetButtonText || panel_getI18n('vxe.custom.cstmCancel')
+        },
+        on: {
+          click: _vm.cancelCustomEvent
+        }
+      }), h(VxeUIButtonComponent, {
+        props: {
+          status: 'primary',
+          content: customOpts.confirmButtonText || panel_getI18n('vxe.custom.cstmConfirm')
+        },
+        on: {
+          click: _vm.confirmCustomEvent
+        }
+      })]);
+    }
+  };
+  if (headerSlot) {
+    scopedSlots.header = () => $xeTable.callSlot(headerSlot, params, h);
+  }
   return VxeUIModalComponent ? h(VxeUIModalComponent, {
     key: 'modal',
     props: {
@@ -14542,10 +14653,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
@@ -14555,102 +14668,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: panel_getI18n('vxe.table.allTitle')
-          },
-          on: {
-            click: _vm.allOptionEvent
-          }
-        }, [h('span', {
-          class: ['vxe-checkbox--icon', isAllIndeterminate ? panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? panel_getIcon().TABLE_CHECKBOX_CHECKED : panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-        }), h('span', {
-          class: 'vxe-checkbox--label'
-        }, panel_getI18n('vxe.toolbar.customAll'))])]) : _e(), allowSort ? h('th', {}, [h('span', {
-          class: 'vxe-table-custom-popup--table-sort-help-title'
-        }, panel_getI18n('vxe.custom.setting.colSort')), VxeUITooltipComponent ? h(VxeUITooltipComponent, {
-          props: {
-            enterable: true,
-            content: panel_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'
-              });
-            }
-          }
-        }) : panel_renderEmptyElement($xeTableCustomPanel)]) : _e(), h('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, panel_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'
-        }, panel_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 || panel_getI18n('vxe.custom.cstmRestore')
-          },
-          on: {
-            click: _vm.resetCustomEvent
-          }
-        }), h(VxeUIButtonComponent, {
-          props: {
-            content: customOpts.resetButtonText || panel_getI18n('vxe.custom.cstmCancel')
-          },
-          on: {
-            click: _vm.cancelCustomEvent
-          }
-        }), h(VxeUIButtonComponent, {
-          props: {
-            status: 'primary',
-            content: customOpts.confirmButtonText || panel_getI18n('vxe.custom.cstmConfirm')
-          },
-          on: {
-            click: _vm.confirmCustomEvent
-          }
-        })]);
-      }
-    }
+    scopedSlots
   }) : panel_renderEmptyElement($xeTableCustomPanel);
 };
 /* harmony default export */ var panel = ({
@@ -14662,6 +14680,9 @@ const renderPopupPanel = (h, _vm) => {
     }
   },
   inject: {
+    $xeTable: {
+      default: null
+    },
     $xetable: {
       default: null
     }
@@ -14740,114 +14761,41 @@ const renderPopupPanel = (h, _vm) => {
       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;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (parent) {
-          // 更新子列信息
-          column.fixed = parent.fixed;
-        } else {
-          if (allowSort) {
-            const sortIndex = index + 1;
-            column.renderSortNumber = sortIndex;
-          }
-          if (allowFixed) {
-            column.fixed = column.renderFixed;
-          }
-        }
-        if (allowResizable) {
-          if (column.renderVisible && (!column.children || column.children.length)) {
-            if (column.renderResizeWidth !== column.renderWidth) {
-              column.resizeWidth = column.renderResizeWidth;
-              column.renderWidth = column.renderResizeWidth;
-            }
-          }
-        }
-        if (allowVisible) {
-          column.visible = column.renderVisible;
-        }
-      });
-      $xetable.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;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-        const colid = column.getKey();
-        const visible = !!oldVisibleMaps[colid];
-        const fixed = oldFixedMaps[colid] || '';
-        if (allowVisible) {
-          column.renderVisible = visible;
-          column.visible = visible;
-        }
-        if (allowFixed) {
-          column.renderFixed = fixed;
-          column.fixed = fixed;
-        }
-        if (allowSort) {
-          column.renderSortNumber = oldSortMaps[colid] || 0;
-        }
-        if (allowResizable) {
-          column.renderResizeWidth = column.renderWidth;
-        }
-      }, {
-        children: 'children'
-      });
-      $xetable.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);
     },
@@ -14965,55 +14913,9 @@ const renderPopupPanel = (h, _vm) => {
     },
     allOptionEvent() {
       const {
-        $xetable,
-        customStore
+        $xetable
       } = this;
-      const {
-        customColumnList,
-        customOpts
-      } = $xetable;
-      const {
-        checkMethod,
-        visibleMethod
-      } = customOpts;
-      const isAll = !customStore.isAll;
-      if (customOpts.immediate) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.visible = isAll;
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-        $xetable.handleCustom();
-        $xetable.saveCustomStore('update:visible');
-      } else {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-      }
-      $xetable.checkCustomStatus();
+      $xetable.toggleCustomAllCheckbox();
     },
     sortMousedownEvent(evnt) {
       const {
@@ -15027,6 +14929,7 @@ const renderPopupPanel = (h, _vm) => {
       trEl.draggable = true;
       this.dragColumn = column;
       addClass(trEl, 'active--drag-origin');
+      updateDropHint(this, evnt);
     },
     sortMouseupEvent(evnt) {
       const btnEl = evnt.currentTarget;
@@ -15859,7 +15762,7 @@ const {
             class: 'vxe-table-export--panel-column-body'
           }, cols)])])]), h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), parameterSlot ? h('td', [h('div', {
             class: 'vxe-table-export--panel-option-row'
-          }, $xeTable.callSlot(parameterSlot, params))]) : h('td', [h('div', {
+          }, $xeTable.callSlot(parameterSlot, params, h))]) : h('td', [h('div', {
             class: 'vxe-table-export--panel-option-row'
           }, [h('vxe-checkbox', {
             props: {
@@ -15959,7 +15862,7 @@ const {
           };
           return h('div', {
             class: 'vxe-table-export--panel-footer'
-          }, footerSlot ? $xeTable.callSlot(footerSlot, params) : [h('div', {
+          }, footerSlot ? $xeTable.callSlot(footerSlot, params, h) : [h('div', {
             class: 'vxe-table-export--panel-btns'
           }, [h('vxe-button', {
             props: {
@@ -20737,6 +20640,180 @@ function validErrorRuleValue(rule, val) {
       }
       return this.$nextTick();
     },
+    _saveCustom() {
+      const $xeTable = this;
+      const {
+        customOpts,
+        customColumnList
+      } = this;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
+          if (allowSort) {
+            const sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+              column.renderWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
+      });
+      $xeTable.closeCustom();
+      return $xeTable.saveCustomStore('confirm');
+    },
+    _cancelCustom() {
+      const $xeTable = this;
+      const {
+        customStore,
+        customOpts,
+        customColumnList
+      } = $xeTable;
+      const {
+        oldSortMaps,
+        oldFixedMaps,
+        oldVisibleMaps
+      } = customStore;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+        const colid = column.getKey();
+        const visible = !!oldVisibleMaps[colid];
+        const fixed = oldFixedMaps[colid] || '';
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
+      }, {
+        children: 'children'
+      });
+      return $xeTable.$nextTick();
+    },
+    _resetCustom(options) {
+      const {
+        collectColumn,
+        customOpts
+      } = this;
+      const {
+        checkMethod
+      } = customOpts;
+      const opts = Object.assign({
+        visible: true,
+        resizable: options === true,
+        fixed: options === true,
+        sort: options === true
+      }, options);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+        if (opts.resizable) {
+          column.resizeWidth = 0;
+        }
+        if (opts.fixed) {
+          column.fixed = column.defaultFixed;
+        }
+        if (opts.sort) {
+          column.renderSortNumber = column.sortNumber;
+        }
+        if (!checkMethod || checkMethod({
+          column
+        })) {
+          column.visible = column.defaultVisible;
+        }
+        column.renderResizeWidth = column.renderWidth;
+      });
+      this.saveCustomStore('reset');
+      return this.handleCustom();
+    },
+    _toggleCustomAllCheckbox() {
+      const {
+        customStore
+      } = this;
+      const isAll = !customStore.isAll;
+      return this.setCustomAllCheckbox(isAll);
+    },
+    _setCustomAllCheckbox(checked) {
+      const $xeTable = this;
+      const {
+        customStore
+      } = this;
+      const {
+        customColumnList,
+        customOpts
+      } = this;
+      const {
+        checkMethod,
+        visibleMethod
+      } = customOpts;
+      const isAll = !!checked;
+      if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.visible = isAll;
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:visible');
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+      }
+      $xeTable.checkCustomStatus();
+    },
     calcMaxHeight() {
       const {
         $el,
@@ -20747,7 +20824,7 @@ function validErrorRuleValue(rule, val) {
       if ($el) {
         tableHeight = $el.clientHeight - 28;
       }
-      customStore.maxHeight = Math.max(4, tableHeight);
+      customStore.maxHeight = Math.max(88, tableHeight);
     },
     checkCustomStatus() {
       const {
@@ -20798,7 +20875,7 @@ function validErrorRuleValue(rule, val) {
         this.emitCustomEvent('open', evnt);
       }
     },
-    customColseEvent(evnt) {
+    customCloseEvent(evnt) {
       const {
         customStore
       } = this;
@@ -23751,7 +23828,7 @@ Object.keys(table.methods).forEach(name => {
           this.openExport(btnParams);
           break;
         case 'reset_custom':
-          this.resetColumn(true);
+          this.resetCustom(true);
           break;
         case '_init':
         case 'reload':