vxe-table 4.23.8 → 4.23.9

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

@@ -414,7 +414,7 @@ var panel_default = defineVxeComponent({
               } else {
               }
               const oldewMatchRest = XEUtils.findTree(collectColumn, (item) => item.id === dragColumn.id);
-              if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
+              if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                 if (oldewMatchRest) {
                   const { items: oCols, index: oIndex } = oldewMatchRest;
                   const childList = dragColumn.children || [];
@@ -601,41 +601,60 @@ var panel_default = defineVxeComponent({
       return h("div", {}, [
         h("div", {
           ref: refDragLineElem,
-          class: ["vxe-table-custom-popup--drag-line", {
-            "is--guides": columnDragOpts.showGuidesStatus
-          }]
+          class: [
+            "vxe-table-custom-popup--drag-line",
+            {
+              "is--guides": columnDragOpts.showGuidesStatus
+            }
+          ]
         }),
-        h("div", {
-          ref: refDragTipElem,
-          class: "vxe-table-custom-popup--drag-tip"
-        }, [
-          h("div", {
-            class: "vxe-table-custom-popup--drag-tip-wrapper"
-          }, [
-            h("div", {
-              class: "vxe-table-custom-popup--drag-tip-status"
-            }, [
-              h("span", {
-                class: ["vxe-table-custom-popup--drag-tip-normal-status", getIcon().TABLE_DRAG_STATUS_ROW]
-              }),
-              h("span", {
-                class: ["vxe-table-custom-popup--drag-tip-sub-status", getIcon().TABLE_DRAG_STATUS_SUB_ROW]
-              }),
-              h("span", {
-                class: ["vxe-table-custom-popup--drag-tip-group-status", getIcon().TABLE_DRAG_STATUS_AGG_GROUP]
-              }),
-              h("span", {
-                class: ["vxe-table-custom-popup--drag-tip-values-status", getIcon().TABLE_DRAG_STATUS_AGG_VALUES]
-              }),
-              h("span", {
-                class: ["vxe-table-custom-popup--drag-tip-disabled-status", getIcon().TABLE_DRAG_DISABLED]
-              })
-            ]),
-            h("div", {
-              class: "vxe-table-custom-popup--drag-tip-content"
-            }, `${dragTipText || ""}`)
-          ])
-        ])
+        h(
+          "div",
+          {
+            ref: refDragTipElem,
+            class: "vxe-table-custom-popup--drag-tip"
+          },
+          [
+            h(
+              "div",
+              {
+                class: "vxe-table-custom-popup--drag-tip-wrapper"
+              },
+              [
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-custom-popup--drag-tip-status"
+                  },
+                  [
+                    h("span", {
+                      class: ["vxe-table-custom-popup--drag-tip-normal-status", getIcon().TABLE_DRAG_STATUS_ROW]
+                    }),
+                    h("span", {
+                      class: ["vxe-table-custom-popup--drag-tip-sub-status", getIcon().TABLE_DRAG_STATUS_SUB_ROW]
+                    }),
+                    h("span", {
+                      class: ["vxe-table-custom-popup--drag-tip-group-status", getIcon().TABLE_DRAG_STATUS_AGG_GROUP]
+                    }),
+                    h("span", {
+                      class: ["vxe-table-custom-popup--drag-tip-values-status", getIcon().TABLE_DRAG_STATUS_AGG_VALUES]
+                    }),
+                    h("span", {
+                      class: ["vxe-table-custom-popup--drag-tip-disabled-status", getIcon().TABLE_DRAG_DISABLED]
+                    })
+                  ]
+                ),
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-custom-popup--drag-tip-content"
+                  },
+                  `${dragTipText || ""}`
+                )
+              ]
+            )
+          ]
+        )
       ]);
     };
     const renderSimplePanel = () => {
@@ -686,234 +705,347 @@ var panel_default = defineVxeComponent({
           const isHidden = !isChecked;
           const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1;
           colVNs.push(
-            h("li", {
-              key: column.id,
-              colid: column.id,
-              class: ["vxe-table-custom--option", `level--${column.level}`, {
-                "is--hidden": isDisabled || isHidden,
-                "is--group": isColGroup
-              }],
-              onDragstart: sortDragstartEvent,
-              onDragend: sortDragendEvent,
-              onDragover: sortDragoverEvent
-            }, [
-              allowVisible ? h("div", {
-                class: ["vxe-table-custom--checkbox-option", {
-                  "is--checked": isChecked,
-                  "is--indeterminate": isIndeterminate,
-                  "is--disabled": isDisabled
-                }],
-                title: getI18n("vxe.custom.setting.colVisible"),
-                onClick: (evnt) => {
-                  if (!isDisabled) {
-                    changeCheckboxOption(column, evnt);
+            h(
+              "li",
+              {
+                key: column.id,
+                colid: column.id,
+                class: [
+                  "vxe-table-custom--option",
+                  `level--${column.level}`,
+                  {
+                    "is--hidden": isDisabled || isHidden,
+                    "is--group": isColGroup
                   }
-                }
-              }, [
-                h("span", {
-                  class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-                })
-              ]) : renderEmptyElement($xeTable),
-              h("div", {
-                class: "vxe-table-custom--name-option"
-              }, [
-                allowSort && showSortDragButton || (allowGroup || allowValues) ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h("div", {
-                  class: "vxe-table-custom--sort-option"
-                }, [
-                  h("span", {
-                    class: ["vxe-table-custom--sort-btn", {
-                      "is--disabled": isHidden
-                    }],
-                    title: getI18n("vxe.custom.setting.sortHelpTip"),
-                    ...isHidden ? {} : {
-                      onMousedown: sortMousedownEvent,
-                      onMouseup: sortMouseupEvent
+                ],
+                onDragstart: sortDragstartEvent,
+                onDragend: sortDragendEvent,
+                onDragover: sortDragoverEvent
+              },
+              [
+                allowVisible ? h(
+                  "div",
+                  {
+                    class: [
+                      "vxe-table-custom--checkbox-option",
+                      {
+                        "is--checked": isChecked,
+                        "is--indeterminate": isIndeterminate,
+                        "is--disabled": isDisabled
+                      }
+                    ],
+                    title: getI18n("vxe.custom.setting.colVisible"),
+                    onClick: (evnt) => {
+                      if (!isDisabled) {
+                        changeCheckboxOption(column, evnt);
+                      }
                     }
-                  }, [
-                    h("i", {
-                      class: getIcon().TABLE_CUSTOM_SORT
+                  },
+                  [
+                    h("span", {
+                      class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
                     })
-                  ])
-                ]) : renderEmptyElement($xeTable) : renderEmptyElement($xeTable),
-                column.type === "html" ? h("div", {
-                  key: "1",
-                  class: "vxe-table-custom--checkbox-label",
-                  innerHTML: colTitle
-                }) : h("div", {
-                  key: "0",
-                  class: "vxe-table-custom--checkbox-label"
-                }, colTitle)
-              ]),
-              showSortBtn && (showSortMoveButton || showSortPutButton) ? h("div", {
-                class: "vxe-table-custom--move-btn-option"
-              }, VxeUIButtonComponent ? [
-                showSortMoveButton ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: "vxe-icon-arrows-up",
-                  title: getI18n("vxe.custom.setting.moveUpTitle"),
-                  disabled: index <= 0,
-                  onClick(evntParame) {
-                    sortMoveUpEvent(evntParame, column);
-                  }
-                }) : renderEmptyElement($xeTable),
-                showSortMoveButton ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: "vxe-icon-arrows-down",
-                  title: getI18n("vxe.custom.setting.moveDnTitle"),
-                  disabled: index >= items.length - 1,
-                  onClick(evntParame) {
-                    sortMoveDnEvent(evntParame, column);
-                  }
-                }) : renderEmptyElement($xeTable),
-                showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: "vxe-icon-top",
-                  title: getI18n("vxe.custom.setting.putTopTitle"),
-                  disabled: index <= 0,
-                  onClick(evntParame) {
-                    sortMoveTopEvent(evntParame, column);
-                  }
-                }) : renderEmptyElement($xeTable),
-                showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: "vxe-icon-bottom",
-                  title: getI18n("vxe.custom.setting.putBottomTitle"),
-                  disabled: index >= items.length - 1,
-                  onClick(evntParame) {
-                    sortMoveBottomEvent(evntParame, column);
-                  }
-                }) : renderEmptyElement($xeTable)
-              ] : []) : renderEmptyElement($xeTable),
-              !parentItem && allowFixed ? h("div", {
-                class: "vxe-table-custom--fixed-option"
-              }, VxeUIButtonComponent ? [
-                h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: column.renderFixed === "left" ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
-                  status: column.renderFixed === "left" ? "primary" : "",
-                  disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
-                  title: getI18n(column.renderFixed === "left" ? "vxe.toolbar.cancelFixed" : "vxe.toolbar.fixedLeft"),
-                  onClick: ({ $event }) => {
-                    changeFixedOption(column, "left", $event);
-                  }
-                }),
-                h(VxeUIButtonComponent, {
-                  mode: "text",
-                  icon: column.renderFixed === "right" ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
-                  status: column.renderFixed === "right" ? "primary" : "",
-                  disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
-                  title: getI18n(column.renderFixed === "right" ? "vxe.toolbar.cancelFixed" : "vxe.toolbar.fixedRight"),
-                  onClick: ({ $event }) => {
-                    changeFixedOption(column, "right", $event);
-                  }
-                })
-              ] : []) : renderEmptyElement($xeTable)
-            ])
+                  ]
+                ) : renderEmptyElement($xeTable),
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-custom--name-option"
+                  },
+                  [
+                    allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h(
+                      "div",
+                      {
+                        class: "vxe-table-custom--sort-option"
+                      },
+                      [
+                        h(
+                          "span",
+                          {
+                            class: [
+                              "vxe-table-custom--sort-btn",
+                              {
+                                "is--disabled": isHidden
+                              }
+                            ],
+                            title: getI18n("vxe.custom.setting.sortHelpTip"),
+                            ...isHidden ? {} : {
+                              onMousedown: sortMousedownEvent,
+                              onMouseup: sortMouseupEvent
+                            }
+                          },
+                          [
+                            h("i", {
+                              class: getIcon().TABLE_CUSTOM_SORT
+                            })
+                          ]
+                        )
+                      ]
+                    ) : renderEmptyElement($xeTable) : renderEmptyElement($xeTable),
+                    column.type === "html" ? h("div", {
+                      key: "1",
+                      class: "vxe-table-custom--checkbox-label",
+                      innerHTML: colTitle
+                    }) : h(
+                      "div",
+                      {
+                        key: "0",
+                        class: "vxe-table-custom--checkbox-label"
+                      },
+                      colTitle
+                    )
+                  ]
+                ),
+                showSortBtn && (showSortMoveButton || showSortPutButton) ? h(
+                  "div",
+                  {
+                    class: "vxe-table-custom--move-btn-option"
+                  },
+                  VxeUIButtonComponent ? [
+                    showSortMoveButton ? h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: "vxe-icon-arrows-up",
+                      title: getI18n("vxe.custom.setting.moveUpTitle"),
+                      disabled: index <= 0,
+                      onClick(evntParame) {
+                        sortMoveUpEvent(evntParame, column);
+                      }
+                    }) : renderEmptyElement($xeTable),
+                    showSortMoveButton ? h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: "vxe-icon-arrows-down",
+                      title: getI18n("vxe.custom.setting.moveDnTitle"),
+                      disabled: index >= items.length - 1,
+                      onClick(evntParame) {
+                        sortMoveDnEvent(evntParame, column);
+                      }
+                    }) : renderEmptyElement($xeTable),
+                    showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: "vxe-icon-top",
+                      title: getI18n("vxe.custom.setting.putTopTitle"),
+                      disabled: index <= 0,
+                      onClick(evntParame) {
+                        sortMoveTopEvent(evntParame, column);
+                      }
+                    }) : renderEmptyElement($xeTable),
+                    showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: "vxe-icon-bottom",
+                      title: getI18n("vxe.custom.setting.putBottomTitle"),
+                      disabled: index >= items.length - 1,
+                      onClick(evntParame) {
+                        sortMoveBottomEvent(evntParame, column);
+                      }
+                    }) : renderEmptyElement($xeTable)
+                  ] : []
+                ) : renderEmptyElement($xeTable),
+                !parentItem && allowFixed ? h(
+                  "div",
+                  {
+                    class: "vxe-table-custom--fixed-option"
+                  },
+                  VxeUIButtonComponent ? [
+                    h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: column.renderFixed === "left" ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
+                      status: column.renderFixed === "left" ? "primary" : "",
+                      disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+                      title: getI18n(column.renderFixed === "left" ? "vxe.toolbar.cancelFixed" : "vxe.toolbar.fixedLeft"),
+                      onClick: ({ $event }) => {
+                        changeFixedOption(column, "left", $event);
+                      }
+                    }),
+                    h(VxeUIButtonComponent, {
+                      mode: "text",
+                      icon: column.renderFixed === "right" ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
+                      status: column.renderFixed === "right" ? "primary" : "",
+                      disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
+                      title: getI18n(column.renderFixed === "right" ? "vxe.toolbar.cancelFixed" : "vxe.toolbar.fixedRight"),
+                      onClick: ({ $event }) => {
+                        changeFixedOption(column, "right", $event);
+                      }
+                    })
+                  ] : []
+                ) : renderEmptyElement($xeTable)
+              ]
+            )
           );
         }
       });
