@aplus-frontend/ui 6.42.0 → 6.42.1

package/es/src/ag-grid/hooks/use-columns-def.mjs

@@ -1,7 +1,7 @@
-import { getTableRenderProps as y, objectToString as D } from "../../ap-table/utils.mjs";
-import { rendererMap as h } from "../renderer/index.mjs";
-import { isNumber as f, isFunction as m } from "lodash-unified";
-import { ref as P, unref as x, computed as T } from "vue";
+import { getTableRenderProps as c, objectToString as D } from "../../ap-table/utils.mjs";
+import { rendererMap as x } from "../renderer/index.mjs";
+import { isNumber as u, isFunction as m } from "lodash-unified";
+import { ref as P, unref as v, computed as y } from "vue";
 import "../components/body-cell/index.vue.mjs";
 import "../components/header-cell/index.vue.mjs";
 import "../components/tooltip/index.vue.mjs";
@@ -12,24 +12,24 @@ import { useGlobalConfig as _ } from "../../config-provider/hooks/use-global-con
 import { useNamespace as G } from "../../config-provider/hooks/use-namespace.mjs";
 import W from "../components/body-cell/index.vue2.mjs";
 import z from "../components/tooltip/index.vue2.mjs";
-import v from "../components/header-cell/index.vue2.mjs";
+import h from "../components/header-cell/index.vue2.mjs";
 function F(t) {
-  return f(t) && t > 1;
+  return u(t) && t > 1;
 }
