@aplus-frontend/ui 7.0.0-beta.2 → 7.0.0

package/es/src/ap-form/style/drawer-form.d.ts

@@ -1,5 +1,5 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export declare const genDrawerFormStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/item-group.d.ts

@@ -1,5 +1,5 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export declare const genItemGroupStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/item-text-group.d.ts

@@ -1,5 +1,5 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export declare const genFormItemTextGroupStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/item.d.ts

@@ -1,6 +1,5 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { ApFormToken } from './token';
-import { Ref } from 'vue';
-export declare const genApFormItemStyle: GenStyleFunc<ApFormToken>;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+import { ComputedRef } from 'vue';
+export declare const genApFormItemStyle: GenStyleFunc;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/item.mjs

@@ -1,8 +1,8 @@
-import { genComponentStyleHook as t } from "../../utils/cssinjs/index.mjs";
-const r = (n) => {
-  const { componentCls: a, namespace: e } = n;
+import { genComponentStyleHook as a } from "../../utils/cssinjs/index.mjs";
+const i = (n) => {
+  const { componentCls: e, namespace: t } = n;
   return {
-    [a]: {
+    [e]: {
       // bordered
       "&--bordered": {
         boxSizing: "border-box",
@@ -12,7 +12,7 @@ const r = (n) => {
         ".ant-input-affix-wrapper": {
           padding: 0
         },
-        [`&:has(.${e}-batch-input-group):has(.ant-select)`]: {
+        [`&:has(.${t}-batch-input-group):has(.ant-select)`]: {
           ".ant-input-affix-wrapper": {
             paddingInlineEnd: n.space
           }
@@ -81,9 +81,9 @@ const r = (n) => {
         },
         "&:focus": {
           borderColor: n.activeColorBase,
-          boxShadow: `0 0 0 2px ${n.apFormBorderedShadowColor}`
+          boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
         },
-        [`.${e}-batch-input-group-popover-input__popover`]: {
+        [`.${t}-batch-input-group-popover-input__popover`]: {
           width: "calc(100% + 12px)"
         }
       },
@@ -97,12 +97,12 @@ const r = (n) => {
       // focus
       "&--focused": {
         borderColor: n.activeColorBase,
-        boxShadow: `0 0 0 2px ${n.apFormBorderedShadowColor}`
+        boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
       },
       // other
       ".ant-form-show-help": {
         ".ant-form-item-explain-error": {
-          fontsize: n.fontSize,
+          fontSize: n.fontSize,
           lineHeight: "16px"
         }
       },
@@ -124,12 +124,8 @@ const r = (n) => {
       }
     }
   };
-}, i = t(
-  "ApForm",
-  (n) => [r(n)],
-  { apFormBorderedShadowColor: "rgba(5, 155, 255, 0.1)" }
-);
+}, o = a("ApForm", (n) => [i(n)]);
 export {
-  i as default,
-  r as genApFormItemStyle
+  o as default,
+  i as genApFormItemStyle
 };

package/es/src/ap-form/style/modal-form.d.ts

@@ -1,5 +1,6 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
-export declare const genModalFormStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+import { ApFormToken } from './token';
+import { ComputedRef } from 'vue';
+export declare const genModalFormStyle: GenStyleFunc<ApFormToken>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/modal-form.mjs

@@ -1,32 +1,45 @@
-import { genComponentStyleHook as n } from "../../utils/cssinjs/index.mjs";
-const e = (t) => {
-  const { componentCls: o } = t;
+import { genComponentStyleHook as d } from "../../utils/cssinjs/index.mjs";
+const e = (o) => {
+  const { componentCls: a } = o;
   return {
-    [o]: {
+    [a]: {
       ".ant-modal-content": {
         padding: 0
       },
       ".ant-modal-header": {
-        padding: "15px 20px",
+        paddingInline: o.apFormModalHeaderPaddingInline,
+        paddingBlock: o.apFormModalHeaderPaddingBlock,
         borderBottom: "1px solid #E9EDF3",
         marginBottom: 0
       },
-      [`${o}__content`]: {
-        padding: "20px 20px 0px"
+      [`${a}__content`]: {
+        padding: o.apFormModalContentPadding
       },
-      [`${o}__footer`]: {
-        padding: "12px 20px"
+      [`${a}__footer`]: {
+        padding: o.apFormModalFooterPadding
       },
-      [`${o}__footer-admin`]: {
+      [`${a}__footer-admin`]: {
         borderTop: "1px solid #E9EDF3"
       },
       ".ant-modal-close": {
-        top: "16px"
+        top: `calc(${o.apFormModalHeaderPaddingBlock} - (${o.apFormModalCloseSize} - 22px) / 2)`,
+        width: o.apFormModalCloseSize,
+        height: o.apFormModalCloseSize
       }
     }
   };
-}, d = n("ApForm.Modal", (t) => [e(t)]);
+}, r = d(
+  "ApForm.Modal",
+  (o) => [e(o)],
+  {
+    apFormModalHeaderPaddingInline: 20,
+    apFormModalHeaderPaddingBlock: 15,
+    apFormModalContentPadding: "20px 20px 0px",
+    apFormModalFooterPadding: "12px 20px",
+    apFormModalCloseSize: 32
+  }
+);
 export {
-  d as default,
+  r as default,
   e as genModalFormStyle
 };

package/es/src/ap-form/style/search-form-sorter.d.ts

@@ -1,5 +1,6 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
-export declare const genSearchFormSorter: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+import { ApFormToken } from './token';
+import { ComputedRef } from 'vue';
+export declare const genSearchFormSorter: GenStyleFunc<ApFormToken>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/search-form-sorter.mjs

@@ -1,12 +1,12 @@
 import { resetComponent as e } from "../../style/index.mjs";
-import { genComponentStyleHook as i } from "../../utils/cssinjs/index.mjs";
-import { genPopoverStyle as p } from "./search-form.mjs";
-const a = (r) => {
+import { genComponentStyleHook as a } from "../../utils/cssinjs/index.mjs";
+import { genPopoverStyle as t } from "./search-form.mjs";
+const i = (r) => {
   const { componentCls: o } = r;
   return {
     [o]: {
       [`${o}-content`]: {
-        width: "560px"
+        width: r.searchFormSorterWidth
       },
       [`${o}-header`]: {
         padding: `${r.spaceXL} ${r.spaceXL} 0px`,
@@ -23,7 +23,7 @@ const a = (r) => {
         },
         "&-action-wrapper": {
           padding: r.space,
-          margin: `calc(-${r.space})`,
+          margin: `calc(-1 * ${r.space})`,
           cursor: "pointer"
         },
         "&-reset-btn": {
@@ -35,14 +35,14 @@ const a = (r) => {
         display: "flex",
         flexDirection: "row",
         flexWrap: "wrap",
-        marginInlineStart: "-4px",
-        marginInlineEnd: "-4px",
-        rowGap: "8px"
+        marginInlineStart: `calc(${r.searchFormSorterItemGap} / -2)`,
+        marginInlineEnd: `calc(${r.searchFormSorterItemGap} / -2)`,
+        rowGap: r.searchFormSorterItemGap
       },
       [`${o}-sorter-item`]: {
         flex: "0 0 33.333333%",
         maxWidth: "33.333333%",
-        paddingInline: r.spaceXS,
+        paddingInline: `calc(${r.searchFormSorterItemGap} / 2)`,
         "> div": {
           border: `1px solid ${r.colorBg1}`,
           borderRadius: r.borderRadius,
@@ -72,10 +72,17 @@ const a = (r) => {
         textOverflow: "ellipsis"
       }
     },
-    ...p(r)
+    ...t(r)
   };
-}, c = i("ApForm.SearchFormSorter", (r) => [a(r)]);
+}, s = a(
+  "ApForm.SearchFormSorter",
+  (r) => [i(r)],
+  {
+    searchFormSorterWidth: 560,
+    searchFormSorterItemGap: 8
+  }
+);
 export {
-  c as default,
-  a as genSearchFormSorter
+  s as default,
+  i as genSearchFormSorter
 };

package/es/src/ap-form/style/search-form.d.ts

@@ -1,6 +1,6 @@
 import { GenStyleFunc, StyleMixin } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export declare const genPopoverStyle: StyleMixin;
 export declare const genSearchFormStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-form/style/token.d.ts

@@ -1,3 +1,27 @@
 export type ApFormToken = {
-    apFormBorderedShadowColor: string;
+    /**
+     * 对话框表单头部边距
+     */
+    apFormModalHeaderPaddingInline: number;
+    apFormModalHeaderPaddingBlock: number;
+    /**
+     * 对话框表单内容区边距
+     */
+    apFormModalContentPadding: string | number;
+    /**
+     * 对话框表单底部Footer区域边距
+     */
+    apFormModalFooterPadding: string | number;
+    /**
+     * 关闭按钮的尺寸
+     */
+    apFormModalCloseSize: number;
+    /**
+     * 查询表单排序弹框宽度
+     */
+    searchFormSorterWidth: number;
+    /**
+     * 查询表单排序元素间距
+     */
+    searchFormSorterItemGap: number;
 };

package/es/src/ap-grid/hooks/use-table-style.mjs

@@ -8,7 +8,7 @@ const x = () => {
       "--vxe-ui-table-row-checkbox-checked-background-color": e.controlItemBgActive,
       "--vxe-ui-table-row-hover-checkbox-checked-background-color": e.controlItemBgActiveHover,
       "--vxe-ui-font-primary-color": e.colorPrimary,
-      "--vxe-ui-table-header-background-color": "var(--ap-table-header-bg)",
+      "--vxe-ui-table-header-background-color": "var(--table-header-bg)",
       "--vxe-ui-table-cell-padding-default": "12px",
       "--vxe-ui-table-cell-padding-medium": "9px",
       "--vxe-ui-table-row-height-medium": "36px",

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

@@ -535,8 +535,8 @@ const lo = /* @__PURE__ */ Je({
             direction: "horizontal",
             "scroll-container": Re.value,
             "extra-size": -4.2,
-            "bar-color": "var(--ap-scrollbar-thumb-color-base)",
-            "track-color": "var(--ap-table-header-bg, #f2f6f9)"
+            "bar-color": "var(--scrollbar-thumb-color-base)",
+            "track-color": "var(--table-header-bg, #f2f6f9)"
           }, null, 8, ["scroll-container"])) : y("", !0),
           e.pagination !== !1 ? (s(), d(t(pt), S({
             key: 1,

package/es/src/ap-grid/style/editable.d.ts

@@ -1,5 +1,5 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export declare const genEditableGridStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-grid/style/index.d.ts

@@ -1,5 +1,8 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
-export declare const genApGridStyle: GenStyleFunc;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+import { ComputedRef } from 'vue';
+export type ApGridToken = {
+    apGridFixedScrollingBoxShadowColor: string;
+};
+export declare const genApGridStyle: GenStyleFunc<ApGridToken>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

package/es/src/ap-grid/style/index.mjs

@@ -1,6 +1,6 @@
 import { genSettingTriggerBtnStyle as r } from "../../ap-table/style/index.mjs";
-import { multiRows as o, resetScrollbar as p } from "../../style/index.mjs";
-import { genComponentStyleHook as d } from "../../utils/cssinjs/index.mjs";
+import { multiRows as o, resetScrollbar as d } from "../../style/index.mjs";
+import { genComponentStyleHook as p } from "../../utils/cssinjs/index.mjs";
 import { aplusApGridIconFont as c } from "./font.mjs";
 const g = (e) => {
   const { componentCls: i, namespace: t } = e, l = `${i}-vxe-wrapper`, a = `${i}-pagination-wrapper`, n = `.${t}-scroll-bar`;
@@ -8,7 +8,7 @@ const g = (e) => {
     c,
     {
       [i]: {
-        ...p(e),
+        ...d(e),
         ".vxe-table--render-default.size--medium .vxe-body--column.is--padding div.vxe-cell": {
           minHeight: "unset !important",
           padding: "9px 12px",
@@ -152,7 +152,6 @@ const g = (e) => {
           "&__title": {
             ...o(e),
             fontWeight: "bold",
-            textAlign: "right",
             "&--single": {
               flex: "unset"
             }
@@ -209,9 +208,13 @@ const g = (e) => {
       }
     }
   ];
-}, m = d("ApGrid", (e) => [
-  g(e)
-]);
+}, m = p(
+  "ApGrid",
+  (e) => [g(e)],
+  {
+    apGridFixedScrollingBoxShadowColor: "#dae0e7"
+  }
+);
 export {
   m as default,
   g as genApGridStyle

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

@@ -1,23 +1,23 @@
-import { createVNode as u, Fragment as h } from "vue";
-import { isArray as b, isUndefined as E, isString as o, isBoolean as x, isNumber as O, pick as F } from "lodash-unified";
-import { valueEnumToArray as S, objectToString as $, getTableTitle as R, getTableRenderType as V, getTableRenderProps as B, getTableCellRenderNode as M } from "../../ap-table/utils.mjs";
+import { createVNode as u, Fragment as T } from "vue";
+import { isArray as x, isUndefined as E, isString as o, isBoolean as F, isNumber as O, pick as R } from "lodash-unified";
+import { valueEnumToArray as S, objectToString as $, getTableTitle as v, getTableRenderType as V, getTableRenderProps as B, getTableCellRenderNode as M } from "../../ap-table/utils.mjs";
 import { noRenderAsFormItemValueList as _ } from "../../ap-table/constants.mjs";
 import "../../ap-table/components/paragraph-ellipsis/index.vue.mjs";
 import j from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
-function T(e, t) {
+function c(e, t) {
   if (t)
-    return b(t) ? t.reduce((r, n) => r?.[n], e) : e?.[t];
+    return x(t) ? t.reduce((r, n) => r?.[n], e) : e?.[t];
 }
-function v(e) {
+function A(e) {
   if (!E(e))
-    return b(e) ? e.reduce((t, r) => o(r) ? `${t}${t ? "." : ""}${r}` : `${t}[${r}]`, "") : String(e);
+    return x(e) ? e.reduce((t, r) => o(r) ? `${t}${t ? "." : ""}${r}` : `${t}[${r}]`, "") : String(e);
 }
-function A(e) {
+function N(e) {
   if (e)
     return e === !0 ? "left" : e;
 }
 function q(e) {
-  return x(e) ? {
+  return F(e) ? {
     sortable: e
   } : e ? {
     sortable: !0,
@@ -29,7 +29,7 @@ function q(e) {
 }
 function I(e) {
   let t;
-  return x(e.filters) && e.valueEnum ? t = S(e.valueEnum) : t = e.filters, t?.map((r) => ({
+  return F(e.filters) && e.valueEnum ? t = S(e.valueEnum) : t = e.filters, t?.map((r) => ({
     label: o(r.text) ? r.text : "",
     value: r.value
   }));
@@ -65,10 +65,10 @@ function z(e, t, r) {
   }
   return r;
 }
-function c(e, t, r) {
-  const n = F(e, ["width", "minWidth", "align"]);
-  return n.field = v(e.dataIndex), n.fixed = A(e.fixed), n.slots = {
-    header: () => R(e, r, void 0, t)
+function y(e, t, r) {
+  const n = R(e, ["width", "minWidth", "align"]);
+  return n.field = A(e.dataIndex), n.fixed = N(e.fixed), n.slots = {
+    header: () => v(e, r, void 0, t)
   }, n.headerAlign = e.align, n.showOverflow = !1, n.showFooterOverflow = !1, n;
 }
 function D(e, t, r) {
@@ -88,65 +88,65 @@ const G = ({
   }), l = M(s, d, t.record, n), a = r.renderText?.({
     value: e,
     ...t
-  }) || e, p = r.renderText ? u(h, null, [r.renderText?.({
+  }) || e, p = r.renderText ? u(T, null, [r.renderText?.({
     value: e,
     ...t
   })]) : l;
   let f = i ? z(r, a, p) : p;
   if (r.customRender) {
-    const N = r._path || [], w = D(t.record, t.rowIndex, t.params?.rowKey);
+    const w = r._path || [], h = D(t.record, t.rowIndex, t.params?.rowKey);
     f = r.customRender({
       value: e,
       ...t,
       column: r,
       originalNode: f,
       originalText: a,
-      path: [...N, String(w)]
+      path: h && [...w, String(h)]
     });
   }
-  return u(h, null, [f]);
+  return u(T, null, [f]);
 };
-function y(e, t, r, n) {
-  const i = F(e, ["width", "minWidth", "align", "resizable", "className", "headerClassName", "footerClassName", "treeNode"]);
-  i.field = v(e.dataIndex), i.fixed = A(e.fixed), i.headerAlign = e.align, i.footerAlign = e.align, i.showOverflow = !1, i.showFooterOverflow = !1, Object.assign(i, q(e.sorter)), i.filters = I(e), i.filterMultiple = e.filterMultiple, i.filterMethod = W(e.onFilter);
+function b(e, t, r, n) {
+  const i = R(e, ["width", "minWidth", "align", "resizable", "className", "headerClassName", "footerClassName", "treeNode"]);
+  i.field = A(e.dataIndex), i.fixed = N(e.fixed), i.headerAlign = e.align, i.footerAlign = e.align, i.showOverflow = !1, i.showFooterOverflow = !1, Object.assign(i, q(e.sorter)), i.filters = I(e), i.filterMultiple = e.filterMultiple, i.filterMethod = W(e.onFilter);
   const s = ({
     row: d,
     rowIndex: l
   }) => G({
-    value: T(d, e.dataIndex),
-    text: T(d, e.dataIndex),
+    value: c(d, e.dataIndex),
+    text: c(d, e.dataIndex),
     record: d,
     index: l,
     renderIndex: l,
     column: e
   }, e, n);
   return i.slots = {
-    header: () => R(e, r, void 0, t),
+    header: () => v(e, r, void 0, t),
     default: s,
     footer: s
   }, e.html && (delete i.slots.default, delete i.slots.footer, i.type = "html"), e.seq && (i.type = "seq", i.slots = {}), i;
 }
 function X(e, t, r, n) {
   if (!e.children?.length)
-    return y(e, t, r, n);
+    return b(e, t, r, n);
   function i(d) {
     return d.map((l) => {
       if (l.children?.length) {
-        const a = c(l, t, r);
+        const a = y(l, t, r);
         return a.children = i(l.children), a;
       }
-      return y(l, t, r, n);
+      return b(l, t, r, n);
     });
   }
-  const s = c(e, t, r);
+  const s = y(e, t, r);
   return s.children = i(e.children), s;
 }
 export {
   G as contentCustom,
-  v as dataIndexToField,
-  T as getValueByDataIndex,
+  A as dataIndexToField,
+  c as getValueByDataIndex,
   X as transformCol,
-  A as transformFixed,
-  c as transformToColGroup,
-  y as transformToColumn
+  N as transformFixed,
+  y as transformToColGroup,
+  b as transformToColumn
 };

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

@@ -1,8 +1,8 @@
 import { GenStyleFunc } from '../../design-token/interface';
-import { Ref } from 'vue';
+import { ComputedRef } from 'vue';
 export type ApListToken = {
     apListSpinnigOpacity: number;
 };
 export declare const genApListStyle: GenStyleFunc<ApListToken>;
-declare const _default: (prefixCls: string) => Ref<string | undefined, string | undefined>;
+declare const _default: (prefixCls: string) => ComputedRef<string>;
 export default _default;

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

@@ -1,19 +1,19 @@
 import { ModalProps, ModalFuncProps } from '@aplus-frontend/antdv';
 import { ModalFunc, ModalStaticFunctions } from '@aplus-frontend/antdv/lib/modal/confirm';
-import { AppContext } from 'vue';
-export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer' | 'icon'> & Partial<{
+import { AppContext, VNodeChild } from 'vue';
+export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open' | 'onUpdate:open' | 'destroyOnClose' | 'onCancel' | 'onOk' | 'getContainer' | 'icon' | 'footer'> & Partial<{
     /**
      * 点击取消回调
      * @param params content组件内使用defineExpose导出的对象
      * @returns
      */
-    onCancel: (params: ContentRecord) => any | Promise<any>;
+    onCancel: (contentExposed: ContentRecord) => any | Promise<any>;
     /**
      * 点击确定回调
      * @param params content组件内使用defineExpose导出的对象
      * @returns
      */
-    onOk: (params: ContentRecord) => any | Promise<any>;
+    onOk: (contentExposed: ContentRecord) => any | Promise<any>;
     /**
      * 指定弹框挂载的 HTML 节点
      */
@@ -34,8 +34,28 @@ export type CreateModalFuncProps<ContentRecord = any> = Omit<ModalProps, 'open'
      * 弹窗的上下文，一般用于获取全局注册组件、vuex 等内容
      */
     appContext: AppContext;
+    /**
+     * 底部内容，当不需要默认底部按钮时，可以设为 :footer="null"
+     */
+    footer: ((params: {
+        /**
+         * 原始的底部内容
+         */
+        originNode: VNodeChild;
+        /**
+         * 底部按钮
+         */
+        extra: {
+            okBtn: VNodeChild;
+            cancelBtn: VNodeChild;
+        };
+        /**
+         * content组件内使用defineExpose导出的对象
+         */
+        contentExposed: ContentRecord;
+    }) => VNodeChild) | VNodeChild;
 }>;
-export type CreateModalFuncReturn = {
+export type CreateModalFuncReturn<ContentRecord = any> = {
     /**
      * 销毁弹框
      * @returns
@@ -46,7 +66,7 @@ export type CreateModalFuncReturn = {
      * @param newConfig
      * @returns
      */
-    update: (newConfig: CreateModalFuncProps) => void;
+    update: (newConfig: CreateModalFuncProps<ContentRecord>) => void;
     /**
      * 打开弹框
      * @returns
@@ -58,7 +78,7 @@ export type CreateModalFuncReturn = {
      */
     close: () => void;
 };
-export type CreateModalFunc = (props: CreateModalFuncProps) => CreateModalFuncReturn;
+export type CreateModalFunc = <ContentRecord = any>(props: CreateModalFuncProps<ContentRecord>) => CreateModalFuncReturn<ContentRecord>;
 export type ModalStreamNextFunc<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = (option?: {
     /**
      * 下一步弹框的id
@@ -121,18 +141,18 @@ export type ModalFuncStream<ModalType extends ModalStreamTypeKey = ModalStreamTy
 export type CreateModalStream<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = Omit<CreateModalFuncProps, 'destroyOnClose' | 'onOk' | 'onCancel'> & {
     /**
      * 点击确定回调
-     * * @param params content组件内使用defineExpose导出的对象
+     * * @param contentExposed content组件内使用defineExpose导出的对象
      * @param next 下一步
      * @returns
      */
-    onOk?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    onOk?: (contentExposed: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
     /**
      * 点击取消回调
-     * * @param params content组件内使用defineExpose导出的对象
+     * * @param contentExposed content组件内使用defineExpose导出的对象
      * @param next 下一步
      * @returns
      */
-    onCancel?: (params: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
+    onCancel?: (contentExposed: any, next: ModalStreamNextFunc<ModalType>) => any | Promise<any>;
 };
 export type ModalStreamTypeKey = keyof ModalStreamType;
 export type CreateModalStreamProps<ModalType extends ModalStreamTypeKey = ModalStreamTypeKey> = ModalType extends ModalStreamTypeKey ? {