-      return h("div", {
-        ref: refElem,
-        key: "simple",
-        class: ["vxe-table-custom-wrapper", `placement--${placement}`, {
-          [`size--${vSize}`]: vSize,
-          "is--active": customStore.visible
-        }],
-        style: defPopupStyle
-      }, customStore.visible ? [
-        h("div", {
-          ref: refBodyWrapperElem,
-          class: "vxe-table-custom-simple--body-wrapper"
-        }, [
-          !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
-            customStore
-          }) : renderEmptyElement($xeTable),
-          h("div", {
-            ref: refCustomBodyElem,
-            class: "vxe-table-custom--handle-wrapper"
-          }, [
-            h("div", {
-              class: "vxe-table-custom--header"
-            }, headerSlot ? $xeTable.callSlot(headerSlot, params) : [
-              h("ul", {
-                class: "vxe-table-custom--panel-list"
-              }, [
-                h("li", {
-                  class: "vxe-table-custom--option"
-                }, [
-                  allowVisible ? h("div", {
-                    class: ["vxe-table-custom--checkbox-option", {
-                      "is--checked": isAllChecked,
-                      "is--indeterminate": isAllIndeterminate
-                    }],
-                    title: getI18n("vxe.table.allTitle"),
-                    onClick: 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"))
-                  ]) : h("span", {
-                    class: "vxe-checkbox--label"
-                  }, getI18n("vxe.table.customTitle"))
-                ])
-              ])
-            ]),
-            h("div", {
-              class: "vxe-table-custom--body"
-            }, [
-              topSlot ? h("div", {
-                class: "vxe-table-custom--panel-top"
-              }, $xeTable.callSlot(topSlot, params)) : renderEmptyElement($xeTable),
-              defaultSlot ? h("div", {
-                class: "vxe-table-custom--panel-body"
-              }, $xeTable.callSlot(defaultSlot, params)) : h(TransitionGroup, {
-                class: "vxe-table-custom--panel-list",
-                name: isCustomDragStatus ? "vxe-table-custom--list" : "",
-                tag: "ul",
-                ...customWrapperOns
-              }, {
-                default: () => colVNs
-              }),
-              bottomSlot ? h("div", {
-                class: "vxe-table-custom--panel-bottom"
-              }, $xeTable.callSlot(bottomSlot, params)) : renderEmptyElement($xeTable)
-            ]),
-            customOpts.showFooter ? h("div", {
-              class: "vxe-table-custom--footer"
-            }, footerSlot ? $xeTable.callSlot(footerSlot, params) : [
-              h("div", {
-                class: "vxe-table-custom--footer-buttons"
-              }, [
-                VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  content: customOpts.resetButtonText || getI18n("vxe.table.customRestore"),
-                  disabled: !isCustomStatus,
-                  onClick: resetCustomEvent
-                }) : renderEmptyElement($xeTable),
-                immediate ? VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  content: customOpts.closeButtonText || getI18n("vxe.table.customClose"),
-                  onClick: cancelCloseEvent
-                }) : renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  content: customOpts.cancelButtonText || getI18n("vxe.table.customCancel"),
-                  onClick: cancelCustomEvent
-                }) : renderEmptyElement($xeTable),
-                immediate ? renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-                  mode: "text",
-                  status: "primary",
-                  content: customOpts.confirmButtonText || getI18n("vxe.table.customConfirm"),
-                  onClick: confirmCustomEvent
-                }) : renderEmptyElement($xeTable)
-              ])
-            ]) : null
-          ]),
-          renderDragTip()
-        ])
-      ] : []);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          key: "simple",
+          class: [
+            "vxe-table-custom-wrapper",
+            `placement--${placement}`,
+            {
+              [`size--${vSize}`]: vSize,
+              "is--active": customStore.visible
+            }
+          ],
+          style: defPopupStyle
+        },
+        customStore.visible ? [
+          h(
+            "div",
+            {
+              ref: refBodyWrapperElem,
+              class: "vxe-table-custom-simple--body-wrapper"
+            },
+            [
+              !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
+                customStore
+              }) : renderEmptyElement($xeTable),
+              h(
+                "div",
+                {
+                  ref: refCustomBodyElem,
+                  class: "vxe-table-custom--handle-wrapper"
+                },
+                [
+                  h(
+                    "div",
+                    {
+                      class: "vxe-table-custom--header"
+                    },
+                    headerSlot ? $xeTable.callSlot(headerSlot, params) : [
+                      h(
+                        "ul",
+                        {
+                          class: "vxe-table-custom--panel-list"
+                        },
+                        [
+                          h(
+                            "li",
+                            {
+                              class: "vxe-table-custom--option"
+                            },
+                            [
+                              allowVisible ? h(
+                                "div",
+                                {
+                                  class: [
+                                    "vxe-table-custom--checkbox-option",
+                                    {
+                                      "is--checked": isAllChecked,
+                                      "is--indeterminate": isAllIndeterminate
+                                    }
+                                  ],
+                                  title: getI18n("vxe.table.allTitle"),
+                                  onClick: 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")
+                                  )
+                                ]
+                              ) : h(
+                                "span",
+                                {
+                                  class: "vxe-checkbox--label"
+                                },
+                                getI18n("vxe.table.customTitle")
+                              )
+                            ]
+                          )
+                        ]
+                      )
+                    ]
+                  ),
+                  h(
+                    "div",
+                    {
+                      class: "vxe-table-custom--body"
+                    },
+                    [
+                      topSlot ? h(
+                        "div",
+                        {
+                          class: "vxe-table-custom--panel-top"
+                        },
+                        $xeTable.callSlot(topSlot, params)
+                      ) : renderEmptyElement($xeTable),
+                      defaultSlot ? h(
+                        "div",
+                        {
+                          class: "vxe-table-custom--panel-body"
+                        },
+                        $xeTable.callSlot(defaultSlot, params)
+                      ) : h(
+                        TransitionGroup,
+                        {
+                          class: "vxe-table-custom--panel-list",
+                          name: isCustomDragStatus ? "vxe-table-custom--list" : "",
+                          tag: "ul",
+                          ...customWrapperOns
+                        },
+                        {
+                          default: () => colVNs
+                        }
+                      ),
+                      bottomSlot ? h(
+                        "div",
+                        {
+                          class: "vxe-table-custom--panel-bottom"
+                        },
+                        $xeTable.callSlot(bottomSlot, params)
+                      ) : renderEmptyElement($xeTable)
+                    ]
+                  ),
+                  customOpts.showFooter ? h(
+                    "div",
+                    {
+                      class: "vxe-table-custom--footer"
+                    },
+                    footerSlot ? $xeTable.callSlot(footerSlot, params) : [
+                      h(
+                        "div",
+                        {
+                          class: "vxe-table-custom--footer-buttons"
+                        },
+                        [
+                          VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                            mode: "text",
+                            content: customOpts.resetButtonText || getI18n("vxe.table.customRestore"),
+                            disabled: !isCustomStatus,
+                            onClick: resetCustomEvent
+                          }) : renderEmptyElement($xeTable),
+                          immediate ? VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                            mode: "text",
+                            content: customOpts.closeButtonText || getI18n("vxe.table.customClose"),
+                            onClick: cancelCloseEvent
+                          }) : renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                            mode: "text",
+                            content: customOpts.cancelButtonText || getI18n("vxe.table.customCancel"),
+                            onClick: cancelCustomEvent
+                          }) : renderEmptyElement($xeTable),
+                          immediate ? renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                            mode: "text",
+                            status: "primary",
+                            content: customOpts.confirmButtonText || getI18n("vxe.table.customConfirm"),
+                            onClick: confirmCustomEvent
+                          }) : renderEmptyElement($xeTable)
+                        ]
+                      )
+                    ]
+                  ) : null
+                ]
+              ),
+              renderDragTip()
+            ]
+          )
+        ] : []
+      );
     };
     const renderPopupBodys = () => {
       const { resizable: allResizable } = tableProps;
@@ -965,128 +1097,166 @@ var panel_default = defineVxeComponent({
           const tdVNs = [];
           if (allowVisible) {
             tdVNs.push(
-              h("td", {
-                key: "av",
-                class: "vxe-table-custom-popup--column-td col--visible"
-              }, [
-                h("div", {
-                  class: ["vxe-table-custom--checkbox-option", {
-                    "is--checked": isChecked,
-                    "is--indeterminate": isIndeterminate,
-                    "is--disabled": isDisabled
-                  }],
-                  title: getI18n("vxe.custom.setting.colVisible"),
-                  onClick: (evnt) => {
-                    if (!isDisabled) {
-                      changeCheckboxOption(column, evnt);
-                    }
-                  }
-                }, [
-                  h("span", {
-                    class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
-                  })
-                ])
-              ])
+              h(
+                "td",
+                {
+                  key: "av",
+                  class: "vxe-table-custom-popup--column-td col--visible"
+                },
+                [
+                  h(
+                    "div",
+                    {
+                      class: [
+                        "vxe-table-custom--checkbox-option",
+                        {
+                          "is--checked": isChecked,
+                          "is--indeterminate": isIndeterminate,
+                          "is--disabled": isDisabled
+                        }
+                      ],
+                      title: getI18n("vxe.custom.setting.colVisible"),
+                      onClick: (evnt) => {
+                        if (!isDisabled) {
+                          changeCheckboxOption(column, evnt);
+                        }
+                      }
+                    },
+                    [
+                      h("span", {
+                        class: ["vxe-checkbox--icon", isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED]
+                      })
+                    ]
+                  )
+                ]
+              )
             );
           }
           tdVNs.push(
-            h("td", {
-              key: "at",
-              class: "vxe-table-custom-popup--column-td col--name"
-            }, [
-              h("div", {
-                class: "vxe-table-custom-popup--name"
-              }, [
-                allowSort && showSortDragButton || (allowGroup || allowValues) ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h("div", {
-                  class: ["vxe-table-custom-popup--column-sort-btn", {
-                    "is--disabled": isHidden
-                  }],
-                  title: getI18n("vxe.custom.setting.sortHelpTip"),
-                  ...isHidden ? {} : {
-                    onMousedown: sortMousedownEvent,
-                    onMouseup: sortMouseupEvent
-                  }
-                }, [
-                  h("i", {
-                    class: getIcon().TABLE_CUSTOM_SORT
-                  })
-                ]) : h("div", {
-                  class: "vxe-table-custom-popup--column-sort-placeholder"
-                }) : renderEmptyElement($xeTable),
-                column.type === "html" ? h("div", {
-                  key: "1",
-                  class: "vxe-table-custom-popup--title",
-                  innerHTML: colTitle
-                }) : h("div", {
-                  key: "0",
-                  class: "vxe-table-custom-popup--title",
-                  title: colTitle
-                }, colTitle),
-                showSortBtn && (showSortMoveButton || showSortPutButton) ? h("div", {
-                  class: "vxe-table-custom-popup--move-btn"
-                }, VxeUIButtonComponent ? [
-                  showSortMoveButton ? h(VxeUIButtonComponent, {
-                    mode: "text",
-                    icon: "vxe-icon-arrows-up",
-                    title: getI18n("vxe.custom.setting.moveUpTitle"),
-                    disabled: index <= 0,
-                    onClick(evntParame) {
-                      sortMoveUpEvent(evntParame, column);
-                    }
-                  }) : renderEmptyElement($xeTable),
-                  showSortMoveButton ? h(VxeUIButtonComponent, {
-                    mode: "text",
-                    icon: "vxe-icon-arrows-down",
-                    title: getI18n("vxe.custom.setting.moveDnTitle"),
-                    disabled: index >= items.length - 1,
-                    onClick(evntParame) {
-                      sortMoveDnEvent(evntParame, column);
-                    }
-                  }) : renderEmptyElement($xeTable),
-                  showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
-                    mode: "text",
-                    icon: "vxe-icon-top",
-                    title: getI18n("vxe.custom.setting.putTopTitle"),
-                    disabled: index <= 0,
-                    onClick(evntParame) {
-                      sortMoveTopEvent(evntParame, column);
-                    }
-                  }) : renderEmptyElement($xeTable),
-                  showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
-                    mode: "text",
-                    icon: "vxe-icon-bottom",
-                    title: getI18n("vxe.custom.setting.putBottomTitle"),
-                    disabled: index >= items.length - 1,
-                    onClick(evntParame) {
-                      sortMoveBottomEvent(evntParame, column);
-                    }
-                  }) : renderEmptyElement($xeTable)
-                ] : []) : renderEmptyElement($xeTable)
-              ])
-            ])
+            h(
+              "td",
+              {
+                key: "at",
+                class: "vxe-table-custom-popup--column-td col--name"
+              },
+              [
+                h(
+                  "div",
+                  {
+                    class: "vxe-table-custom-popup--name"
+                  },
+                  [
+                    allowSort && showSortDragButton || allowGroup || allowValues ? showSortBtn || (allowGroup || allowValues) && !isColGroup ? h(
+                      "div",
+                      {
+                        class: [
+                          "vxe-table-custom-popup--column-sort-btn",
+                          {
+                            "is--disabled": isHidden
+                          }
+                        ],
+                        title: getI18n("vxe.custom.setting.sortHelpTip"),
+                        ...isHidden ? {} : {
+                          onMousedown: sortMousedownEvent,
+                          onMouseup: sortMouseupEvent
+                        }
+                      },
+                      [
+                        h("i", {
+                          class: getIcon().TABLE_CUSTOM_SORT
+                        })
+                      ]
+                    ) : h("div", {
+                      class: "vxe-table-custom-popup--column-sort-placeholder"
+                    }) : renderEmptyElement($xeTable),
+                    column.type === "html" ? h("div", {
+                      key: "1",
+                      class: "vxe-table-custom-popup--title",
+                      innerHTML: colTitle
+                    }) : h(
+                      "div",
+                      {
+                        key: "0",
+                        class: "vxe-table-custom-popup--title",
+                        title: colTitle
+                      },
+                      colTitle
+                    ),
+                    showSortBtn && (showSortMoveButton || showSortPutButton) ? h(
+                      "div",
+                      {
+                        class: "vxe-table-custom-popup--move-btn"
+                      },
+                      VxeUIButtonComponent ? [
+                        showSortMoveButton ? h(VxeUIButtonComponent, {
+                          mode: "text",
+                          icon: "vxe-icon-arrows-up",
+                          title: getI18n("vxe.custom.setting.moveUpTitle"),
+                          disabled: index <= 0,
+                          onClick(evntParame) {
+                            sortMoveUpEvent(evntParame, column);
+                          }
+                        }) : renderEmptyElement($xeTable),
+                        showSortMoveButton ? h(VxeUIButtonComponent, {
+                          mode: "text",
+                          icon: "vxe-icon-arrows-down",
+                          title: getI18n("vxe.custom.setting.moveDnTitle"),
+                          disabled: index >= items.length - 1,
+                          onClick(evntParame) {
+                            sortMoveDnEvent(evntParame, column);
+                          }
+                        }) : renderEmptyElement($xeTable),
+                        showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
+                          mode: "text",
+                          icon: "vxe-icon-top",
+                          title: getI18n("vxe.custom.setting.putTopTitle"),
+                          disabled: index <= 0,
+                          onClick(evntParame) {
+                            sortMoveTopEvent(evntParame, column);
+                          }
+                        }) : renderEmptyElement($xeTable),
+                        showSortPutButton && !parentItem ? h(VxeUIButtonComponent, {
+                          mode: "text",
+                          icon: "vxe-icon-bottom",
+                          title: getI18n("vxe.custom.setting.putBottomTitle"),
+                          disabled: index >= items.length - 1,
+                          onClick(evntParame) {
+                            sortMoveBottomEvent(evntParame, column);
+                          }
+                        }) : renderEmptyElement($xeTable)
+                      ] : []
+                    ) : renderEmptyElement($xeTable)
+                  ]
+                )
+              ]
+            )
           );
           if (allowResizable) {
             tdVNs.push(
-              h("td", {
-                key: "aw",
-                class: "vxe-table-custom-popup--column-td col--resizable"
-              }, [
-                column.children && column.children.length || !(XEUtils.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h("span", "-") : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
-                  type: "integer",
-                  immediate: false,
-                  disabled: isHidden,
-                  modelValue: column.renderResizeWidth,
-                  min: customMinWidth || 0,
-                  max: customMaxWidth || 9999,
-                  "onUpdate:modelValue"(value) {
-                    const width = Math.max(0, Number(value));
-                    column.renderResizeWidth = width;
-                  },
-                  onChange() {
-                    changeColumnWidth(column);
-                  }
-                }) : renderEmptyElement($xeTable)
-              ])
+              h(
+                "td",
+                {
+                  key: "aw",
+                  class: "vxe-table-custom-popup--column-td col--resizable"
+                },
+                [
+                  column.children && column.children.length || !(XEUtils.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h("span", "-") : VxeUINumberInputComponent ? h(VxeUINumberInputComponent, {
+                    type: "integer",
+                    immediate: false,
+                    disabled: isHidden,
+                    modelValue: column.renderResizeWidth,
+                    min: customMinWidth || 0,
+                    max: customMaxWidth || 9999,
+                    "onUpdate:modelValue"(value) {
+                      const width = Math.max(0, Number(value));
+                      column.renderResizeWidth = width;
+                    },
+                    onChange() {
+                      changeColumnWidth(column);
+                    }
+                  }) : renderEmptyElement($xeTable)
+                ]
+              )
             );
           }
           if (allowFixed) {
@@ -1190,16 +1360,23 @@ var panel_default = defineVxeComponent({
             );
           }
           trVNs.push(
-            h("tr", {
-              key: column.id,
-              colid: column.id,
-              class: [`vxe-table-custom-popup--row level--${column.level}`, {
-                "is--group": isColGroup
-              }],
-              onDragstart: sortDragstartEvent,
-              onDragend: sortDragendEvent,
-              onDragover: sortDragoverEvent
-            }, tdVNs)
+            h(
+              "tr",
+              {
+                key: column.id,
+                colid: column.id,
+                class: [
+                  `vxe-table-custom-popup--row level--${column.level}`,
+                  {
+                    "is--group": isColGroup
+                  }
+                ],
+                onDragstart: sortDragstartEvent,
+                onDragend: sortDragendEvent,
+                onDragover: sortDragoverEvent
+              },
+              tdVNs
+            )
           );
         }
       });
