qidian-vue-ui 2.0.44 → 2.0.46

package/dist/components/crud/table/index.css

@@ -1,40 +1,40 @@
-.qd-crud-table[data-v-336e27b9] {
+.qd-crud-table[data-v-caa57b85] {
   width: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-crud-table > .qd-crud-search:not(.qd-crud-search--hide) + .qd-crud-table__body[data-v-336e27b9] {
+.qd-crud-table > .qd-crud-search:not(.qd-crud-search--hide) + .qd-crud-table__body[data-v-caa57b85] {
   margin-top: var(--td-comp-margin-l);
 }
-.qd-crud-table__body[data-v-336e27b9] >  .t-loading__parent > .t-card__body {
+.qd-crud-table__body[data-v-caa57b85] >  .t-loading__parent > .t-card__body {
   display: flex;
   flex-direction: column;
 }
-.qd-crud-table__body[data-v-336e27b9] >  .t-loading__parent > .t-card__body > .qd-service-table .t-table__pagination {
+.qd-crud-table__body[data-v-caa57b85] >  .t-loading__parent > .t-card__body > .qd-service-table .t-table__pagination {
   padding-bottom: 0;
 }
-.qd-crud-table--fit-parent-height[data-v-336e27b9] {
+.qd-crud-table--fit-parent-height[data-v-caa57b85] {
   height: 100%;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-336e27b9] {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-caa57b85] {
   flex: auto;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-336e27b9] >  .t-loading__parent > .t-card__body {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-caa57b85] >  .t-loading__parent > .t-card__body {
   height: 100%;
   min-height: 443px;
 }
-.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-336e27b9] >  .t-loading__parent > .t-card__body > .qd-service-table {
+.qd-crud-table--fit-parent-height > .qd-crud-table__body[data-v-caa57b85] >  .t-loading__parent > .t-card__body > .qd-service-table {
   flex: 1 1 0;
   overflow: hidden;
 }
-.qd-crud-table__toolbar[data-v-336e27b9] {
+.qd-crud-table__toolbar[data-v-caa57b85] {
   display: flex;
   justify-content: space-between;
 }
-.qd-crud-table__toolbar--has-space-item + .qd-service-table[data-v-336e27b9] {
+.qd-crud-table__toolbar--has-space-item + .qd-service-table[data-v-caa57b85] {
   margin-top: var(--td-comp-margin-l);
 }
-.qd-crud-table__toolbar-separator[data-v-336e27b9] {
+.qd-crud-table__toolbar-separator[data-v-caa57b85] {
   display: inline-block;
   padding-left: var(--td-comp-paddingLR-s);
 }

package/dist/components/crud/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdCrudTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-336e27b9"]]);
+const QdCrudTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-caa57b85"]]);
 export {
   QdCrudTable as default
 };

package/dist/components/crud/table/index.vue2.mjs

@@ -731,10 +731,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (currentOptions === false) return;
       const mergeOptions = merge({}, defaultOptions, currentOptions);
       if (mergeOptions.crudMode !== "view" && !currentOptions) return;
+      if (typeof currentOptions === "object" && currentOptions.component) {
+        mergeOptions.component = currentOptions.component;
+      }
       mergeOptions.permi = buildActionPermi(mergeOptions);
       if (mergeOptions.crudMode !== "del") {
         const form = buildActionForm(mergeOptions, crudForm);
-        if (!form && !mergeOptions.onClick) return;
+        if (!form && !mergeOptions.onClick && !mergeOptions.component) return;
         mergeOptions.form = form;
       }
       return mergeOptions;
@@ -985,6 +988,55 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return false;
       }
     }
+    function buildActionComponent(action, defaultComponent, originalParams) {
+      const {
+        component,
+        ...actionProps
+      } = action;
+      const onClick = buildActionOnClick(action, originalParams);
+      const disabled = defaultComponent === Button ? buildActionDisabled(action) : action.disabled;
+      const ifRender = "ifRender" in action ? action.ifRender : void 0;
+      if (!component) {
+        return {
+          is: defaultComponent,
+          ...actionProps,
+          form: defaultComponent === Button ? void 0 : action.form,
+          onClick,
+          disabled
+        };
+      }
+      return {
+        ...component,
+        ifRender: component.ifRender ?? ifRender,
+        onClick: component.onClick ?? onClick,
+        disabled: component.disabled ?? disabled
+      };
+    }
+    function buildToolComponent(tool) {
+      const {
+        component,
+        ...toolProps
+      } = tool;
+      const action = tool;
+      const onClick = buildActionOnClick(action);
+      const disabled = buildActionDisabled(action);
+      if (!component) {
+        return {
+          is: Button,
+          ...toolProps,
+          content: "",
+          variant: "text",
+          shape: "square",
+          onClick,
+          disabled
+        };
+      }
+      return {
+        ...component,
+        onClick: component.onClick ?? onClick,
+        disabled: component.disabled ?? disabled
+      };
+    }
     async function getDetail(action, params) {
       const {
         detailOptions
@@ -1135,13 +1187,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }) ? (openBlock(), createElementBlock("span", _hoisted_1)) : createCommentVNode("", true), withDirectives(createVNode(unref(_sfc_main$1), {
               "fn-inject-ctx": "",
               context: getConfigRendererCtx(item),
-              config: {
-                is: unref(Button),
-                ...item,
-                form: void 0,
-                onClick: buildActionOnClick(item),
-                disabled: buildActionDisabled(item)
-              },
+              config: buildActionComponent(item, unref(Button)),
               onIfRenderChange: (ifRender) => setActionIfRender(ifRender, item, {
                 index
               })
@@ -1165,15 +1211,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [withDirectives(createVNode(unref(_sfc_main$1), {
                 "fn-inject-ctx": "",
                 context: getConfigRendererCtx(item),
-                config: {
-                  is: unref(Button),
-                  ...item,
-                  content: "",
-                  variant: "text",
-                  shape: "square",
-                  onClick: buildActionOnClick(item),
-                  disabled: buildActionDisabled(item)
-                },
+                config: buildToolComponent(item),
                 onIfRenderChange: (ifRender) => setActionIfRender(ifRender, item, {
                   index,
                   mapKey: "tool"
@@ -1292,11 +1330,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 key: `${slotProps.colIndex}.${slotProps.rowIndex}.${index}.renderer`,
                 "fn-inject-ctx": "",
                 context: getConfigRendererCtx(item, slotProps),
-                config: {
-                  is: unref(Link),
-                  ...item,
-                  onClick: buildActionOnClick(item, slotProps)
-                },
+                config: buildActionComponent(item, unref(Link), slotProps),
                 onIfRenderChange: (ifRender) => setActionIfRender(ifRender, item, {
                   colIndex: slotProps.colIndex,
                   rowIndex: slotProps.rowIndex,

package/dist/components/crud/table/types.d.ts

@@ -34,6 +34,7 @@ export interface QdCrudTableAction<D extends TableRowData = TableRowData, R = un
     uid?: string;
     permiID?: string;
     permi?: string[];
+    component?: QdComponentConfig;
     selectType?: QdServiceTableProps['selectType'];
     onClick?: (context: QdCrudTableActionContext<D> & Partial<PrimaryTableCellParams<D>>, e: MouseEvent) => void | Promise<void>;
 }
@@ -41,6 +42,7 @@ export interface QdCrudTableRowAction<D extends TableRowData = TableRowData, R =
     uid?: string;
     permiID?: string;
     permi?: string[];
+    component?: QdComponentConfig;
     selectType?: QdServiceTableProps['selectType'];
     detail?: QdCrudDetail;
     onClick?: (context: QdCrudTableActionContext<D> & PrimaryTableCellParams<D>, e: MouseEvent) => void | Promise<void>;
@@ -62,6 +64,7 @@ export interface QdCrudTableToolContext<D extends TableRowData = TableRowData> {
 export interface QdCrudTableTool<D extends TableRowData = TableRowData> {
     content?: string;
     icon?: TNode;
+    component?: QdComponentConfig;
     permiID?: string;
     permi?: string[];
     disabled?: boolean | ((ctx: QdCrudTableToolContext<D>) => boolean);

package/dist/components/service/table/index.css

@@ -1,165 +1,165 @@
-.qd-service-table[data-v-f28c006f] {
+.qd-service-table[data-v-a601e747] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-service-table[data-v-f28c006f] >  .t-table__content {
+.qd-service-table[data-v-a601e747] >  .t-table__content {
   flex: 1;
 }
-.qd-service-table--mini[data-v-f28c006f] {
+.qd-service-table--mini[data-v-a601e747] {
   font: var(--td-font-body-small);
 }
-.qd-service-table--mini[data-v-f28c006f] th,
-.qd-service-table--mini[data-v-f28c006f] tr:not(.t-table__expanded-row) > td {
+.qd-service-table--mini[data-v-a601e747] th,
+.qd-service-table--mini[data-v-a601e747] tr:not(.t-table__expanded-row) > td {
   padding: var(--td-comp-paddingTB-xxs) var(--td-comp-paddingLR-xxs);
   line-height: var(--td-line-height-body-small);
 }
-.qd-service-table--mini[data-v-f28c006f] .t-table__row-full-element {
+.qd-service-table--mini[data-v-a601e747] .t-table__row-full-element {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-s);
 }
-.qd-service-table--hide-empty-image[data-v-f28c006f] .t-table__empty {
+.qd-service-table--hide-empty-image[data-v-a601e747] .t-table__empty {
   min-height: auto;
 }
-.qd-service-table--hide-empty-image[data-v-f28c006f] .t-table__empty .t-empty {
+.qd-service-table--hide-empty-image[data-v-a601e747] .t-table__empty .t-empty {
   padding: 0 !important;
 }
-.qd-service-table--hide-empty-image[data-v-f28c006f] .t-table__empty .t-empty__image {
+.qd-service-table--hide-empty-image[data-v-a601e747] .t-table__empty .t-empty__image {
   display: none;
 }
-.qd-service-table--hide-empty-image[data-v-f28c006f] .t-table__empty .t-empty__title {
+.qd-service-table--hide-empty-image[data-v-a601e747] .t-table__empty .t-empty__title {
   margin-top: 0;
 }
-.qd-service-table[data-v-f28c006f] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
+.qd-service-table[data-v-a601e747] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
   margin-left: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-f28c006f] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
+.qd-service-table[data-v-a601e747] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
   width: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-f28c006f] .t-affix > .t-table__affixed-header-elm-wrap,
-.qd-service-table[data-v-f28c006f] .t-affix > .t-table__scrollbar--obvious {
-  transform: var(--dca57566);
+.qd-service-table[data-v-a601e747] .t-affix > .t-table__affixed-header-elm-wrap,
+.qd-service-table[data-v-a601e747] .t-affix > .t-table__scrollbar--obvious {
+  transform: var(--v393be75e);
 }
-.qd-service-table--horizontal-bar-static[data-v-f28c006f] .t-table__scrollbar--obvious {
+.qd-service-table--horizontal-bar-static[data-v-a601e747] .t-table__scrollbar--obvious {
   visibility: hidden;
   pointer-events: none;
 }
-.qd-service-table[data-v-f28c006f]  .t-table__expanded-row .qd-service-table--horizontal-bar-static > div:has(> div > .t-table__scrollbar--obvious) {
+.qd-service-table[data-v-a601e747]  .t-table__expanded-row .qd-service-table--horizontal-bar-static > div:has(> div > .t-table__scrollbar--obvious) {
   display: none;
 }
-.qd-service-table[data-v-f28c006f] .t-table__expanded-row > td {
+.qd-service-table[data-v-a601e747] .t-table__expanded-row > td {
   height: 0;
 }
-.qd-service-table[data-v-f28c006f] .t-table__affixed-header-elm-wrap {
+.qd-service-table[data-v-a601e747] .t-table__affixed-header-elm-wrap {
   height: auto !important;
 }
-.qd-service-table[data-v-f28c006f] .t-table__affixed-header-elm {
+.qd-service-table[data-v-a601e747] .t-table__affixed-header-elm {
   position: relative;
   scrollbar-width: none;
 }
-.qd-service-table[data-v-f28c006f] .t-table__affixed-header-elm::-webkit-scrollbar {
+.qd-service-table[data-v-a601e747] .t-table__affixed-header-elm::-webkit-scrollbar {
   display: none;
   width: 0;
   height: 0;
 }
-.qd-service-table[data-v-f28c006f] .t-table__virtual-scroll-cursor + table {
+.qd-service-table[data-v-a601e747] .t-table__virtual-scroll-cursor + table {
   border-collapse: separate;
 }
-.qd-service-table[data-v-f28c006f] .t-table__expanded-row-inner,
-.qd-service-table[data-v-f28c006f] .t-table__row-filter-inner {
+.qd-service-table[data-v-a601e747] .t-table__expanded-row-inner,
+.qd-service-table[data-v-a601e747] .t-table__row-filter-inner {
   display: block;
   position: sticky;
   left: 0;
-  width: var(--v666e8bfc) !important;
+  width: var(--c95fd7f4) !important;
 }
-.qd-service-table[data-v-f28c006f] .t-table__cell-wrap > .t-form__controls > .t-form__controls-content > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
+.qd-service-table[data-v-a601e747] .t-table__cell-wrap > .t-form__controls > .t-form__controls-content > *:not(.t-switch):not(.t-tag):not(.t-icon):not(.qd-file-icon) {
   width: 100%;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table__non-editable-col {
+.qd-service-table[data-v-a601e747] .qd-service-table__non-editable-col {
   background-color: color-mix(in srgb, var(--td-bg-color-component) 50%, transparent);
 }
-.qd-service-table[data-v-f28c006f]  .qd-service-table__non-editable-col:is(
+.qd-service-table[data-v-a601e747]  .qd-service-table__non-editable-col:is(
         .t-table__cell--fixed-left,
         .t-table__cell--fixed-right
       ) {
   background-color: inherit;
   background-image: linear-gradient(color-mix(in srgb, var(--td-bg-color-secondarycontainer) 50%, transparent), color-mix(in srgb, var(--td-bg-color-secondarycontainer) 50%, transparent));
 }
-.qd-service-table--disable-horizontal-scroll[data-v-f28c006f] colgroup > col {
+.qd-service-table--disable-horizontal-scroll[data-v-a601e747] colgroup > col {
   width: auto !important;
 }
-.qd-service-table[data-v-f28c006f] .t-table__filter-pop-content-inner {
+.qd-service-table[data-v-a601e747] .t-table__filter-pop-content-inner {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s) 0;
 }
-.qd-service-table[data-v-f28c006f] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
+.qd-service-table[data-v-a601e747] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
   padding: 0;
 }
-.qd-service-table[data-v-f28c006f]  .t-table__filter-pop-content-inner:has(
+.qd-service-table[data-v-a601e747]  .t-table__filter-pop-content-inner:has(
         .qd-service-table-filter-input,
         .qd-service-table-filter-custom
       ) {
   padding-bottom: var(--td-comp-paddingTB-s);
 }
-.qd-service-table[data-v-f28c006f] .t-table__filter--bottom-buttons {
+.qd-service-table[data-v-a601e747] .t-table__filter--bottom-buttons {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s);
 }
-.qd-service-table--mini[data-v-f28c006f] .t-table__filter-pop-content-inner {
+.qd-service-table--mini[data-v-a601e747] .t-table__filter-pop-content-inner {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs) 0;
 }
-.qd-service-table--mini[data-v-f28c006f] .t-table__filter--bottom-buttons {
+.qd-service-table--mini[data-v-a601e747] .t-table__filter--bottom-buttons {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs);
 }
-.qd-service-table--mini[data-v-f28c006f] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
+.qd-service-table--mini[data-v-a601e747] .t-table__filter-pop-content-inner:has(.qd-service-table-filter-item) {
   padding: 0;
 }
-.qd-service-table--mini[data-v-f28c006f]  .t-table__filter-pop-content-inner:has(
+.qd-service-table--mini[data-v-a601e747]  .t-table__filter-pop-content-inner:has(
           .qd-service-table-filter-input,
           .qd-service-table-filter-custom
         ) {
   padding-bottom: var(--td-comp-paddingTB-xs);
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item {
   width: 266px;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__search,
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__all,
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__options {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__search,
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__all,
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__options {
   padding: var(--td-comp-paddingTB-s) var(--td-comp-paddingLR-s) 0;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__all {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__all {
   padding: 0 var(--td-comp-paddingLR-s);
   border-bottom: 1px solid var(--td-component-stroke);
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__options {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__options {
   display: flex;
   flex-direction: column;
   height: 206px;
   padding: 0 var(--td-comp-paddingLR-s);
   overflow-y: auto;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__count {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__count {
   margin-left: var(--td-comp-margin-xs);
   color: var(--td-text-color-placeholder);
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item__cell {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item__cell {
   pointer-events: none;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item .t-checkbox,
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item .t-radio {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item .t-checkbox,
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item .t-radio {
   display: flex;
   align-items: center;
 }
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item .t-checkbox__label,
-.qd-service-table[data-v-f28c006f] .qd-service-table-filter-item .t-radio__label {
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item .t-checkbox__label,
+.qd-service-table[data-v-a601e747] .qd-service-table-filter-item .t-radio__label {
   display: inline-flex;
   flex: 1 1 0;
   align-items: center;
   min-width: 0;
   overflow: hidden;
 }
-.qd-service-table--mini[data-v-f28c006f] .qd-service-table-filter-item__search {
+.qd-service-table--mini[data-v-a601e747] .qd-service-table-filter-item__search {
   padding: var(--td-comp-paddingTB-xs) var(--td-comp-paddingLR-xs) 0;
 }
-.qd-service-table--mini[data-v-f28c006f] .qd-service-table-filter-item__all,
-.qd-service-table--mini[data-v-f28c006f] .qd-service-table-filter-item__options {
+.qd-service-table--mini[data-v-a601e747] .qd-service-table-filter-item__all,
+.qd-service-table--mini[data-v-a601e747] .qd-service-table-filter-item__options {
   padding: 0 var(--td-comp-paddingLR-xs);
 }

package/dist/components/service/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f28c006f"]]);
+const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a601e747"]]);
 export {
   QdServiceTable as default
 };

package/dist/components/service/table/index.vue2.mjs

@@ -21,6 +21,7 @@ import QdForm from "../../form/index.vue.mjs";
 import set from "../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/set.mjs";
 const defaultMinWidth = 80;
 const defaultVirtualScrollBufferSize = 2;
+const defaultXVirtualScrollThreshold = 20;
 const defaultVirtualScrollUpdateInterval = 16;
 const minVirtualScrollUpdateInterval = 8;
 const scrollRestoreMaxAttempts = 4;
@@ -332,8 +333,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emit: __emit
   }) {
     useCssVars((_ctx) => ({
-      "dca57566": affixedHeaderTransform.value,
-      "v666e8bfc": expandedRowWidth.value
+      "v393be75e": affixedHeaderTransform.value,
+      "c95fd7f4": expandedRowWidth.value
     }));
     const props = __props;
     const emit = __emit;
@@ -609,6 +610,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } = scroll ?? {};
       const reScroll = scroll?.type === "virtual" ? {
         bufferSize: defaultVirtualScrollBufferSize,
+        ...scroll.xVirtual === true ? {
+          threshold: defaultXVirtualScrollThreshold
+        } : {},
         virtualUpdateInterval: Math.max(minVirtualScrollUpdateInterval, virtualUpdateInterval ?? defaultVirtualScrollUpdateInterval),
         ...scrollOptions
       } : scroll;

package/dist/hooks/useModal.mjs

@@ -115,7 +115,7 @@ function useModal() {
     queueMicrotask(() => updateOverlayMasks());
   }
   function wrapInstanceLifecycle(instance, config) {
-    const { modalClass, hasMask, hideOnDeactivated, closeOnEscKeydown, attach } = config;
+    const { modalClass, hasMask, hideOnDeactivated, closeOnEscKeydown, attach, onEscClose } = config;
     const originalShow = instance.show.bind(instance);
     const originalHide = instance.hide.bind(instance);
     const originalDestroy = instance.destroy.bind(instance);
@@ -130,7 +130,7 @@ function useModal() {
       if (hideOnDeactivated) hideOnDeactivatedModalClasses.add(modalClass);
       if (hasMask) {
         registerOverlayEsc(modalClass, {
-          close: () => instance.destroy(),
+          close: onEscClose ?? (() => instance.destroy()),
           closeOnEscKeydown
         });
       }
@@ -270,6 +270,10 @@ function useModal() {
       closeOnEscKeydown,
       hasMask
     } = withOverlay(alertOptionsMerge(options));
+    function handleClose() {
+      onClose?.();
+      instance.destroy();
+    }
     const instance = wrapInstanceLifecycle(
       DialogPlugin.confirm({
         ...reOptions,
@@ -300,12 +304,16 @@ function useModal() {
           }
           if (isEmpty(res) || res) instance.destroy();
         },
-        onClose: () => {
-          onClose?.();
-          instance.destroy();
-        }
+        onClose: handleClose
       }),
-      { modalClass, hasMask, hideOnDeactivated, closeOnEscKeydown, attach: reOptions.attach }
+      {
+        modalClass,
+        hasMask,
+        hideOnDeactivated,
+        closeOnEscKeydown,
+        attach: reOptions.attach,
+        onEscClose: handleClose
+      }
     );
     visibleDialogInstances.add(instance);
     aliveDialogInstances.add(instance);
@@ -313,7 +321,7 @@ function useModal() {
     if (hideOnDeactivated) hideOnDeactivatedModalClasses.add(modalClass);
     if (hasMask) {
       registerOverlayEsc(modalClass, {
-        close: () => instance.destroy(),
+        close: handleClose,
         closeOnEscKeydown
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "2.0.44",
+  "version": "2.0.46",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",