vxe-table 4.8.4 → 4.8.6

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.8.4";
+const version = "4.8.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2050,7 +2050,8 @@ core_.VxeUI.setConfig({
       autoClear: true,
       autoPos: true,
       message: 'inline',
-      msgMode: 'single'
+      msgMode: 'single',
+      theme: 'normal'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -2388,7 +2389,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.8.4"}`;
+const log_version = `table v${"4.8.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5107,13 +5108,15 @@ const lineOffsetSizes = {
             ...errorValidItem
           };
           tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: ['vxe-cell--valid-error-hint', getPropClass(validOpts.className, validParams)],
+            class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
             style: errRule && errRule.maxWidth ? {
               width: `${errRule.maxWidth}px`
             } : null
-          }, validSlot ? $xeTable.callSlot(validSlot, validParams) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
+          }, [validSlot ? $xeTable.callSlot(validSlot, validParams) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-cell--valid-error-msg'
-          }, errorValidItem.content)]));
+          }, errorValidItem.content)]])]));
         }
       }
       let cellHeight = '';
@@ -6705,7 +6708,8 @@ const {
 
 const {
   getI18n: panel_getI18n,
-  getIcon: panel_getIcon
+  getIcon: panel_getIcon,
+  renderEmptyElement: panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var panel = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'TableCustomPanel',
@@ -6719,7 +6723,7 @@ const {
     const VxeUIModalComponent = core_.VxeUI.getComponent('VxeModal');
     const VxeUIDrawerComponent = core_.VxeUI.getComponent('VxeDrawer');
     const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
-    const VxeUIInputComponent = core_.VxeUI.getComponent('VxeInput');
+    const VxeUINumberInputComponent = core_.VxeUI.getComponent('VxeNumberInput');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     const VxeUIRadioGroupComponent = core_.VxeUI.getComponent('VxeRadioGroup');
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', {});
@@ -6729,7 +6733,8 @@ const {
     const {
       computeCustomOpts,
       computeColumnOpts,
-      computeIsMaxFixedColumn
+      computeIsMaxFixedColumn,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const bodyElemRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -6757,44 +6762,9 @@ const {
     const confirmCustomEvent = ({
       $event
     }) => {
-      const {
-        customColumnList
-      } = reactData;
-      const customOpts = computeCustomOpts.value;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (parent) {
-          // 更新子列信息
-          column.fixed = parent.fixed;
-        } else {
-          if (allowSort) {
-            const sortIndex = index + 1;
-            column.renderSortNumber = sortIndex;
-          }
-          if (allowFixed) {
-            column.fixed = column.renderFixed;
-          }
-        }
-        if (allowResizable) {
-          if (column.renderVisible && (!column.children || column.children.length)) {
-            if (column.renderResizeWidth !== column.renderWidth) {
-              column.resizeWidth = column.renderResizeWidth;
-              column.renderWidth = column.renderResizeWidth;
-            }
-          }
-        }
-        if (allowVisible) {
-          column.visible = column.renderVisible;
-        }
-      });
+      $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
-      $xeTable.saveCustomStore('confirm');
     };
     const cancelCloseEvent = ({
       $event
@@ -6805,50 +6775,12 @@ const {
     const cancelCustomEvent = ({
       $event
     }) => {
-      const {
-        customStore
-      } = props;
-      const {
-        customColumnList
-      } = reactData;
-      const {
-        oldSortMaps,
-        oldFixedMaps,
-        oldVisibleMaps
-      } = customStore;
-      const customOpts = computeCustomOpts.value;
-      const {
-        allowVisible,
-        allowSort,
-        allowFixed,
-        allowResizable
-      } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-        const colid = column.getKey();
-        const visible = !!oldVisibleMaps[colid];
-        const fixed = oldFixedMaps[colid] || '';
-        if (allowVisible) {
-          column.renderVisible = visible;
-          column.visible = visible;
-        }
-        if (allowFixed) {
-          column.renderFixed = fixed;
-          column.fixed = fixed;
-        }
-        if (allowSort) {
-          column.renderSortNumber = oldSortMaps[colid] || 0;
-        }
-        if (allowResizable) {
-          column.renderResizeWidth = column.renderWidth;
-        }
-      }, {
-        children: 'children'
-      });
+      $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
     };
     const handleResetCustomEvent = evnt => {
-      $xeTable.resetColumn(true);
+      $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
     };
@@ -6939,55 +6871,7 @@ const {
       }
     };
     const allOptionEvent = () => {
-      const {
-        customStore
-      } = props;
-      const {
-        customColumnList
-      } = reactData;
-      const customOpts = computeCustomOpts.value;
-      const {
-        checkMethod,
-        visibleMethod
-      } = customOpts;
-      const isAll = !customStore.isAll;
-      if (customOpts.immediate) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.visible = isAll;
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-        $xeTable.handleCustom();
-        $xeTable.saveCustomStore('update:visible');
-      } else {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
-          if (visibleMethod && !visibleMethod({
-            column
-          })) {
-            return;
-          }
-          if (checkMethod && !checkMethod({
-            column
-          })) {
-            return;
-          }
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        });
-        customStore.isAll = isAll;
-      }
-      $xeTable.checkCustomStatus();
+      $xeTable.toggleCustomAllCheckbox();
     };
     const sortMousedownEvent = evnt => {
       const btnEl = evnt.currentTarget;
@@ -6998,6 +6882,7 @@ const {
       trEl.draggable = true;
       dragColumnRef.value = column;
       addClass(trEl, 'active--drag-origin');
+      updateDropHint(evnt);
     };
     const sortMouseupEvent = evnt => {
       const btnEl = evnt.currentTarget;
@@ -7121,13 +7006,29 @@ const {
         placement
       } = customOpts;
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+      const slots = customOpts.slots || {};
+      const headerSlot = slots.header;
+      const topSlot = slots.top;
+      const bottomSlot = slots.bottom;
+      const defaultSlot = slots.default;
+      const footerSlot = slots.footer;
       const colVNs = [];
       const customWrapperOns = {};
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
       // hover 触发
       if (trigger === 'hover') {
         customWrapperOns.onMouseenter = handleWrapperMouseenterEvent;
         customWrapperOns.onMouseleave = handleWrapperMouseleaveEvent;
       }
+      const params = {
+        $table: $xeTable,
+        $grid: $xeTable.xegrid,
+        columns: customColumnList,
+        isAllChecked,
+        isAllIndeterminate
+      };
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({
           column
@@ -7208,9 +7109,6 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
-      const isAllChecked = customStore.isAll;
-      const isAllIndeterminate = customStore.isIndeterminate;
-      const dragColumn = dragColumnRef.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         key: 'simple',
@@ -7220,8 +7118,10 @@ const {
         style: maxHeight && !['left', 'right'].includes(placement) ? {
           maxHeight: `${maxHeight}px`
         } : {}
-      }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+      }, customStore.visible ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--header'
+      }, headerSlot ? $xeTable.callSlot(headerSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+        class: 'vxe-table-custom--panel-list'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
         class: 'vxe-table-custom--option'
       }, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7237,21 +7137,29 @@ const {
         class: 'vxe-checkbox--label'
       }, panel_getI18n('vxe.toolbar.customAll'))]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, panel_getI18n('vxe.table.customTitle'))])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, panel_getI18n('vxe.table.customTitle'))])])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: bodyElemRef,
-        class: 'vxe-table-custom--list-wrapper'
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
-        class: 'vxe-table-custom--body',
+        class: 'vxe-table-custom--body'
+      }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-top'
+      }, $xeTable.callSlot(topSlot, params)) : panel_renderEmptyElement($xeTable), defaultSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-body'
+      }, $xeTable.callSlot(defaultSlot, params)) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+        class: 'vxe-table-custom--panel-list',
         name: 'vxe-table-custom--list',
         tag: 'ul',
         ...customWrapperOns
       }, {
         default: () => colVNs
-      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--panel-bottom'
+      }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: dragHintElemRef,
         class: 'vxe-table-custom-popup--drag-hint'
       }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn && dragColumn.type !== 'html' ? dragColumn.getTitle() : '']))]), customOpts.showFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table-custom--footer'
+      }, footerSlot ? $xeTable.callSlot(footerSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table-custom--footer-buttons'
       }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
         mode: 'text',
         content: customOpts.resetButtonText || panel_getI18n('vxe.table.customRestore'),
@@ -7269,7 +7177,7 @@ const {
         status: 'primary',
         content: customOpts.confirmButtonText || panel_getI18n('vxe.table.customConfirm'),
         onClick: confirmCustomEvent
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : null] : []);
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]) : null] : []);
     };
     const renderPopupPanel = () => {
       const {
@@ -7293,18 +7201,57 @@ const {
       const {
         maxFixedSize
       } = columnOpts;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        minWidth: reMinWidth,
+        maxWidth: reMaxWidth
+      } = resizableOpts;
       const {
         mode
       } = customOpts;
       const modalOpts = Object.assign({}, modalOptions);
       const drawerOpts = Object.assign({}, drawerOptions);
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+      const slots = customOpts.slots || {};
+      const headerSlot = slots.header;
+      const topSlot = slots.top;
+      const bottomSlot = slots.bottom;
+      const defaultSlot = slots.default;
+      const footerSlot = slots.footer;
       const trVNs = [];
+      const isAllChecked = customStore.isAll;
+      const isAllIndeterminate = customStore.isIndeterminate;
+      const dragColumn = dragColumnRef.value;
+      const params = {
+        $table: $xeTable,
+        $grid: $xeTable.xegrid,
+        columns: customColumnList,
+        isAllChecked,
+        isAllIndeterminate
+      };
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
         const isVisible = visibleMethod ? visibleMethod({
           column
         }) : true;
         if (isVisible) {
+          // 默认继承调整宽度
+          let customMinWidth = 0;
+          let customMaxWidth = 0;
+          if (allowResizable) {
+            const resizeParams = {
+              $table: $xeTable,
+              column,
+              columnIndex: index,
+              $columnIndex: index,
+              $rowIndex: -1
+            };
+            if (reMinWidth) {
+              customMinWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(reMinWidth) ? reMinWidth(resizeParams) : reMinWidth);
+            }
+            if (reMaxWidth) {
+              customMaxWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(reMaxWidth) ? reMaxWidth(resizeParams) : reMaxWidth);
+            }
+          }
           const isChecked = column.renderVisible;
           const isIndeterminate = column.halfVisible;
           const colTitle = formatText(column.getTitle(), 1);
@@ -7363,10 +7310,12 @@ const {
             title: colTitle
           }, colTitle)]), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--resizable'
-          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
+          }, [column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUINumberInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUINumberInputComponent, {
             type: 'integer',
             disabled: isDisabled || isHidden,
             modelValue: column.renderResizeWidth,
+            min: customMinWidth || undefined,
+            max: customMaxWidth || undefined,
             'onUpdate:modelValue'(value) {
               column.renderResizeWidth = Math.max(0, Number(value));
             }
@@ -7396,36 +7345,28 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]));
         }
       });
-      const isAllChecked = customStore.isAll;
-      const isAllIndeterminate = customStore.isIndeterminate;
-      const dragColumn = dragColumnRef.value;
       const scopedSlots = {
         default: () => {
+          if (defaultSlot) {
+            return $xeTable.callSlot(defaultSlot, params);
+          }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: bodyElemRef,
             class: 'vxe-table-custom-popup--body'
-          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          }, [topSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom-popup--table-top'
+          }, $xeTable.callSlot(topSlot, params)) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--table-wrapper'
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('table', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('colgroup', {}, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '80px'
-            }
+            class: 'vxe-table-custom-popup--table-col-seq'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowSort ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '80px'
-            }
+            class: 'vxe-table-custom-popup--table-col-sort'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              minWidth: '120px'
-            }
+            class: 'vxe-table-custom-popup--table-col-title'
           }), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '140px'
-            }
+            class: 'vxe-table-custom-popup--table-col-width'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('col', {
-            style: {
-              width: '200px'
-            }
+            class: 'vxe-table-custom-popup--table-col-fixed'
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {}, [allowVisible ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: ['vxe-table-custom--checkbox-option', {
               'is--checked': isAllChecked,
@@ -7450,17 +7391,22 @@ const {
               });
             }
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
-            class: 'vxe-table-custom--body',
+            class: 'vxe-table-custom--panel-list',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
           }, {
             default: () => trVNs
-          })])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          })])]), bottomSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-table-custom-popup--table-bottom'
+          }, $xeTable.callSlot(bottomSlot, params)) : panel_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             ref: dragHintElemRef,
             class: 'vxe-table-custom-popup--drag-hint'
           }, panel_getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))]);
         },
         footer: () => {
+          if (footerSlot) {
+            return $xeTable.callSlot(footerSlot, params);
+          }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-table-custom-popup--footer'
           }, [VxeUIButtonComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIButtonComponent, {
@@ -7476,6 +7422,9 @@ const {
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
         }
       };
+      if (headerSlot) {
+        scopedSlots.header = () => $xeTable.callSlot(headerSlot, params);
+      }
       if (mode === 'drawer') {
         return VxeUIDrawerComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIDrawerComponent, {
           key: 'drawer',
@@ -7537,8 +7486,8 @@ const {
         if (!VxeUIButtonComponent) {
           errLog('vxe.error.reqComp', ['vxe-button']);
         }
-        if (!VxeUIInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input']);
+        if (!VxeUINumberInputComponent) {
+          errLog('vxe.error.reqComp', ['vxe-number-input']);
         }
         if (!VxeUITooltipComponent) {
           errLog('vxe.error.reqComp', ['vxe-tooltip']);
@@ -8578,7 +8527,8 @@ const {
   hooks: table_hooks,
   globalEvents: table_globalEvents,
   GLOBAL_EVENT_KEYS,
-  useFns
+  useFns,
+  renderEmptyElement: table_renderEmptyElement
 } = core_.VxeUI;
 const isWebkit = browse['-webkit'] && !browse.edge;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -11107,7 +11057,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             $table: $xeTable,
             row
           })).then(childRecords => {
-            rowRest.treeLoaded = true;
+            if (rowRest) {
+              rowRest.treeLoaded = true;
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
             }
@@ -11137,7 +11089,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const {
               treeExpandLazyLoadedMaps
             } = reactData;
-            rowRest.treeLoaded = false;
+            if (rowRest) {
+              rowRest.treeLoaded = false;
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
             }
@@ -11188,10 +11142,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const {
               rowExpandedMaps
             } = reactData;
-            rowRest.expandLoaded = true;
+            if (rowRest) {
+              rowRest.expandLoaded = true;
+            }
             rowExpandedMaps[rowid] = row;
           }).catch(() => {
-            rowRest.expandLoaded = false;
+            if (rowRest) {
+              rowRest.expandLoaded = false;
+            }
           }).finally(() => {
             const {
               rowExpandLazyLoadedMaps
@@ -11747,13 +11705,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const rowid = getRowid($xeTable, row);
           if (!treeTempExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid];
-            const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-            // 是否使用懒加载
-            if (isLoad) {
-              result.push(handleAsyncTreeExpandChilds(row));
-            } else {
-              if (row[childrenField] && row[childrenField].length) {
-                treeTempExpandedMaps[rowid] = row;
+            if (rowRest) {
+              const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
+              // 是否使用懒加载
+              if (isLoad) {
+                result.push(handleAsyncTreeExpandChilds(row));
+              } else {
+                if (row[childrenField] && row[childrenField].length) {
+                  treeTempExpandedMaps[rowid] = row;
+                }
               }
             }
           }
@@ -12776,38 +12736,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 如果已关联工具栏，则会同步更新
        */
       resetColumn(options) {
-        const {
-          collectColumn
-        } = internalData;
-        const customOpts = computeCustomOpts.value;
-        const {
-          checkMethod
-        } = customOpts;
-        const opts = Object.assign({
-          visible: true,
-          resizable: options === true,
-          fixed: options === true,
-          sort: options === true
-        }, options);
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
-          if (opts.resizable) {
-            column.resizeWidth = 0;
-          }
-          if (opts.fixed) {
-            column.fixed = column.defaultFixed;
-          }
-          if (opts.sort) {
-            column.renderSortNumber = column.sortNumber;
-          }
-          if (!checkMethod || checkMethod({
-            column
-          })) {
-            column.visible = column.defaultVisible;
-          }
-          column.renderResizeWidth = column.renderWidth;
-        });
-        $xeTable.saveCustomStore('reset');
-        return tablePrivateMethods.handleCustom();
+        warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
+        return $xeTable.resetCustom(options);
       },
       /**
        * 刷新列信息
@@ -14911,7 +14841,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
     };
     const updateRowDropTipContent = tdEl => {
-      reactData.dragTipText = tdEl.textContent || '';
+      const {
+        dragRow
+      } = reactData;
+      const dragOpts = computeDragOpts.value;
+      const {
+        rowTooltipMethod
+      } = dragOpts;
+      let tipContent = '';
+      if (rowTooltipMethod) {
+        tipContent = `${rowTooltipMethod({
+          row: dragRow
+        }) || ''}`;
+      } else {
+        tipContent = table_getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
+      }
+      reactData.dragTipText = tipContent;
     };
     /**
      * 处理显示 tooltip
@@ -14952,6 +14897,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
+    const callSlot = (slotFunc, params) => {
+      if (slotFunc) {
+        if ($xeGrid) {
+          return $xeGrid.callSlot(slotFunc, params);
+        }
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
+          return getSlotVNs(slotFunc(params));
+        }
+      }
+      return [];
+    };
     /**
      * 内部方法
      */
@@ -14960,17 +14916,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return table_getConfig();
       },
       updateAfterDataIndex,
-      callSlot(slotFunc, params) {
-        if (slotFunc) {
-          if ($xeGrid) {
-            return $xeGrid.callSlot(slotFunc, params);
-          }
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(slotFunc)) {
-            return getSlotVNs(slotFunc(params));
-          }
-        }
-        return [];
-      },
+      callSlot,
       /**
        * 获取父容器元素
        */
@@ -16730,7 +16676,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn,
         tableGroupColumn,
         fixedColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(body, {
+      }) : table_renderEmptyElement($xeTable), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(body, {
         ref: isFixedLeft ? refTableLeftBody : refTableRightBody,
         fixedType,
         tableData,
@@ -16742,7 +16688,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn,
         fixedColumn,
         fixedType
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
+      }) : table_renderEmptyElement($xeTable)]);
     };
     const renderEmptyBody = () => {
       const emptyOpts = computeEmptyOpts.value;
@@ -16797,7 +16743,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         columnStore,
         filterStore,
         customStore,
-        tooltipStore
+        tooltipStore,
+        dragRow,
+        dragTipText
       } = reactData;
       const {
         leftList,
@@ -16809,6 +16757,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const checkboxOpts = computeCheckboxOpts.value;
       const treeOpts = computeTreeOpts.value;
       const rowOpts = computeRowOpts.value;
+      const dragOpts = computeDragOpts.value;
       const columnOpts = computeColumnOpts.value;
       const vSize = computeSize.value;
       const tableBorder = computeTableBorder.value;
@@ -16818,6 +16767,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const isMenu = computeIsMenu.value;
       const currLoading = reactData._isLoading || loading;
       const virtualScrollBars = computeVirtualScrollBars.value;
+      const dragSlots = dragOpts.slots || {};
+      const rowTipSlot = dragSlots.rowTip;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
@@ -16871,7 +16822,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableData,
         tableColumn,
         tableGroupColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 表体
        */
@@ -16887,9 +16838,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         ref: refTableFooter,
         footerTableData,
         tableColumn
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }) : table_renderEmptyElement($xeTable)]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--fixed-wrapper'
-      }, [leftList && leftList.length && overflowX ? renderFixed('left') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), rightList && rightList.length && overflowX ? renderFixed('right') : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), virtualScrollBars.x ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, [leftList && leftList.length && overflowX ? renderFixed('left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed('right') : table_renderEmptyElement($xeTable)])]), virtualScrollBars.x ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'vx',
         ref: refScrollXVirtualElem,
         class: 'vxe-table--scroll-x-virtual'
@@ -16900,7 +16851,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refScrollXSpaceElem,
         class: 'vxe-table--scroll-x-space'
-      })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), virtualScrollBars.y ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      })])]) : table_renderEmptyElement($xeTable), virtualScrollBars.y ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'vy',
         ref: refScrollYVirtualElem,
         class: 'vxe-table--scroll-y-virtual'
@@ -16911,7 +16862,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refScrollYSpaceElem,
         class: 'vxe-table--scroll-x-space'
-      })])]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      })])]) : table_renderEmptyElement($xeTable),
       /**
        * 空数据
        */
@@ -16954,7 +16905,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           $table: $xeTable,
           $grid: $xeGrid
         })
-      } : {}) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      } : {}) : table_renderEmptyElement($xeTable),
       /**
        * 自定义列
        */
@@ -16962,7 +16913,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'cs',
         ref: refTableCustom,
         customStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 筛选
        */
@@ -16970,7 +16921,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'tf',
         ref: refTableFilter,
         filterStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 导入
        */
@@ -16978,7 +16929,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'it',
         defaultOptions: reactData.importParams,
         storeData: reactData.importStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 导出
        */
@@ -16986,21 +16937,23 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         key: 'et',
         defaultOptions: reactData.exportParams,
         storeData: reactData.exportStore
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 快捷菜单
        */
       isMenu ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(menu_panel, {
         key: 'tm',
         ref: refTableMenu
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      }) : table_renderEmptyElement($xeTable),
       /**
        * 拖拽提示
        */
-      rowOpts.drag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      rowOpts.drag && (dragRow || dragTipText) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refRowDragTipElem,
-        class: 'vxe-table--row-drag-hint'
-      }, table_getI18n('vxe.table.dragTip', [reactData.dragTipText])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+        class: 'vxe-table--row-drag-tip'
+      }, rowTipSlot ? dragRow ? callSlot(rowTipSlot, {
+        row: dragRow
+      }) : [table_renderEmptyElement($xeTable)] : dragTipText ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', dragTipText)] : [table_renderEmptyElement($xeTable)]) : table_renderEmptyElement($xeTable),
       /**
        * 提示相关
        */
@@ -17031,7 +16984,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           'old-cell-valid': editRules && table_getConfig().cellVaildMode === 'obsolete'
         }, 'vxe-table--valid-error'],
         ...(validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})
-      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]);
+      }) : table_renderEmptyElement($xeTable)]) : table_renderEmptyElement($xeTable)]);
     };
     const dataFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.data ? props.data.length : -1, () => {
@@ -21622,7 +21575,7 @@ validator_hook_hooks.add('tableValidatorModule', {
       const validOpts = computeValidOpts.value;
       if (validOpts.msgMode === 'single') {
         const keys = Object.keys(validErrMaps);
-        const resMaps = validErrMaps;
+        const resMaps = {};
         if (keys.length) {
           const firstKey = keys[0];
           resMaps[firstKey] = validErrMaps[firstKey];
@@ -22128,7 +22081,7 @@ validator_hook_hooks.add('tableValidatorModule', {
 
 
 
-const tableCustomMethodKeys = ['openCustom', 'closeCustom'];
+const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 core_.VxeUI.hooks.add('tableCustomModule', {
   setupTable($xeTable) {
     const {
@@ -22152,7 +22105,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       if (el) {
         tableHeight = el.clientHeight - 28;
       }
-      customStore.maxHeight = Math.max(4, tableHeight);
+      customStore.maxHeight = Math.max(88, tableHeight);
     };
     const openCustom = () => {
       const {
@@ -22199,9 +22152,183 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
+    const saveCustom = () => {
+      const {
+        customColumnList
+      } = reactData;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
+          if (allowSort) {
+            const sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed;
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth;
+              column.renderWidth = column.renderResizeWidth;
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible;
+        }
+      });
+      return $xeTable.saveCustomStore('confirm');
+    };
+    const cancelCustom = () => {
+      const {
+        customColumnList,
+        customStore
+      } = reactData;
+      const {
+        oldSortMaps,
+        oldFixedMaps,
+        oldVisibleMaps
+      } = customStore;
+      const customOpts = computeCustomOpts.value;
+      const {
+        allowVisible,
+        allowSort,
+        allowFixed,
+        allowResizable
+      } = customOpts;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+        const colid = column.getKey();
+        const visible = !!oldVisibleMaps[colid];
+        const fixed = oldFixedMaps[colid] || '';
+        if (allowVisible) {
+          column.renderVisible = visible;
+          column.visible = visible;
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed;
+          column.fixed = fixed;
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0;
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth;
+        }
+      }, {
+        children: 'children'
+      });
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
+    const setCustomAllCheckbox = checked => {
+      const {
+        customStore
+      } = reactData;
+      const {
+        customColumnList
+      } = reactData;
+      const customOpts = computeCustomOpts.value;
+      const {
+        checkMethod,
+        visibleMethod
+      } = customOpts;
+      const isAll = !!checked;
+      if (customOpts.immediate) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.visible = isAll;
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+        $xeTable.handleCustom();
+        $xeTable.saveCustomStore('update:visible');
+      } else {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, column => {
+          if (visibleMethod && !visibleMethod({
+            column
+          })) {
+            return;
+          }
+          if (checkMethod && !checkMethod({
+            column
+          })) {
+            return;
+          }
+          column.renderVisible = isAll;
+          column.halfVisible = false;
+        });
+        customStore.isAll = isAll;
+      }
+      $xeTable.checkCustomStatus();
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+    };
     const customMethods = {
       openCustom,
-      closeCustom
+      closeCustom,
+      saveCustom,
+      cancelCustom,
+      resetCustom(options) {
+        const {
+          collectColumn
+        } = internalData;
+        const customOpts = computeCustomOpts.value;
+        const {
+          checkMethod
+        } = customOpts;
+        const opts = Object.assign({
+          visible: true,
+          resizable: options === true,
+          fixed: options === true,
+          sort: options === true
+        }, options);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+          if (opts.resizable) {
+            column.resizeWidth = 0;
+          }
+          if (opts.fixed) {
+            column.fixed = column.defaultFixed;
+          }
+          if (opts.sort) {
+            column.renderSortNumber = column.sortNumber;
+          }
+          if (!checkMethod || checkMethod({
+            column
+          })) {
+            column.visible = column.defaultVisible;
+          }
+          column.renderResizeWidth = column.renderWidth;
+        });
+        $xeTable.saveCustomStore('reset');
+        return $xeTable.handleCustom();
+      },
+      toggleCustomAllCheckbox() {
+        const {
+          customStore
+        } = reactData;
+        const isAll = !customStore.isAll;
+        return setCustomAllCheckbox(isAll);
+      },
+      setCustomAllCheckbox
     };
     const checkCustomStatus = () => {
       const {
@@ -24817,7 +24944,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
             $xeTable.openExport(btnParams);
             break;
           case 'reset_custom':
-            return $xeTable.resetColumn(true);
+            return $xeTable.resetCustom(true);
           case '_init':
           case 'reload':
           case 'query':