@@ -1249,26 +1426,37 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "av",
-            class: "vxe-table-custom-popup--column-th col--checkbox"
-          }, [
-            h("div", {
-              class: ["vxe-table-custom--checkbox-option", {
-                "is--checked": isAllChecked,
-                "is--indeterminate": isAllIndeterminate
-              }],
-              title: getI18n("vxe.table.allTitle"),
-              onClick: 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'))
-            ])
-          ])
+          h(
+            "th",
+            {
+              key: "av",
+              class: "vxe-table-custom-popup--column-th col--checkbox"
+            },
+            [
+              h(
+                "div",
+                {
+                  class: [
+                    "vxe-table-custom--checkbox-option",
+                    {
+                      "is--checked": isAllChecked,
+                      "is--indeterminate": isAllIndeterminate
+                    }
+                  ],
+                  title: getI18n("vxe.table.allTitle"),
+                  onClick: 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'))
+                ]
+              )
+            ]
+          )
         );
       }
       colVNs.push(
@@ -1278,10 +1466,14 @@ var panel_default = defineVxeComponent({
         })
       );
       headVNs.push(
-        h("th", {
-          key: "at",
-          class: "vxe-table-custom-popup--column-th col--title"
-        }, getI18n("vxe.custom.setting.colTitle"))
+        h(
+          "th",
+          {
+            key: "at",
+            class: "vxe-table-custom-popup--column-th col--title"
+          },
+          getI18n("vxe.custom.setting.colTitle")
+        )
       );
       if (allowResizable) {
         colVNs.push(
@@ -1291,10 +1483,14 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "aw",
-            class: "vxe-table-custom-popup--column-th col--width"
-          }, getI18n("vxe.custom.setting.colResizable"))
+          h(
+            "th",
+            {
+              key: "aw",
+              class: "vxe-table-custom-popup--column-th col--width"
+            },
+            getI18n("vxe.custom.setting.colResizable")
+          )
         );
       }
       if (allowFixed) {
@@ -1305,10 +1501,14 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "af",
-            class: "vxe-table-custom-popup--column-th col--fixed"
-          }, getI18n(`vxe.custom.setting.${maxFixedSize ? "colFixedMax" : "colFixed"}`, [maxFixedSize]))
+          h(
+            "th",
+            {
+              key: "af",
+              class: "vxe-table-custom-popup--column-th col--fixed"
+            },
+            getI18n(`vxe.custom.setting.${maxFixedSize ? "colFixedMax" : "colFixed"}`, [maxFixedSize])
+          )
         );
       }
       if (allowAlign) {
@@ -1319,10 +1519,14 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "aa",
-            class: "vxe-table-custom-popup--column-th col--align"
-          }, getI18n("vxe.custom.setting.colAlign"))
+          h(
+            "th",
+            {
+              key: "aa",
+              class: "vxe-table-custom-popup--column-th col--align"
+            },
+            getI18n("vxe.custom.setting.colAlign")
+          )
         );
       }
       if (allowHeaderAlign) {
@@ -1333,10 +1537,14 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "aha",
-            class: "vxe-table-custom-popup--column-th col--header-align"
-          }, getI18n("vxe.custom.setting.colHeadAlign"))
+          h(
+            "th",
+            {
+              key: "aha",
+              class: "vxe-table-custom-popup--column-th col--header-align"
+            },
+            getI18n("vxe.custom.setting.colHeadAlign")
+          )
         );
       }
       if (allowFooterAlign) {
@@ -1347,131 +1555,173 @@ var panel_default = defineVxeComponent({
           })
         );
         headVNs.push(
-          h("th", {
-            key: "afa",
-            class: "vxe-table-custom-popup--column-th col--footer-align"
-          }, getI18n("vxe.custom.setting.colFootAlign"))
+          h(
+            "th",
+            {
+              key: "afa",
+              class: "vxe-table-custom-popup--column-th col--footer-align"
+            },
+            getI18n("vxe.custom.setting.colFootAlign")
+          )
         );
       }
       const scopedSlots = {
         default: () => {
-          return h("div", {
-            ref: refBodyWrapperElem,
-            class: ["vxe-table-custom-popup--body-wrapper", `agg-layout--${aggPlacement}`, {
-              [`size--${vSize}`]: vSize
-            }],
-            style: panePopupStyle
-          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [
-            !isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
-              customStore
-            }) : renderEmptyElement($xeTable),
-            h("div", {
-              ref: refCustomBodyElem,
-              class: "vxe-table-custom-popup--handle-wrapper"
-            }, [
-              topSlot ? h("div", {
-                class: "vxe-table-custom-popup--table-top"
-              }, $xeTable.callSlot(topSlot, params)) : renderEmptyElement($xeTable),
-              h("div", {
-                class: "vxe-table-custom-popup--table-wrapper"
-              }, [
-                h("table", {}, [
-                  h("colgroup", {}, colVNs),
-                  h("thead", {}, [
-                    h("tr", {}, headVNs)
-                  ]),
-                  h(TransitionGroup, {
-                    class: "vxe-table-custom--panel-list",
-                    tag: "tbody",
-                    name: "vxe-table-custom--list"
-                  }, {
-                    default: () => renderPopupBodys()
-                  })
-                ])
-              ]),
-              bottomSlot ? h("div", {
-                class: "vxe-table-custom-popup--table-bottom"
-              }, $xeTable.callSlot(bottomSlot, params)) : renderEmptyElement($xeTable),
-              renderDragTip()
-            ]),
-            isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
-              customStore
-            }) : renderEmptyElement($xeTable)
-          ]);
+          return h(
+            "div",
+            {
+              ref: refBodyWrapperElem,
+              class: [
+                "vxe-table-custom-popup--body-wrapper",
+                `agg-layout--${aggPlacement}`,
+                {
+                  [`size--${vSize}`]: vSize
+                }
+              ],
+              style: panePopupStyle
+            },
+            defaultSlot ? $xeTable.callSlot(defaultSlot, params) : [
+              !isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                customStore
+              }) : renderEmptyElement($xeTable),
+              h(
+                "div",
+                {
+                  ref: refCustomBodyElem,
+                  class: "vxe-table-custom-popup--handle-wrapper"
+                },
+                [
+                  topSlot ? h(
+                    "div",
+                    {
+                      class: "vxe-table-custom-popup--table-top"
+                    },
+                    $xeTable.callSlot(topSlot, params)
+                  ) : renderEmptyElement($xeTable),
+                  h(
+                    "div",
+                    {
+                      class: "vxe-table-custom-popup--table-wrapper"
+                    },
+                    [
+                      h("table", {}, [
+                        h("colgroup", {}, colVNs),
+                        h("thead", {}, [h("tr", {}, headVNs)]),
+                        h(
+                          TransitionGroup,
+                          {
+                            class: "vxe-table-custom--panel-list",
+                            tag: "tbody",
+                            name: "vxe-table-custom--list"
+                          },
+                          {
+                            default: () => renderPopupBodys()
+                          }
+                        )
+                      ])
+                    ]
+                  ),
+                  bottomSlot ? h(
+                    "div",
+                    {
+                      class: "vxe-table-custom-popup--table-bottom"
+                    },
+                    $xeTable.callSlot(bottomSlot, params)
+                  ) : renderEmptyElement($xeTable),
+                  renderDragTip()
+                ]
+              ),
+              isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                customStore
+              }) : renderEmptyElement($xeTable)
+            ]
+          );
         },
         footer: () => {
           if (footerSlot) {
             return $xeTable.callSlot(footerSlot, params);
           }
-          return h("div", {
-            class: "vxe-table-custom-popup--footer"
-          }, [
-            VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-              content: customOpts.resetButtonText || getI18n("vxe.custom.cstmRestore"),
-              disabled: !isCustomStatus,
-              onClick: resetCustomEvent
-            }) : renderEmptyElement($xeTable),
-            immediate ? VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-              status: "primary",
-              content: customOpts.closeButtonText || getI18n("vxe.table.customClose"),
-              onClick: cancelCloseEvent
-            }) : renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-              content: customOpts.cancelButtonText || getI18n("vxe.table.customCancel"),
-              onClick: cancelCustomEvent
-            }) : renderEmptyElement($xeTable),
-            immediate ? renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
-              status: "primary",
-              content: customOpts.confirmButtonText || getI18n("vxe.custom.cstmConfirm"),
-              onClick: confirmCustomEvent
-            }) : renderEmptyElement($xeTable)
-          ]);
+          return h(
+            "div",
+            {
+              class: "vxe-table-custom-popup--footer"
+            },
+            [
+              VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                content: customOpts.resetButtonText || getI18n("vxe.custom.cstmRestore"),
+                disabled: !isCustomStatus,
+                onClick: resetCustomEvent
+              }) : renderEmptyElement($xeTable),
+              immediate ? VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                status: "primary",
+                content: customOpts.closeButtonText || getI18n("vxe.table.customClose"),
+                onClick: cancelCloseEvent
+              }) : renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                content: customOpts.cancelButtonText || getI18n("vxe.table.customCancel"),
+                onClick: cancelCustomEvent
+              }) : renderEmptyElement($xeTable),
+              immediate ? renderEmptyElement($xeTable) : VxeUIButtonComponent ? h(VxeUIButtonComponent, {
+                status: "primary",
+                content: customOpts.confirmButtonText || getI18n("vxe.custom.cstmConfirm"),
+                onClick: confirmCustomEvent
+              }) : renderEmptyElement($xeTable)
+            ]
+          );
         }
       };
       if (headerSlot) {
         scopedSlots.header = () => $xeTable.callSlot(headerSlot, params);
       }
       if (mode === "drawer") {
-        return VxeUIDrawerComponent ? h(VxeUIDrawerComponent, {
-          key: "drawer",
-          className: ["vxe-table-custom-drawer-wrapper", "vxe-table--ignore-clear", drawerOpts.className || ""].join(" "),
+        return VxeUIDrawerComponent ? h(
+          VxeUIDrawerComponent,
+          {
+            key: "drawer",
+            className: ["vxe-table-custom-drawer-wrapper", "vxe-table--ignore-clear", drawerOpts.className || ""].join(" "),
+            modelValue: customStore.visible,
+            title: drawerOpts.title || getI18n("vxe.custom.cstmTitle"),
+            width: drawerOpts.width || Math.min(880, Math.floor(document.documentElement.clientWidth * 0.6)),
+            position: drawerOpts.position,
+            resize: !!drawerOpts.resize,
+            escClosable: !!drawerOpts.escClosable,
+            maskClosable: !!drawerOpts.maskClosable,
+            destroyOnClose: true,
+            showFooter: true,
+            "onUpdate:modelValue"(value) {
+              customStore.visible = value;
+            }
+          },
+          scopedSlots
+        ) : renderEmptyElement($xeTable);
+      }
+      return VxeUIModalComponent ? h(
+        VxeUIModalComponent,
+        {
+          key: "modal",
+          className: ["vxe-table-custom-modal-wrapper", "vxe-table--ignore-clear", modalOpts.className || ""].join(" "),
           modelValue: customStore.visible,
-          title: drawerOpts.title || getI18n("vxe.custom.cstmTitle"),
-          width: drawerOpts.width || Math.min(880, Math.floor(document.documentElement.clientWidth * 0.6)),
-          position: drawerOpts.position,
-          resize: !!drawerOpts.resize,
-          escClosable: !!drawerOpts.escClosable,
-          maskClosable: !!drawerOpts.maskClosable,
+          title: modalOpts.title || getI18n("vxe.custom.cstmTitle"),
+          width: modalOpts.width || Math.min(1e3, document.documentElement.clientWidth),
+          minWidth: modalOpts.minWidth || 800,
+          height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
+          minHeight: modalOpts.minHeight || 400,
+          showZoom: modalOpts.showZoom,
+          showMaximize: modalOpts.showMaximize,
+          showMinimize: modalOpts.showMinimize,
+          mask: modalOpts.mask,
+          lockView: modalOpts.lockView,
+          resize: modalOpts.resize,
+          transfer: modalOpts.transfer,
+          escClosable: !!modalOpts.escClosable,
+          maskClosable: !!modalOpts.maskClosable,
           destroyOnClose: true,
           showFooter: true,
           "onUpdate:modelValue"(value) {
             customStore.visible = value;
           }
-        }, scopedSlots) : renderEmptyElement($xeTable);
-      }
-      return VxeUIModalComponent ? h(VxeUIModalComponent, {
-        key: "modal",
-        className: ["vxe-table-custom-modal-wrapper", "vxe-table--ignore-clear", modalOpts.className || ""].join(" "),
-        modelValue: customStore.visible,
-        title: modalOpts.title || getI18n("vxe.custom.cstmTitle"),
-        width: modalOpts.width || Math.min(1e3, document.documentElement.clientWidth),
-        minWidth: modalOpts.minWidth || 800,
-        height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
-        minHeight: modalOpts.minHeight || 400,
-        showZoom: modalOpts.showZoom,
-        showMaximize: modalOpts.showMaximize,
-        showMinimize: modalOpts.showMinimize,
-        mask: modalOpts.mask,
-        lockView: modalOpts.lockView,
-        resize: modalOpts.resize,
-        transfer: modalOpts.transfer,
-        escClosable: !!modalOpts.escClosable,
-        maskClosable: !!modalOpts.maskClosable,
-        destroyOnClose: true,
-        showFooter: true,
-        "onUpdate:modelValue"(value) {
-          customStore.visible = value;
-        }
-      }, scopedSlots) : renderEmptyElement($xeTable);
+        },
+        scopedSlots
+      ) : renderEmptyElement($xeTable);
     };
     const renderVN = () => {
       const customOpts = computeCustomOpts.value;