@aplus-frontend/ui 0.6.0-beta.8 → 0.6.0

package/es/src/ap-grid/interface.d.ts

@@ -3,8 +3,9 @@ import { ApTablePaginationConfig, ApTableValueFields, ApTableValueTypes, CommonF
 import { Recordable } from '../type';
 import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
-import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
+import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
+import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
 export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
@@ -134,9 +135,9 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
     card?: boolean;
     /**
      * request额外请求的参数
-     * 如果传入响应式数据，将会在变更后重新执行
+     * 数据变化后将会重新发起网络请求
      */
-    params?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType;
     /**
      * 请求获取dataSource
      * @param params
@@ -239,6 +240,10 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * 作为表单项时内部传递，请勿使用
      */
     value?: any;
+    /**
+     * 行是否可以被高亮（传入函数可以获取当前被选中的行）
+     */
+    rowHighlightable?: boolean | ((current: RecordType) => void);
 };
 export type ApGridVirtualConfig = {
     x?: false | number;
@@ -289,6 +294,12 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     rowSelection: {
         selectedRows: ComputedRef<RecordType[]>;
+        /**
+         * 通过API调用设置行选中
+         * @param keys
+         * @returns
+         */
+        setSelectedRowKeys: (keys: (string | number)[]) => void;
         clearAll: () => void;
     };
     /**
@@ -303,4 +314,22 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     getDataSource: () => RecordType[];
+    /**
+     * 设置某一行被选中
+     * @param nextRow
+     * @returns
+     */
+    setCurrentRow: (nextRow: Partial<RecordType>) => void;
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };

package/es/src/ap-grid/utils/table.mjs

@@ -1,10 +1,10 @@
-import { omit as u, isUndefined as l, isFunction as h, isNumber as m } from "lodash-unified";
+import { omit as l, isUndefined as s, isFunction as h, isNumber as m } from "lodash-unified";
 import { isDef as w } from "../../utils/index.mjs";