-function M(t, i) {
-  if (i.bodyCellTooltip)
-    return m(i.bodyCellTooltip) ? i.bodyCellTooltip(t.value, t.data) : i.bodyCellTooltip;
-  if (i.renderText)
-    return i.renderText({
+function M(t, a) {
+  if (a.bodyCellTooltip)
+    return m(a.bodyCellTooltip) ? a.bodyCellTooltip(t.value, t.data) : a.bodyCellTooltip;
+  if (a.renderText)
+    return a.renderText({
       value: t.value,
       record: t.data,
-      column: i,
+      column: a,
       text: t.value
     });
-  const n = i.valueType || "text", d = h[n];
-  if (d) {
-    const p = y(
-      { ...i, valueType: n },
+  const d = a.valueType || "text", p = x[d];
+  if (p) {
+    const f = c(
+      { ...a, valueType: d },
       {
         value: t.value,
         text: t.value,
@@ -39,22 +39,22 @@ function M(t, i) {
         pinned: t.node?.rowPinned
       }
     );
-    return d(p);
+    return p(f);
   }
   return D(t.value);
 }
-const X = (t, i, n) => {
-  const d = _("valueTypeMap"), u = P(), { em: p } = G("ag-grid"), c = (r) => {
-    const a = {
+const X = (t, a, d) => {
+  const p = _("valueTypeMap"), C = P(), { em: f } = G("ag-grid"), b = (r) => {
+    const i = {
       cellRenderer: W,
       cellRendererParams: {
         column: r,
-        extraValueType: x(d),
-        rowKey: i.rowKey
+        extraValueType: v(p),
+        rowKey: a.rowKey
       }
     };
     if (r.customRender)
-      return a;
+      return i;
     if (r.renderText)
       return {
         valueFormatter: (o) => r.renderText({
@@ -64,10 +64,10 @@ const X = (t, i, n) => {
           text: o.value
         })
       };
-    const s = r.valueType || "text", e = h[s];
+    const s = r.valueType || "text", e = x[s];
     return e ? {
       valueFormatter: (o) => {
-        const l = y(
+        const l = c(
           { ...r, valueType: s },
           {
             value: o.value,
@@ -80,18 +80,18 @@ const X = (t, i, n) => {
         );
         return e(l);
       }
-    } : a;
-  }, b = (r) => {
-    const a = {}, s = r.bodyCellTooltip || !r.customRender && (r.ellipsis === !0 || r.ellipsis === "tooltip" || f(r.ellipsis)), e = f(r.ellipsis) && r.ellipsis > 1, o = f(r.ellipsis) ? r.ellipsis : 1;
-    return a.tooltipValueGetter = s ? (l) => M(l, r) : void 0, a.wrapText = !r.ellipsis || e, a.cellStyle = {
-      "--ag-grid-line-clamp": o
-    }, a.tooltipComponent = z, a.tooltipComponentParams = {
-      lineClamp: o,
-      gridWrapperRef: u
-    }, a;
-  }, w = T(() => {
-    const r = x(t);
-    function a(s) {
+    } : i;
+  }, w = (r) => {
+    const i = r.valueType || "text", s = x[i], e = {}, o = r.bodyCellTooltip || !r.customRender && s && (r.ellipsis === !0 || r.ellipsis === "tooltip" || u(r.ellipsis)), l = u(r.ellipsis) && r.ellipsis > 1, n = u(r.ellipsis) ? r.ellipsis : 1;
+    return e.tooltipValueGetter = o ? (T) => M(T, r) : void 0, e.wrapText = !r.ellipsis || l, e.cellStyle = {
+      "--ag-grid-line-clamp": n
+    }, e.tooltipComponent = z, e.tooltipComponentParams = {
+      lineClamp: n,
+      gridWrapperRef: C
+    }, e;
+  }, g = y(() => {
+    const r = v(t);
+    function i(s) {
       return s.map((e) => {
         const o = {
           field: S(e.dataIndex),
@@ -111,44 +111,44 @@ const X = (t, i, n) => {
           // undefined to null
           colSpan: e.colSpan,
           spanRows: e.spanRows,
-          cellClass: n((l) => {
-            const C = e.cellClass || "", R = m(C) ? C(l.data, l.node) : C;
+          cellClass: d((l) => {
+            const n = e.cellClass || "", T = m(n) ? n(l.data, l.node) : n;
             return [
-              `${p("cell", e.align || "left")}`,
-              F(e.ellipsis) ? p("cell", "multiline") : null,
-              R
+              `${f("cell", e.align || "left")}`,
+              F(e.ellipsis) ? f("cell", "multiline") : null,
+              T
             ].flat().filter(Boolean);
           }),
           headerStyle: e.headerStyle,
           headerClass: e.headerClass,
           autoHeight: !0,
           // 设置自动计算高度以自适应多行换行的场景
-          ...b(e),
-          ...c(e)
+          ...w(e),
+          ...b(e)
         };
         return e.children?.length ? {
           ...o,
-          headerGroupComponent: v,
+          headerGroupComponent: h,
           headerGroupComponentParams: {
             column: e
           },
-          children: a(e.children)
+          children: i(e.children)
         } : o;
       });
     }
-    return a(r);
-  }), g = T(
+    return i(r);
+  }), R = y(
     () => ({
-      headerComponent: v,
-      resizable: i.columnResizable,
+      headerComponent: h,
+      resizable: a.columnResizable,
       suppressMovable: !0,
       cellDataType: !1
     })
   );
   return {
-    columnDefs: w,
-    defaultColDef: g,
-    gridWrapperRef: u
+    columnDefs: g,
+    defaultColDef: R,
+    gridWrapperRef: C
   };
 };
 export {

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 ? {

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

@@ -1,45 +1,45 @@
-import { render as m, defineComponent as b, createVNode as l, mergeProps as k, h as w } from "vue";
+import { render as f, defineComponent as b, createVNode as l, mergeProps as k, h as w } from "vue";
 import { Modal as P } from "@aplus-frontend/antdv";
-import { ConfigProvider as N, globalConfigCached as f } from "../../config-provider/config-provider.mjs";
-import { omit as L } from "lodash-unified";
-import { isNumeric as M } from "@aplus-frontend/utils";
+import { ConfigProvider as N, globalConfigCached as m } from "../../config-provider/config-provider.mjs";
+import { omit as E } from "lodash-unified";
+import { isNumeric as L } from "@aplus-frontend/utils";
 import "../../config-provider/index.mjs";
-import { getContainerDom as u, getModalGlobalAppContext as A } from "./util.mjs";
-import { getTopWindow as E } from "../../utils/index.mjs";
-import { useNamespace as T } from "../../config-provider/hooks/use-namespace.mjs";
-const z = (p) => {
-  let o, t;
+import { getContainerDom as u, getModalGlobalAppContext as M } from "./util.mjs";
+import { getTopWindow as A } from "../../utils/index.mjs";
+import { useNamespace as F } from "../../config-provider/hooks/use-namespace.mjs";
+const q = (o) => {
+  let t, n;
   const {
-    destroyOnClose: a = !0,
-    wrapperOffset: n = !1
-  } = p, {
-    b: s
-  } = T("ap-modal");
-  function i() {
-    o && o(!1), setTimeout(() => {
-      m(null, r), r.parentElement?.removeChild(r);
+    destroyOnClose: i = !0,
+    wrapperOffset: r = !1
+  } = o, {
+    b: p
+  } = F("ap-modal");
+  function s() {
+    t && t(!1), setTimeout(() => {
+      f(null, a), a.parentElement?.removeChild(a);
     }, 500);
   }
   function h() {
-    o && o(!0);
+    t && t(!0);
   }
-  function c() {
-    o && o(!1);
+  function d() {
+    t && t(!1);
   }
   function C(e) {
-    t && t(e);
+    n && n(e);
   }
   const g = /* @__PURE__ */ b({
     data() {
       return {
-        open: a,
-        props: p
+        open: i,
+        props: o
       };
     },
     created() {
-      o = (e) => {
+      t = (e) => {
         this.open = e;
-      }, t = (e) => {
+      }, n = (e) => {
         this.props = {
           ...this.props,
           ...e
@@ -52,61 +52,68 @@ const z = (p) => {
           const e = this.props?.content?.component?.exposed ?? void 0;
           await this.props?.onCancel(e);
         }
-        a ? i() : c();
+        i ? s() : d();
       },
       async handleOk() {
         try {
-          if (t({
+          if (n({
             confirmLoading: !0
           }), this.props?.onOk) {
             const e = this.props?.content?.component?.exposed ?? void 0;
             await this.props.onOk(e);
           }
-          t({
+          n({
             confirmLoading: !1
-          }), a ? i() : c();
+          }), i ? s() : d();
         } catch {
-          t({
+          n({
             confirmLoading: !1
           });
         }
+      },
+      handleFooter(e) {
+        return o?.footer !== void 0 ? typeof o.footer == "function" ? o.footer({
+          ...e,
+          contentExposed: this.props?.content?.component?.exposed ?? void 0
+        }) : o.footer : e?.originNode;
       }
     },
     render() {
-      const e = L(this.props, ["onCancel", "onOk", "open", "onUpdate:open", "getContainer", "icon"]);
-      return l(N, f.value, {
+      const e = E(this.props, ["onCancel", "onOk", "open", "onUpdate:open", "getContainer", "icon", "footer"]);
+      return l(N, m.value, {
         default: () => [l(P, k({
           class: {
-            [s()]: !0,
-            [s("wrapper")]: n
+            [p()]: !0,
+            [p("wrapper")]: r
           },
           centered: !0
         }, e, {
           open: this.open,
           onCancel: this.handleCancel,
-          onOk: this.handleOk
+          onOk: this.handleOk,
+          footer: this?.handleFooter
         }), {
           default: () => [l("div", {
             class: {
-              [s("body-wrapper")]: n
+              [p("body-wrapper")]: r
             },
-            style: n === !1 ? {} : {
-              maxHeight: `calc(100vh - ${(n === !0 ? 100 : M(n) ? Number(n) : 100) * 2}px)`
+            style: r === !1 ? {} : {
+              maxHeight: `calc(100vh - ${(r === !0 ? 100 : L(r) ? Number(r) : 100) * 2}px)`
             }
           }, [this.props?.content])]
         })]
       });
     }
-  }), x = u(f?.value?.getPopupContainer), v = u(p.getContainer), O = x || v || E().document.body, r = document.createElement("div");
-  O.appendChild(r);
-  const d = w(g), y = A();
-  return d.appContext = p.appContext || y || d.appContext, m(d, r), {
-    destroy: i,
+  }), x = u(m?.value?.getPopupContainer), v = u(o.getContainer), y = x || v || A().document.body, a = document.createElement("div");
+  y.appendChild(a);
+  const c = w(g), O = M();
+  return c.appContext = o.appContext || O || c.appContext, f(c, a), {
+    destroy: s,
     update: C,
     open: h,
-    close: c
+    close: d
   };
 };
 export {
-  z as createModal
+  q as createModal
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.42.0";
+declare const _default: "6.42.1";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.42.0";
+const e = "6.42.1";
 export {
   e as default
 };

package/lib/src/ag-grid/hooks/use-columns-def.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const x=require("../../ap-table/utils.js"),T=require("../renderer/index.js"),o=require("lodash-unified"),d=require("vue");require("../components/body-cell/index.vue.js");require("../components/header-cell/index.vue.js");require("../components/tooltip/index.vue.js");require("../../config-provider/index.js");const q=require("../../ap-grid/utils/col.js"),w=require("../../utils/index.js"),R=require("../../config-provider/hooks/use-global-config.js"),P=require("../../config-provider/hooks/use-namespace.js"),S=require("../components/body-cell/index.vue2.js"),D=require("../components/tooltip/index.vue2.js"),C=require("../components/header-cell/index.vue2.js");function I(t){return o.isNumber(t)&&t>1}function G(t,i){if(i.bodyCellTooltip)return o.isFunction(i.bodyCellTooltip)?i.bodyCellTooltip(t.value,t.data):i.bodyCellTooltip;if(i.renderText)return i.renderText({value:t.value,record:t.data,column:i,text:t.value});const u=i.valueType||"text",p=T.rendererMap[u];if(p){const f=x.getTableRenderProps({...i,valueType:u},{value:t.value,text:t.value,record:t.data,column:t.column,rowIndex:t.node?.rowIndex,pinned:t.node?.rowPinned});return p(f)}return x.objectToString(t.value)}const M=(t,i,u)=>{const p=R.useGlobalConfig("valueTypeMap"),c=d.ref(),{em:f}=P.useNamespace("ag-grid"),y=r=>{const a={cellRenderer:S.default,cellRendererParams:{column:r,extraValueType:d.unref(p),rowKey:i.rowKey}};if(r.customRender)return a;if(r.renderText)return{valueFormatter:s=>r.renderText({value:s.value,record:s.data,column:r,text:s.value})};const l=r.valueType||"text",e=T.rendererMap[l];return e?{valueFormatter:s=>{const n=x.getTableRenderProps({...r,valueType:l},{value:s.value,text:s.value,record:s.data,column:s.column,rowIndex:s.node?.rowIndex,pinned:s.node?.rowPinned});return e(n)}}:a},b=r=>{const a={},l=r.bodyCellTooltip||!r.customRender&&(r.ellipsis===!0||r.ellipsis==="tooltip"||o.isNumber(r.ellipsis)),e=o.isNumber(r.ellipsis)&&r.ellipsis>1,s=o.isNumber(r.ellipsis)?r.ellipsis:1;return a.tooltipValueGetter=l?n=>G(n,r):void 0,a.wrapText=!r.ellipsis||e,a.cellStyle={"--ag-grid-line-clamp":s},a.tooltipComponent=D.default,a.tooltipComponentParams={lineClamp:s,gridWrapperRef:c},a},h=d.computed(()=>{const r=d.unref(t);function a(l){return l.map(e=>{const s={field:q.dataIndexToField(e.dataIndex),colId:w.isDef(e.key)?String(e.key):void 0,sortable:!!e.sorter,comparator:e.sorter===!0?()=>0:e.sorter,headerComponentParams:{column:e},resizable:e.resizable,width:e.width,minWidth:e.minWidth,maxWidth:e.maxWidth,flex:e.width?void 0:1,pinned:e.fixed||null,colSpan:e.colSpan,spanRows:e.spanRows,cellClass:u(n=>{const v=e.cellClass||"",g=o.isFunction(v)?v(n.data,n.node):v;return[`${f("cell",e.align||"left")}`,I(e.ellipsis)?f("cell","multiline"):null,g].flat().filter(Boolean)}),headerStyle:e.headerStyle,headerClass:e.headerClass,autoHeight:!0,...b(e),...y(e)};return e.children?.length?{...s,headerGroupComponent:C.default,headerGroupComponentParams:{column:e},children:a(e.children)}:s})}return a(r)}),_=d.computed(()=>({headerComponent:C.default,resizable:i.columnResizable,suppressMovable:!0,cellDataType:!1}));return{columnDefs:h,defaultColDef:_,gridWrapperRef:c}};exports.useColumnsDef=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../ap-table/utils.js"),T=require("../renderer/index.js"),d=require("lodash-unified"),u=require("vue");require("../components/body-cell/index.vue.js");require("../components/header-cell/index.vue.js");require("../components/tooltip/index.vue.js");require("../../config-provider/index.js");const q=require("../../ap-grid/utils/col.js"),w=require("../../utils/index.js"),R=require("../../config-provider/hooks/use-global-config.js"),P=require("../../config-provider/hooks/use-namespace.js"),S=require("../components/body-cell/index.vue2.js"),D=require("../components/tooltip/index.vue2.js"),y=require("../components/header-cell/index.vue2.js");function I(t){return d.isNumber(t)&&t>1}function M(t,i){if(i.bodyCellTooltip)return d.isFunction(i.bodyCellTooltip)?i.bodyCellTooltip(t.value,t.data):i.bodyCellTooltip;if(i.renderText)return i.renderText({value:t.value,record:t.data,column:i,text:t.value});const p=i.valueType||"text",f=T.rendererMap[p];if(f){const c=C.getTableRenderProps({...i,valueType:p},{value:t.value,text:t.value,record:t.data,column:t.column,rowIndex:t.node?.rowIndex,pinned:t.node?.rowPinned});return f(c)}return C.objectToString(t.value)}const G=(t,i,p)=>{const f=R.useGlobalConfig("valueTypeMap"),v=u.ref(),{em:c}=P.useNamespace("ag-grid"),b=r=>{const a={cellRenderer:S.default,cellRendererParams:{column:r,extraValueType:u.unref(f),rowKey:i.rowKey}};if(r.customRender)return a;if(r.renderText)return{valueFormatter:s=>r.renderText({value:s.value,record:s.data,column:r,text:s.value})};const l=r.valueType||"text",e=T.rendererMap[l];return e?{valueFormatter:s=>{const n=C.getTableRenderProps({...r,valueType:l},{value:s.value,text:s.value,record:s.data,column:s.column,rowIndex:s.node?.rowIndex,pinned:s.node?.rowPinned});return e(n)}}:a},h=r=>{const a=r.valueType||"text",l=T.rendererMap[a],e={},s=r.bodyCellTooltip||!r.customRender&&l&&(r.ellipsis===!0||r.ellipsis==="tooltip"||d.isNumber(r.ellipsis)),n=d.isNumber(r.ellipsis)&&r.ellipsis>1,o=d.isNumber(r.ellipsis)?r.ellipsis:1;return e.tooltipValueGetter=s?x=>M(x,r):void 0,e.wrapText=!r.ellipsis||n,e.cellStyle={"--ag-grid-line-clamp":o},e.tooltipComponent=D.default,e.tooltipComponentParams={lineClamp:o,gridWrapperRef:v},e},_=u.computed(()=>{const r=u.unref(t);function a(l){return l.map(e=>{const s={field:q.dataIndexToField(e.dataIndex),colId:w.isDef(e.key)?String(e.key):void 0,sortable:!!e.sorter,comparator:e.sorter===!0?()=>0:e.sorter,headerComponentParams:{column:e},resizable:e.resizable,width:e.width,minWidth:e.minWidth,maxWidth:e.maxWidth,flex:e.width?void 0:1,pinned:e.fixed||null,colSpan:e.colSpan,spanRows:e.spanRows,cellClass:p(n=>{const o=e.cellClass||"",x=d.isFunction(o)?o(n.data,n.node):o;return[`${c("cell",e.align||"left")}`,I(e.ellipsis)?c("cell","multiline"):null,x].flat().filter(Boolean)}),headerStyle:e.headerStyle,headerClass:e.headerClass,autoHeight:!0,...h(e),...b(e)};return e.children?.length?{...s,headerGroupComponent:y.default,headerGroupComponentParams:{column:e},children:a(e.children)}:s})}return a(r)}),g=u.computed(()=>({headerComponent:y.default,resizable:i.columnResizable,suppressMovable:!0,cellDataType:!1}));return{columnDefs:_,defaultColDef:g,gridWrapperRef:v}};exports.useColumnsDef=G;

package/lib/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 ? {

package/lib/src/ap-modal/utils/createModal.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),y=require("@aplus-frontend/antdv"),u=require("../../config-provider/config-provider.js"),O=require("lodash-unified"),q=require("@aplus-frontend/utils");require("../../config-provider/index.js");const f=require("./util.js"),P=require("../../utils/index.js"),N=require("../../config-provider/hooks/use-namespace.js"),k=s=>{let o,t;const{destroyOnClose:i=!0,wrapperOffset:r=!1}=s,{b:c}=N.useNamespace("ap-modal");function p(){o&&o(!1),setTimeout(()=>{n.render(null,a),a.parentElement?.removeChild(a)},500)}function C(){o&&o(!0)}function d(){o&&o(!1)}function h(e){t&&t(e)}const m=n.defineComponent({data(){return{open:i,props:s}},created(){o=e=>{this.open=e},t=e=>{this.props={...this.props,...e}}},methods:{async handleCancel(){if(this.props?.onCancel){const e=this.props?.content?.component?.exposed??void 0;await this.props?.onCancel(e)}i?p():d()},async handleOk(){try{if(t({confirmLoading:!0}),this.props?.onOk){const e=this.props?.content?.component?.exposed??void 0;await this.props.onOk(e)}t({confirmLoading:!1}),i?p():d()}catch{t({confirmLoading:!1})}}},render(){const e=O.omit(this.props,["onCancel","onOk","open","onUpdate:open","getContainer","icon"]);return n.createVNode(u.ConfigProvider,u.globalConfigCached.value,{default:()=>[n.createVNode(y.Modal,n.mergeProps({class:{[c()]:!0,[c("wrapper")]:r},centered:!0},e,{open:this.open,onCancel:this.handleCancel,onOk:this.handleOk}),{default:()=>[n.createVNode("div",{class:{[c("body-wrapper")]:r},style:r===!1?{}:{maxHeight:`calc(100vh - ${(r===!0?100:q.isNumeric(r)?Number(r):100)*2}px)`}},[this.props?.content])]})]})}}),g=f.getContainerDom(u.globalConfigCached?.value?.getPopupContainer),v=f.getContainerDom(s.getContainer),x=g||v||P.getTopWindow().document.body,a=document.createElement("div");x.appendChild(a);const l=n.h(m),b=f.getModalGlobalAppContext();return l.appContext=s.appContext||b||l.appContext,n.render(l,a),{destroy:p,update:h,open:C,close:d}};exports.createModal=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),b=require("@aplus-frontend/antdv"),u=require("../../config-provider/config-provider.js"),O=require("lodash-unified"),q=require("@aplus-frontend/utils");require("../../config-provider/index.js");const f=require("./util.js"),N=require("../../utils/index.js"),P=require("../../config-provider/hooks/use-namespace.js"),k=o=>{let t,r;const{destroyOnClose:i=!0,wrapperOffset:a=!1}=o,{b:c}=P.useNamespace("ap-modal");function d(){t&&t(!1),setTimeout(()=>{n.render(null,s),s.parentElement?.removeChild(s)},500)}function h(){t&&t(!0)}function p(){t&&t(!1)}function C(e){r&&r(e)}const m=n.defineComponent({data(){return{open:i,props:o}},created(){t=e=>{this.open=e},r=e=>{this.props={...this.props,...e}}},methods:{async handleCancel(){if(this.props?.onCancel){const e=this.props?.content?.component?.exposed??void 0;await this.props?.onCancel(e)}i?d():p()},async handleOk(){try{if(r({confirmLoading:!0}),this.props?.onOk){const e=this.props?.content?.component?.exposed??void 0;await this.props.onOk(e)}r({confirmLoading:!1}),i?d():p()}catch{r({confirmLoading:!1})}},handleFooter(e){return o?.footer!==void 0?typeof o.footer=="function"?o.footer({...e,contentExposed:this.props?.content?.component?.exposed??void 0}):o.footer:e?.originNode}},render(){const e=O.omit(this.props,["onCancel","onOk","open","onUpdate:open","getContainer","icon","footer"]);return n.createVNode(u.ConfigProvider,u.globalConfigCached.value,{default:()=>[n.createVNode(b.Modal,n.mergeProps({class:{[c()]:!0,[c("wrapper")]:a},centered:!0},e,{open:this.open,onCancel:this.handleCancel,onOk:this.handleOk,footer:this?.handleFooter}),{default:()=>[n.createVNode("div",{class:{[c("body-wrapper")]:a},style:a===!1?{}:{maxHeight:`calc(100vh - ${(a===!0?100:q.isNumeric(a)?Number(a):100)*2}px)`}},[this.props?.content])]})]})}}),g=f.getContainerDom(u.globalConfigCached?.value?.getPopupContainer),x=f.getContainerDom(o.getContainer),v=g||x||N.getTopWindow().document.body,s=document.createElement("div");v.appendChild(s);const l=n.h(m),y=f.getModalGlobalAppContext();return l.appContext=o.appContext||y||l.appContext,n.render(l,s),{destroy:d,update:C,open:h,close:p}};exports.createModal=k;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.42.0";
+declare const _default: "6.42.1";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.42.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.42.1";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.42.0",
+  "version": "6.42.1",
   "main": "./lib/index.js",
   "type": "module",
   "files": [