@aplus-frontend/ui 6.38.0 → 6.39.1

package/es/src/ap-form/drawer-form/index.vue.d.ts

@@ -980,6 +980,10 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
             type: BooleanConstructor;
             default: boolean;
         };
+        loading: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>>, "open" | "onUpdate:open">;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     formRef: ({

package/es/src/ap-form/modal-form/index.vue.d.ts

@@ -912,7 +912,15 @@ declare const __VLS_component: DefineComponent<ApFormModalFormProps, {
             type: PropType<string | number | Partial<Record< Breakpoint, string | number>>>;
             default: string | number | Partial<Record< Breakpoint, string | number>>;
         };
-        footer: VueTypeValidableDef<any>;
+        footer: {
+            type: PropType< VueNode | ((params: {
+                originNode: VueNode;
+                extra: {
+                    okBtn: VueNode;
+                    cancelBtn: VueNode;
+                };
+            }) => VueNode)>;
+        };
         okText: VueTypeValidableDef<any>;
         okType: PropType<LegacyButtonType>;
         cancelText: VueTypeValidableDef<any>;

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

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

package/es/src/ap-table/components/setting/modal/index.vue2.mjs

@@ -1,18 +1,18 @@
-import { defineComponent as G, ref as b, unref as e, computed as L, useSlots as M, createVNode as t, cloneVNode as P, createElementBlock as q, openBlock as k, Fragment as H, createBlock as J, createCommentVNode as Q, resolveDynamicComponent as W, withCtx as u, createElementVNode as a, normalizeClass as s, toDisplayString as m, createTextVNode as v, isRef as X } from "vue";
-import { Button as y, Modal as Y, RadioGroup as Z, RadioButton as T, Divider as x } from "@aplus-frontend/antdv";
-import { getSingleVNode as ee } from "../../../../utils/slot.mjs";
-import { useInjectApTable as te } from "../../../context.mjs";
+import { defineComponent as L, ref as v, unref as e, computed as M, useSlots as P, createVNode as t, cloneVNode as q, createElementBlock as H, openBlock as h, Fragment as J, createBlock as Q, createCommentVNode as W, resolveDynamicComponent as X, withCtx as u, withDirectives as Y, createElementVNode as s, normalizeClass as i, toDisplayString as c, createTextVNode as S, isRef as Z, vShow as ee } from "vue";
+import { Button as y, Modal as te, RadioGroup as le, RadioButton as T, Divider as x } from "@aplus-frontend/antdv";
+import { getSingleVNode as ne } from "../../../../utils/slot.mjs";
+import { useInjectApTable as ae } from "../../../context.mjs";
 import "../tree-select/index.vue.mjs";
-import { useTableColumnState as le } from "../../../hooks/use-table-column-state.mjs";
+import { useTableColumnState as oe } from "../../../hooks/use-table-column-state.mjs";
 import "../../../../config-provider/index.mjs";
 import "../sorter/index.vue.mjs";
-import ne, { customCloneColumnStates as B } from "../utils.mjs";
-import { SettingOutlined as oe } from "@ant-design/icons-vue";
-import { useLocale as ae } from "../../../../config-provider/hooks/use-locale.mjs";
+import se, { customCloneColumnStates as B } from "../utils.mjs";
+import { SettingOutlined as ie } from "@ant-design/icons-vue";
+import { useLocale as ue } from "../../../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as N } from "../../../../config-provider/hooks/use-namespace.mjs";
-import se from "../tree-select/index.vue2.mjs";
-import ie from "../sorter/index.vue2.mjs";
-const Te = /* @__PURE__ */ G({
+import re from "../tree-select/index.vue2.mjs";
+import pe from "../sorter/index.vue2.mjs";
+const Be = /* @__PURE__ */ L({
   name: "ApTableSetting",
   __name: "index",
   props: {
@@ -20,85 +20,86 @@ const Te = /* @__PURE__ */ G({
       default: () => ({})
     }
   },
-  setup(h) {
-    const c = h, {
-      columnsBackup: _,
-      size: z,
-      updateSize: A,
-      updateColumns: V
-    } = te(), d = b(e(z)), R = L(() => c.config.persistenceKey), {
-      columnState: l,
-      setColumnState: w,
-      isAllSelected: D,
-      toggleSelectAll: O,
-      columnStateBackup: U,
-      setColumnStateBackup: E,
-      cacheColumnStateIfNeeded: I
-    } = le(c.config, R, []), {
-      t: n
-    } = ae(), {
+  setup(_) {
+    const m = _, {
+      columnsBackup: z,
+      size: A,
+      updateSize: V,
+      updateColumns: w
+    } = ae(), d = v(e(A)), R = M(() => m.config.persistenceKey), {
+      columnState: n,
+      setColumnState: D,
+      isAllSelected: O,
+      toggleSelectAll: U,
+      columnStateBackup: E,
+      setColumnStateBackup: I,
+      cacheColumnStateIfNeeded: K
+    } = oe(m.config, R, []), {
+      t: a
+    } = ue(), {
       b: f,
       be: g
     } = N("ap-column-setting"), {
-      b: K
-    } = N("ap-table"), r = b(!1), $ = M(), C = ee($.trigger) || t(y, {
-      icon: t(oe, null, null),
-      class: K("setting-trigger-button")
-    }, null), S = C ? P(C, {
+      b: $
+    } = N("ap-table"), r = v(!1), C = v(!1), j = P(), b = ne(j.trigger) || t(y, {
+      icon: t(ie, null, null),
+      class: $("setting-trigger-button")
+    }, null), k = b ? q(b, {
       onClick: () => {
         r.value = !0;
       }
     }) : null;
-    function j() {
-      w(B(e(U)));
-    }
     function F() {
-      V?.(ne(e(_), e(l))), A?.(e(d)), r.value = !1;
-      const p = B(l.value);
-      E(p), I(p), c.config?.onChange?.(p);
+      D(B(e(E)));
+    }
+    function G() {
+      w?.(se(e(z), e(n))), V?.(e(d)), r.value = !1;
+      const p = B(n.value);
+      I(p), K(p), m.config?.onChange?.(p);
     }
-    return (p, o) => (k(), q(H, null, [e(S) ? (k(), J(W(e(S)), {
+    return (p, o) => (h(), H(J, null, [e(k) ? (h(), Q(X(e(k)), {
       key: 0
-    })) : Q("", !0), t(e(Y), {
+    })) : W("", !0), t(e(te), {
       open: r.value,
-      "onUpdate:open": o[2] || (o[2] = (i) => r.value = i),
-      title: e(n)("ap.apTable.setting.title"),
+      "onUpdate:open": o[2] || (o[2] = (l) => r.value = l),
+      title: e(a)("ap.apTable.setting.title"),
       width: 900,
       centered: !0,
       "body-style": {
         padding: "0px !important",
         height: "450px"
       },
-      onOk: F
+      "after-open-change": (l) => C.value = l,
+      onOk: G
     }, {
-      default: u(() => [a("div", {
-        class: s(e(f)("wrapper"))
-      }, [a("div", {
-        class: s(e(f)("left"))
-      }, [a("div", {
-        class: s(e(g)("left", "header"))
-      }, [a("div", null, [a("span", {
-        class: s(e(g)("left", "header-tips"))
-      }, m(e(n)("ap.apTable.setting.selectAllTip")), 3), t(e(y), {
+      default: u(() => [Y(s("div", {
+        class: i(e(f)("wrapper"))
+      }, [s("div", {
+        class: i(e(f)("left"))
+      }, [s("div", {
+        class: i(e(g)("left", "header"))
+      }, [s("div", null, [s("span", {
+        class: i(e(g)("left", "header-tips"))
+      }, c(e(a)("ap.apTable.setting.selectAllTip")), 3), t(e(y), {
         type: "link",
         size: "small",
-        onClick: e(O)
+        onClick: e(U)
       }, {
-        default: u(() => [v(m(e(D) ? e(n)("ap.apTable.setting.unSelectAll") : e(n)("ap.apTable.setting.selectAll")), 1)]),
+        default: u(() => [S(c(e(O) ? e(a)("ap.apTable.setting.unSelectAll") : e(a)("ap.apTable.setting.selectAll")), 1)]),
         _: 1
-      }, 8, ["onClick"])]), t(e(Z), {
+      }, 8, ["onClick"])]), t(e(le), {
         value: d.value,
-        "onUpdate:value": o[0] || (o[0] = (i) => d.value = i)
+        "onUpdate:value": o[0] || (o[0] = (l) => d.value = l)
       }, {
         default: u(() => [t(e(T), {
           value: "small"
         }, {
-          default: u(() => [v(m(e(n)("ap.apTable.setting.sizeSmall")), 1)]),
+          default: u(() => [S(c(e(a)("ap.apTable.setting.sizeSmall")), 1)]),
           _: 1
         }), t(e(T), {
           value: "middle"
         }, {
-          default: u(() => [v(m(e(n)("ap.apTable.setting.sizeNormal")), 1)]),
+          default: u(() => [S(c(e(a)("ap.apTable.setting.sizeNormal")), 1)]),
           _: 1
         })]),
         _: 1
@@ -107,26 +108,26 @@ const Te = /* @__PURE__ */ G({
         style: {
           margin: "0px"
         }
-      }), t(se, {
-        class: s(e(g)("left", "content")),
-        value: e(l)
+      }), t(re, {
+        class: i(e(g)("left", "content")),
+        value: e(n)
       }, null, 8, ["class", "value"])], 2), t(e(x), {
         type: "vertical",
         style: {
           height: "100%",
           margin: "0px"
         }
-      }), a("div", {
-        class: s(e(f)("right"))
-      }, [t(ie, {
-        value: e(l),
-        "onUpdate:value": o[1] || (o[1] = (i) => X(l) ? l.value = i : null),
-        onReset: j
-      }, null, 8, ["value"])], 2)], 2)]),
+      }), s("div", {
+        class: i(e(f)("right"))
+      }, [t(pe, {
+        value: e(n),
+        "onUpdate:value": o[1] || (o[1] = (l) => Z(n) ? n.value = l : null),
+        onReset: F
+      }, null, 8, ["value"])], 2)], 2), [[ee, C.value]])]),
       _: 1
-    }, 8, ["open", "title"])], 64));
+    }, 8, ["open", "title", "after-open-change"])], 64));
   }
 });
 export {
-  Te as default
+  Be as default
 };

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

@@ -352,6 +352,12 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      * 查询表单提交
      */
     submit: () => void;
+    /**
+     * 表格查询提交（重制页码但查询参数不会重置）
+     * @param resetCurrent 是否重置当前页码，默认为`false`
+     * @returns
+     */
+    submitWith: (resetCurrent?: boolean) => void;
     /**
      * 查询表单重置
      */

package/es/src/business/ag-grid-modal/constants.d.ts

@@ -0,0 +1,4 @@
+/** 非字符串增加key值字段 */
+export declare const ROW_KEY = "__ag-grid-modal-row-key";
+export declare const SMALL_HEIGHT = "480px";
+export declare const LARGER_HEIGHT = "calc(100vh - 200px)";

package/es/src/business/ag-grid-modal/constants.mjs

@@ -0,0 +1,6 @@
+const o = "__ag-grid-modal-row-key", c = "480px", _ = "calc(100vh - 200px)";
+export {
+  _ as LARGER_HEIGHT,
+  o as ROW_KEY,
+  c as SMALL_HEIGHT
+};

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-instance.d.ts

@@ -0,0 +1,33 @@
+import { ComputedRef } from 'vue';
+import { AgGridExpose } from '../../../ag-grid';
+import { RefreshType } from '../interface';
+interface Options {
+    onMounted?: () => void;
+    onSelectedRows?: (rows?: any[]) => void;
+}
+export interface GridApi {
+    /** 设置 AgGrid 实例 */
+    setInstance: (node: any) => void;
+    /** 刷新表格 */
+    refresh: (type?: RefreshType) => void;
+    /** 获取 AgGrid 实例 */
+    getInstance: () => AgGridExpose | undefined;
+    /** 设置 AgGrid 选中行 */
+    setSelectedRowKeys: (keys: (string | number)[]) => void;
+    /** 获取 AgGrid 选中行 */
+    getSelectedRows: () => any[] | undefined;
+    /** 清空所有选中行 */
+    clearAllSelected: () => void;
+    /** 清除某一行数据 */
+    removeSelected: (record: any) => void;
+    /** 设置表格数据length */
+    setDataSourceLength: (len: number) => void;
+}
+interface GridApiProvider extends GridApi {
+    selectedRows?: ComputedRef<any[]>;
+    dataSourceLength?: ComputedRef<number>;
+}
+export declare function useAgGridInstance(options?: Options): [GridApi, any];
+/** 获取上下文中grid的api */
+export declare function useAgGridModalInject(): GridApiProvider | undefined;
+export {};

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-instance.mjs

@@ -0,0 +1,50 @@
+import { ref as o, watch as r, defineComponent as A, provide as h, toRef as a, inject as I } from "vue";
+import { cloneDeep as y } from "lodash-unified";
+const u = Symbol("ag-grid-provider-key");
+function L(n) {
+  const t = o(), c = o(), l = o(0), d = (e) => {
+    t.value = e;
+  }, i = (e) => {
+    l.value = e;
+  }, v = () => t.value, S = (e = "reset") => {
+    t.value && e in t.value && t.value[e]();
+  }, w = (e) => {
+    t.value?.rowSelection.setSelectedRowKeys(e);
+  }, g = () => y(t.value?.rowSelection.selectedRows.value), f = () => t.value?.rowSelection.clearAll(), R = (e) => t.value?.rowSelection.unSelectRows([e]);
+  r(t, (e) => {
+    e && n?.onMounted?.();
+  }), r(
+    () => t.value?.rowSelection.selectedRows.value,
+    (e) => {
+      c.value = e, n?.onSelectedRows?.(e);
+    }
+  );
+  const s = {
+    setInstance: d,
+    refresh: S,
+    getInstance: v,
+    setSelectedRowKeys: w,
+    getSelectedRows: g,
+    clearAllSelected: f,
+    removeSelected: R,
+    setDataSourceLength: i
+  }, p = A({
+    setup(e, { slots: m }) {
+      return h(u, {
+        ...s,
+        selectedRows: a(() => c.value),
+        dataSourceLength: a(
+          () => l.value
+        )
+      }), m.default;
+    }
+  });
+  return [s, p];
+}
+function _() {
+  return I(u);
+}
+export {
+  L as useAgGridInstance,
+  _ as useAgGridModalInject
+};

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-modal.d.ts

@@ -0,0 +1,3 @@
+import { AgGridPreviewModalProps, PreviewModalReturnType } from '../interface';
+/** ag-grid弹框 */
+export declare function useAgGridModal<T = any>(props: AgGridPreviewModalProps<T>): PreviewModalReturnType<T>;

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-modal.mjs

@@ -0,0 +1,95 @@
+import { defineComponent as v, ref as w, createVNode as n } from "vue";
+import { ApModal as P } from "../../../ap-modal/index.mjs";
+import "../../../ag-grid/index.mjs";
+import { genRequest as y } from "../utils.mjs";
+import { useAgGridInstance as I } from "./use-ag-grid-instance.mjs";
+import { isFunction as A, isEmpty as f, omitBy as M, isUndefined as _, omit as q } from "lodash-unified";
+import "../wrapper/index.vue.mjs";
+import G from "../wrapper/index.vue2.mjs";
+import H from "../../../ag-grid/index.vue.mjs";
+function L(o) {
+  let a = null, s = null;
+  const [r, c] = I(), l = y(o.api, o.getRowKey, r.setDataSourceLength), u = (t) => {
+    const {
+      title: e,
+      width: i,
+      modalProps: C,
+      ...d
+    } = A(t) ? t(o) : t;
+    f(d) || s?.(d);
+    const m = M({
+      title: e,
+      width: i,
+      modalProps: C
+    }, _);
+    f(m) || a?.update(m);
+  }, g = /* @__PURE__ */ v({
+    name: "AgGridModalPreviewContent",
+    props: {
+      modalConfig: {
+        type: Object,
+        required: !0
+      }
+    },
+    setup(t) {
+      const e = w(t.modalConfig);
+      return s = (i) => {
+        e.value = {
+          ...e.value,
+          ...i
+        };
+      }, () => n(c, null, {
+        default: () => [n(G, {
+          rowHeight: e.value.rowHeight
+        }, {
+          default: () => [e.value.renderHeader?.(q(r, "setInstance"), {
+            updateProps: u
+          }), n(H, {
+            ref: r.setInstance,
+            searchForm: {
+              sortable: !1,
+              resize: {
+                target: "form"
+              }
+            },
+            rowKey: e.value.getRowKey,
+            request: l.request,
+            style: {
+              padding: "0px"
+            },
+            rowHeight: e.value.rowHeight,
+            columns: e.value.columns
+          }, e.value.gridSlots)]
+        })]
+      });
+    }
+  });
+  function p() {
+    a = P.createModal({
+      title: o.title,
+      width: o.width,
+      destroyOnClose: !0,
+      maskClosable: !1,
+      footer: null,
+      afterOpenChange(t) {
+        t === !1 && (r.setInstance(void 0), r.setDataSourceLength(0), a = null);
+      },
+      content: n(g, {
+        modalConfig: o
+      }, null),
+      ...o.modalProps || {}
+    });
+  }
+  function h(t) {
+    l.setExtraParams(t?.extraParams), p();
+  }
+  return {
+    open: h,
+    refresh: r.refresh,
+    getAgGridInstance: r.getInstance,
+    updateProps: u
+  };
+}
+export {
+  L as useAgGridModal
+};

package/es/src/business/ag-grid-modal/hooks/use-ag-grid-select-modal.d.ts

@@ -0,0 +1,2 @@
+import { AgGridSelectModalProps, SelectModalReturnType } from '../interface';
+export declare function useAgGridSelectModal<T = any>(props: AgGridSelectModalProps<T>): SelectModalReturnType<T>;