-const y = 20, C = 50, b = (e) => e.some((t) => !!t.html);
+const C = 20, b = 50, y = (e) => e.some((t) => !!t.html);
 function v(e) {
   var i;
   const t = {
-    ...u(e, [
+    ...l(e, [
       "columns",
       "request",
       "searchForm",
@@ -16,8 +16,9 @@ function v(e) {
   };
   if (t.rowConfig = {
     isHover: !0,
-    keyField: e.rowKey
-  }, t.columnConfig = {}, b(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
+    keyField: e.rowKey,
+    isCurrent: !!e.rowHighlightable
+  }, t.columnConfig = {}, y(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
     const o = e.rowSelection === !0 ? {} : e.rowSelection;
     o.type === "radio" ? t.radioConfig = {
       highlight: !0,
@@ -28,7 +29,7 @@ function v(e) {
         return o.shown ? o.shown(r) : !0;
       },
       checkRowKey: (i = o.defaultSelectedRowKeys) == null ? void 0 : i[0],
-      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      reserve: s(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
       checkMethod({ row: r }) {
@@ -37,12 +38,11 @@ function v(e) {
       visibleMethod({ row: r }) {
         return o.shown ? o.shown(r) : !0;
       },
-      checkRowKeys: o.defaultSelectedRowKeys,
-      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
+      reserve: s(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
       range: o.range || !1
     };
   }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = l(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -50,22 +50,22 @@ function v(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
 }
-function f(e, t, n) {
-  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", d = n == null ? void 0 : n[o], a = d !== !1, s = i ? y : C, c = m(d) && d >= 0 ? d : s;
+function a(e, t, n) {
+  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", u = n == null ? void 0 : n[o], f = u !== !1, d = i ? C : b, c = m(u) && u >= 0 ? u : d;
   e[r] = {
-    enabled: a,
+    enabled: f,
     gt: c,
     oSize: (n == null ? void 0 : n.oSize) || 0
   };
 }
-function x(e) {
+function g(e) {
   return e === !0 ? "left" : e;
 }
 function K(e, t) {
   const n = e === !0 || !e.type ? "checkbox" : e.type, i = e === !0 ? 60 : e.columnWidth || 60;
-  let o = e === !0 ? void 0 : x(e.fixed);
+  let o = e === !0 ? void 0 : g(e.fixed);
   return o || (o === !1 ? o = void 0 : o = t.some(
     (r) => r.fixed === "left" || r.fixed === !0
   ) ? "left" : void 0), {

package/es/src/ap-list/index.vue.d.ts

@@ -1,17 +1,10 @@
-import { ApListProps } from './interface';
+import { ApListExpose, ApListProps } from './interface';
 import { Recordable } from '../type';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, Ref, VNode } from 'vue';
 import { ApFormSearchFormExpose } from '..';
 declare const _default: <RecordType extends Recordable>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApListProps<RecordType> & Partial<{}>> & PublicProps;
-    expose(exposed: ShallowUnwrapRef<{
-        submit: () => void;
-        reset: () => void;
-        refresh: () => void;
-        refreshByDelete: (n: number) => void;
-        scrollToFirstRow: (selector?: string) => void;
-        getSearchFormValuesIfSetted: (transform?: boolean) => Partial<any>;
-    }>): void;
+    expose(exposed: ShallowUnwrapRef<ApListExpose>): void;
     attrs: any;
     slots: {
         header?(_: {

package/es/src/ap-list/index.vue.mjs

@@ -1,13 +1,14 @@
-import { defineComponent as X, ref as Y, unref as e, computed as p, watch as Z, createElementBlock as s, openBlock as i, normalizeStyle as v, normalizeClass as l, renderSlot as u, createElementVNode as _, createCommentVNode as I, createVNode as g, Fragment as E, createBlock as O, withCtx as h, renderList as x, mergeProps as ee } from "vue";
-import { Empty as V, Spin as te, Pagination as ae } from "@aplus-frontend/antdv";
-import { useTablePaging as ne } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { defineComponent as _, ref as x, toRef as ee, unref as t, computed as p, watch as te, createElementBlock as s, openBlock as i, normalizeStyle as h, normalizeClass as l, renderSlot as u, createElementVNode as ae, createCommentVNode as I, createVNode as g, Fragment as F, createBlock as V, withCtx as b, renderList as ne, mergeProps as re } from "vue";
+import { Empty as E, Spin as oe, Pagination as ie } from "@aplus-frontend/antdv";
+import { useTablePaging as le } from "../ap-table/hooks/use-table-paging-ng.mjs";
 import "../config-provider/index.mjs";
-import { isUndefined as F, isNumber as re, omit as oe } from "lodash-unified";
-import { useOfflineList as ie } from "./hooks/use-offline-list.mjs";
+import { isUndefined as L, isNumber as se, omit as ue } from "lodash-unified";
+import { useOfflineList as ce } from "./hooks/use-offline-list.mjs";
 import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
-import { RecycleScroller as le, DynamicScroller as se, DynamicScrollerItem as ue } from "vue-virtual-scroller";
-import { useNamespace as ce } from "../config-provider/hooks/use-namespace.mjs";
-const be = /* @__PURE__ */ X({
+import { RecycleScroller as me, DynamicScroller as de, DynamicScrollerItem as fe } from "vue-virtual-scroller";
+import { useNamespace as pe } from "../config-provider/hooks/use-namespace.mjs";
+const De = /* @__PURE__ */ _({
+  name: "ApList",
   __name: "index",
   props: {
     dataSource: {},
@@ -27,140 +28,149 @@ const be = /* @__PURE__ */ X({
     rowKey: {},
     adaptive: { type: Boolean, default: !1 }
   },
-  setup(L, { expose: N }) {
-    const R = V.PRESENTED_IMAGE_SIMPLE, n = L, { b: m, e: y, bm: T, m: $ } = ce("ap-list"), b = Y(), {
-      formRef: k,
+  setup(O, { expose: R }) {
+    const N = E.PRESENTED_IMAGE_SIMPLE, r = O, { b: d, e: y, bm: T, m: $ } = pe("ap-list"), k = x(), {
+      formRef: S,
       submit: w,
       reset: B,
-      handleTableChange: j,
-      data: S,
-      refresh: q,
-      refreshByDelete: A,
-      tableProps: D
-    } = ne({
-      async request(t) {
-        var r;
-        const a = await ((r = n.request) == null ? void 0 : r.call(n, t));
+      handleTableChange: A,
+      data: v,
+      refresh: j,
+      refreshByDelete: q,
+      tableProps: D,
+      getPaging: K,
+      setPaging: M
+    } = le({
+      async request(e) {
+        var n;
+        const a = await ((n = r.request) == null ? void 0 : n.call(r, e));
         return {
           data: (a == null ? void 0 : a.data) || [],
           total: (a == null ? void 0 : a.total) || 0
         };
       },
-      defaultParams: n.params,
-      defaultData: n.defaultData,
-      manual: n.manual,
-      pagination: n.pagination,
-      formatParams: n.beforeSearchSubmit
-    }), K = { form: k }, {
-      pagination: z,
-      dataSource: M,
-      onChange: W
-    } = ie(n);
-    function G(t, a) {
-      if (e(f)) {
-        W(t, a);
+      params: ee(r, "params"),
+      defaultData: r.defaultData,
+      manual: r.manual,
+      pagination: r.pagination,
+      formatParams: r.beforeSearchSubmit
+    }), W = { form: S }, {
+      pagination: P,
+      dataSource: G,
+      onChange: U
+    } = ce(r);
+    function H(e, a) {
+      if (t(f)) {
+        U(e, a);
         return;
       }
-      j(
-        { current: t, pageSize: a },
+      A(
+        { current: e, pageSize: a },
         {},
         {},
         { currentDataSource: [], action: "paginate" }
       );
     }
-    const c = p(() => e(f) ? e(M) : e(S).records), d = p(() => F(n.loading) ? e(S).loading : n.loading), U = p(() => {
-      var t, a;
-      return n.pagination === !1 || n.virtual ? !1 : ((t = n.pagination) == null ? void 0 : t.hideOnSinglePage) !== !0 ? !0 : e(f) ? (((a = n.dataSource) == null ? void 0 : a.length) || 0) > e(z).pageSize : e(S).total > e(D).pagination.pageSize;
-    }), f = p(() => !F(n.dataSource));
-    Z(
-      () => e(d),
-      (t) => {
+    const c = p(() => t(f) ? t(G) : t(v).records), m = p(() => L(r.loading) ? t(v).loading : r.loading), J = p(() => {
+      var e, a;
+      return r.pagination === !1 || r.virtual ? !1 : ((e = r.pagination) == null ? void 0 : e.hideOnSinglePage) !== !0 ? !0 : t(f) ? (((a = r.dataSource) == null ? void 0 : a.length) || 0) > t(P).pageSize : t(v).total > t(D).pagination.pageSize;
+    }), f = p(() => !L(r.dataSource));
+    te(
+      () => t(m),
+      (e) => {
         var a;
-        (a = n.onLoadingChange) == null || a.call(n, t);
+        (a = r.onLoadingChange) == null || a.call(r, e);
       }
     );
-    function H(t) {
-      var a, r;
-      (r = (a = b.value) == null ? void 0 : a.querySelector(t || ":first-child")) == null || r.scrollIntoView({ behavior: "smooth", block: "center" });
+    function Q(e) {
+      var a, n;
+      (n = (a = k.value) == null ? void 0 : a.querySelector(e || ":first-child")) == null || n.scrollIntoView({ behavior: "smooth", block: "center" });
     }
-    function J(t = !1) {
+    function X(e = !1) {
       var o;
-      const a = (o = k.value) == null ? void 0 : o.apForm, r = t ? a == null ? void 0 : a.getFieldsValueTransformed : a == null ? void 0 : a.getFieldsValue;
-      return (r == null ? void 0 : r()) || {};
+      const a = (o = S.value) == null ? void 0 : o.apForm, n = e ? a == null ? void 0 : a.getFieldsValueTransformed : a == null ? void 0 : a.getFieldsValue;
+      return (n == null ? void 0 : n()) || {};
     }
-    return N({
+    function Y(e) {
+      var a, n, o;
+      (o = (n = (a = S.value) == null ? void 0 : a.apForm) == null ? void 0 : n.setFieldsValue) == null || o.call(n, e);
+    }
+    return R({
       submit: () => w(),
       reset: () => B(),
-      refresh: () => q(),
-      refreshByDelete: (t) => A(t),
-      scrollToFirstRow: H,
-      getSearchFormValuesIfSetted: J
-    }), (t, a) => (i(), s("div", {
-      class: l([e(m)(), { [e($)("adaptive")]: t.adaptive }]),
-      style: v(t.containerStyle)
+      refresh: () => j(),
+      refreshByDelete: (e) => q(e),
+      scrollToFirstRow: Q,
+      getSearchFormValuesIfSetted: X,
+      setPaging: M,
+      getPaging: K,
+      setSearchFormValuesIfSetted: Y
+    }), (e, a) => (i(), s("div", {
+      class: l([t(d)(), { [t($)("adaptive")]: e.adaptive }]),
+      style: h(e.containerStyle)
     }, [
-      u(t.$slots, "header", {
-        formIns: K,
-        submit: e(w),
-        reset: e(B)
+      u(e.$slots, "header", {
+        formIns: W,
+        submit: t(w),
+        reset: t(B)
       }),
-      _("div", {
+      ae("div", {
         class: l([
-          e(m)("content-container"),
-          { [e(T)("content-container", "spinning")]: d.value }
+          t(d)("content-container"),
+          { [t(T)("content-container", "spinning")]: m.value }
         ])
       }, [
-        d.value ? (i(), s("div", {
+        m.value ? (i(), s("div", {
           key: 0,
-          class: l(e(y)("spin-wrapper"))
+          class: l(t(y)("spin-wrapper"))
         }, [
-          g(e(te), { spinning: d.value }, null, 8, ["spinning"])
+          g(t(oe), { spinning: m.value }, null, 8, ["spinning"])
         ], 2)) : I("", !0),
-        c.value.length === 0 ? u(t.$slots, "empty", {
+        c.value.length === 0 ? u(e.$slots, "empty", {
           key: 1,
-          loading: d.value
+          loading: m.value
         }, () => [
-          g(e(V), { image: e(R) }, null, 8, ["image"])
+          g(t(E), { image: t(N) }, null, 8, ["image"])
         ]) : (i(), s("div", {
           key: 2,
           ref_key: "contentRef",
-          ref: b,
-          style: v(t.contentStyle),
-          class: l(e(y)("content"))
+          ref: k,
+          style: h(e.contentStyle),
+          class: l(t(y)("content"))
         }, [
-          t.virtual ? (i(), s(E, { key: 0 }, [
-            e(re)(t.virtual) ? (i(), O(e(le), {
+          e.virtual ? (i(), s(F, { key: 0 }, [
+            t(se)(e.virtual) ? (i(), V(t(me), {
               key: 0,
-              class: l(e(m)("scroll-wrapper")),
+              class: l(t(d)("scroll-wrapper")),
               items: c.value,
-              "item-size": t.virtual,
-              "key-field": n.rowKey || "id"
+              "item-size": e.virtual,
+              "key-field": r.rowKey || "id"
             }, {
-              default: h(({ item: r, index: o }) => [
-                u(t.$slots, "renderItem", {
-                  item: r,
+              default: b(({ item: n, index: o }) => [
+                u(e.$slots, "renderItem", {
+                  item: n,
                   index: o
                 })
               ]),
               _: 3
-            }, 8, ["class", "items", "item-size", "key-field"])) : (i(), O(e(se), {
+            }, 8, ["class", "items", "item-size", "key-field"])) : (i(), V(t(de), {
               key: 1,
               items: c.value,
-              "min-item-size": t.virtual.minItemSize,
-              class: l(e(m)("scroll-wrapper"))
+              "min-item-size": e.virtual.minItemSize,
+              class: l(t(d)("scroll-wrapper"))
             }, {
-              default: h(({ item: r, index: o, active: Q }) => {
-                var C, P;
+              default: b(({ item: n, index: o, active: Z }) => {
+                var z, C;
                 return [
-                  g(e(ue), {
-                    item: r,
-                    active: Q,
+                  g(t(fe), {
+                    item: n,
+                    active: Z,
                     "data-index": o,
-                    "size-dependencies": (P = (C = t.virtual).sizeDependencies) == null ? void 0 : P.call(C, r)
+                    "size-dependencies": (C = (z = e.virtual).sizeDependencies) == null ? void 0 : C.call(z, n)
                   }, {
-                    default: h(() => [
-                      u(t.$slots, "renderItem", {
-                        item: r,
+                    default: b(() => [
+                      u(e.$slots, "renderItem", {
+                        item: n,
                         index: o
                       })
                     ]),
@@ -170,30 +180,30 @@ const be = /* @__PURE__ */ X({
               }),
               _: 3
             }, 8, ["items", "min-item-size", "class"]))
-          ], 64)) : u(t.$slots, "renderContent", {
+          ], 64)) : u(e.$slots, "renderContent", {
             key: 1,
             dataSource: c.value
           }, () => [
-            (i(!0), s(E, null, x(c.value, (r, o) => u(t.$slots, "renderItem", {
-              item: r,
+            (i(!0), s(F, null, ne(c.value, (n, o) => u(e.$slots, "renderItem", {
+              item: n,
               index: o
             })), 256))
           ])
         ], 6))
       ], 2),
-      U.value ? (i(), s("div", {
+      J.value ? (i(), s("div", {
         key: 0,
-        class: l(e(y)("footer")),
-        style: v(t.footerWarpperStyle)
+        class: l(t(y)("footer")),
+        style: h(e.footerWarpperStyle)
       }, [
-        g(e(ae), ee(
-          f.value ? e(z) : e(oe)(e(D).pagination, ["showTotal"]),
-          { onChange: G }
+        g(t(ie), re(
+          f.value ? t(P) : t(ue)(t(D).pagination, ["showTotal"]),
+          { onChange: H }
         ), null, 16)
       ], 6)) : I("", !0)
     ], 6));
   }
 });
 export {
-  be as default
+  De as default
 };

package/es/src/ap-list/interface.d.ts

@@ -1,6 +1,7 @@
-import { Ref, StyleValue } from 'vue';
+import { StyleValue } from 'vue';
 import { RequestData } from '../ap-table';
 import { Recordable } from '../type';
+import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type ApListProps<RecordType = any, ParamsType = Recordable> = {
     /**
      * 列表数据源，传入后`request`和`defaultData`都将失效
@@ -16,9 +17,10 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
      */
     onItem?: (record: RecordType, index: number) => void;
     /**
-     * 依赖的额外的参数，传入响应式参数会在变更后重新执行
+     * 依赖的额外的参数
+     * 变更后会重新发起网络请求
      */
-    params?: ParamsType | Ref<ParamsType>;
+    params?: ParamsType;
     /**
      * 请求数据
      * @param params
@@ -126,4 +128,23 @@ export type ApListExpose = {
      * @returns
      */
     getSearchFormValuesIfSetted: (transform?: boolean) => Recordable;
+    /**
+     * 设置查询表单的值
+     * @description 只有在自定义查询表单并且绑定了formRef才能设置查询表单的值
+     * @param fields 将要设置的值
+     * @returns
+     */
+    setSearchFormValuesIfSetted: (fields: any) => void;
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };

package/es/src/ap-modal/interface.d.ts

@@ -134,9 +134,10 @@ export type CreateModalStreamProps<ModalType extends ModalStreamTypeKey = ModalS
     /**
      * 弹框属性
      * @param params 上一步弹框传递的参数
+     * @param next 下一步
      * @returns
      */
-    props: (params: any) => Promise<ModalStreamType[ModalType]>;
+    props: (params: any, next: ModalStreamNextFunc<ModalType>) => Promise<ModalStreamType[ModalType]>;
 } : never;
 export type CreateModalStreamFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (streamList: CreateModalStreamProps<ModalType>[], firstModalId?: string) => void;
 export type ApModalType = keyof Omit<ModalStaticFunctions, 'warn'>;

package/es/src/ap-modal/utils/createModalStream.mjs

@@ -2,24 +2,24 @@ import { isValid as L } from "@aplus-frontend/utils";
 import { createModal as P } from "./createModal.mjs";
 import { Modal as V } from "@aplus-frontend/antdv";
 import { ModalMessage as S } from "../enums/modalMessage.mjs";
-const G = (_, F) => {
+const G = (u, F) => {
   var O;
-  const l = F ?? (Array.isArray(_) ? (O = _[0]) == null ? void 0 : O.modalId : void 0), d = /* @__PURE__ */ new Map();
-  let T, u, E = 1e3;
-  const y = async ({
-    modalId: a,
+  const y = F ?? (Array.isArray(u) ? (O = u[0]) == null ? void 0 : O.modalId : void 0), d = /* @__PURE__ */ new Map();
+  let T, _, E = 1e3;
+  const l = async ({
+    modalId: f,
     params: o,
     handleCurrentModal: t
   }) => {
     T = o;
-    const w = _.find((n) => n.modalId === a);
+    const w = u.find((n) => n.modalId === f);
     let s = !1;
-    if (u) {
-      const n = d.get(u), i = {
+    if (_) {
+      const n = d.get(_), i = {
         ...n,
         destroy: () => {
-          var f;
-          (f = n == null ? void 0 : n.destroy) == null || f.call(n), d.delete(u);
+          var a;
+          (a = n == null ? void 0 : n.destroy) == null || a.call(n), d.delete(_);
         },
         open: () => {
           s = !0;
@@ -31,22 +31,22 @@ const G = (_, F) => {
       k(w);
     }), s;
   }, I = () => {
-    var a;
+    var f;
     for (const [o, t] of d)
-      (a = t == null ? void 0 : t.destroy) == null || a.call(t);
-  }, k = async (a) => {
+      (f = t == null ? void 0 : t.destroy) == null || f.call(t);
+  }, k = async (f) => {
     var g, A, C, z;
     const {
       modalId: o,
       modalType: t = "createModal",
       props: w
-    } = a;
-    u = o;
-    const s = d.get(o), n = await (w == null ? void 0 : w(T));
+    } = f;
+    _ = o;
+    const s = d.get(o), n = await (w == null ? void 0 : w(T, async (e) => (a = !0, await l(e))));
     E = Math.max((n == null ? void 0 : n.zIndex) ?? 0, E), E += 1;
-    let i, f = !1;
+    let i, a = !1;
     if (t === "createModal") {
-      const e = n, m = async (r) => (f = !0, await y(r));
+      const e = n, m = async (r) => (a = !0, await l(r));
       i = {
         ...e,
         destroyOnClose: !1,
@@ -54,31 +54,31 @@ const G = (_, F) => {
         onOk: async (r) => {
           var N;
           const c = await ((N = e == null ? void 0 : e.onOk) == null ? void 0 : N.call(e, r, m));
-          if (f || I(), c)
+          if (a || I(), c)
             throw new Error(S.NOT_NEED_CLOSE);
         },
         onCancel: async (r) => {
           var N;
           const c = await ((N = e == null ? void 0 : e.onCancel) == null ? void 0 : N.call(e, r, m));
-          if (f || I(), c)
+          if (a || I(), c)
             throw new Error(S.NOT_NEED_CLOSE);
         }
       };
     } else {
-      const e = n, m = async (r) => (f = !0, await y(r));
+      const e = n, m = async (r) => (a = !0, await l(r));
       i = {
         ...e,
         zIndex: E,
         onOk: async () => {
           var c;
           const r = await ((c = e == null ? void 0 : e.onOk) == null ? void 0 : c.call(e, m));
-          if (f || I(), r)
+          if (a || I(), r)
             throw new Error(S.NOT_NEED_CLOSE);
         },
         onCancel: async () => {
           var c;
           const r = await ((c = e == null ? void 0 : e.onCancel) == null ? void 0 : c.call(e, m));
-          if (f || I(), r)
+          if (a || I(), r)
             throw new Error(S.NOT_NEED_CLOSE);
         }
       };
@@ -91,7 +91,7 @@ const G = (_, F) => {
       (A = e == null ? void 0 : e.open) == null || A.call(e), d.set(o, e);
     } else
       (z = (C = V) == null ? void 0 : C[t]) == null || z.call(C, i);
-  }, D = _.find((a) => L(l) && a.modalId === l);
+  }, D = u.find((f) => L(y) && f.modalId === y);
   D !== void 0 && k(D);
 };
 export {