@aplus-frontend/ui 7.4.0 → 7.4.2

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

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

package/es/src/ap-pro-card/style/title.mjs

@@ -1,8 +1,8 @@
-import { genComponentStyleHook as o } from "../../utils/cssinjs/index.mjs";
-const n = (t) => {
-  const { componentCls: e } = t;
+import { genComponentStyleHook as e } from "../../utils/cssinjs/index.mjs";
+const r = (t) => {
+  const { componentCls: o } = t;
   return {
-    [e]: {
+    [o]: {
       "&-default": {
         position: "relative",
         fontWeight: "bold",
@@ -19,7 +19,7 @@ const n = (t) => {
             transform: "translateY(-50%)",
             width: "3px",
             height: "14px",
-            backgroundColor: "#0070ff",
+            backgroundColor: t.colorPrimary,
             borderRadius: "0px 4px 4px 0px"
           }
         },
@@ -34,17 +34,17 @@ const n = (t) => {
             width: "8px",
             height: "8px",
             borderRadius: "50%",
-            border: "2px solid #34b77c",
+            border: `2px solid ${t.colorPrimary}`,
             background: "#fff"
           }
         }
       }
     }
   };
-}, p = o("ProCard.Title", (t) => [
-  n(t)
+}, a = e("ProCard.Title", (t) => [
+  r(t)
 ]);
 export {
-  p as default,
-  n as genProCardTitleStyle
+  a as default,
+  r as genProCardTitleStyle
 };

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

@@ -1,29 +1,29 @@
-import { defineComponent as P, ref as v, createVNode as n, mergeProps as w } from "vue";
+import { defineComponent as C, ref as P, createVNode as n, mergeProps as w } from "vue";
 import { ApModal as y } from "../../../ap-modal/index.mjs";
 import "../../../ag-grid/index.mjs";
 import { genRequest as I } from "../utils.mjs";
 import { useAgGridInstance as A } from "./use-ag-grid-instance.mjs";
-import { isFunction as M, isEmpty as f, omitBy as _, isUndefined as q, omit as G } from "lodash-unified";
+import { isFunction as H, isEmpty as f, omitBy as M, isUndefined as _, omit as q } from "lodash-unified";
 import "../wrapper/index.vue.mjs";
-import H from "../wrapper/index.vue2.mjs";
+import G from "../wrapper/index.vue2.mjs";
 import x from "../../../ag-grid/index.vue.mjs";
 function j(r) {
-  let a = null, s = null;
-  const [o, c] = A(), l = I(r.api, r.getRowKey, o.setDataSourceLength), u = (t) => {
+  let a = null, l = null;
+  const [o, c] = A(), s = I(r.api, r.getRowKey, o.setDataSourceLength), u = (t) => {
     const {
       title: e,
       width: i,
-      modalProps: C,
+      modalProps: v,
       ...d
-    } = M(t) ? t(r) : t;
-    f(d) || s?.(d);
-    const m = _({
+    } = H(t) ? t(r) : t;
+    f(d) || l?.(d);
+    const m = M({
       title: e,
       width: i,
-      modalProps: C
-    }, q);
+      modalProps: v
+    }, _);
     f(m) || a?.update(m);
-  }, g = /* @__PURE__ */ P({
+  }, g = /* @__PURE__ */ C({
     name: "AgGridModalPreviewContent",
     props: {
       modalConfig: {
@@ -32,17 +32,18 @@ function j(r) {
       }
     },
     setup(t) {
-      const e = v(t.modalConfig);
-      return s = (i) => {
+      const e = P(t.modalConfig);
+      return l = (i) => {
         e.value = {
           ...e.value,
           ...i
         };
       }, () => n(c, null, {
-        default: () => [n(H, {
+        default: () => [n(G, {
+          height: e.value.height,
           rowHeight: e.value.rowHeight
         }, {
-          default: () => [e.value.renderHeader?.(G(o, "setInstance"), {
+          default: () => [e.value.renderHeader?.(q(o, "setInstance"), {
             updateProps: u
           }), n(x, w({
             ref: o.setInstance,
@@ -53,18 +54,19 @@ function j(r) {
               }
             },
             rowKey: e.value.getRowKey,
-            request: l.request,
+            request: s.request,
             style: {
               padding: "0px"
             },
             rowHeight: e.value.rowHeight,
-            columns: e.value.columns
+            columns: e.value.columns,
+            autoHeight: !!e.value.height
           }, r.gridProps), e.value.gridSlots)]
         })]
       });
     }
   });
-  function p() {
+  function h() {
     a = y.createModal({
       title: r.title,
       width: r.width,
@@ -80,11 +82,11 @@ function j(r) {
       ...r.modalProps || {}
     });
   }
-  function h(t) {
-    l.setExtraParams(t?.extraParams), p();
+  function p(t) {
+    s.setExtraParams(t?.extraParams), h();
   }
   return {
-    open: h,
+    open: p,
     refresh: o.refresh,
     getAgGridInstance: o.getInstance,
     updateProps: u

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

@@ -1,7 +1,7 @@
-import { defineComponent as _, ref as L, createVNode as i, mergeProps as j, onUnmounted as q } from "vue";
-import { ApModal as G } from "../../../ap-modal/index.mjs";
+import { defineComponent as _, ref as H, createVNode as i, mergeProps as L, onUnmounted as j } from "vue";
+import { ApModal as q } from "../../../ap-modal/index.mjs";
 import "../../../ag-grid/index.mjs";
-import { AsyncCallback as H, genRequest as T, delRowKeyField as D, addRowKeyField as F, getModalLayoutConfig as E } from "../utils.mjs";
+import { AsyncCallback as G, genRequest as T, delRowKeyField as D, addRowKeyField as F, getModalLayoutConfig as E } from "../utils.mjs";
 import { useAgGridInstance as U } from "./use-ag-grid-instance.mjs";
 import { isFunction as u, cloneDeep as W, isEmpty as b, omitBy as $, isUndefined as z, omit as p } from "lodash-unified";
 import { ROW_KEY as B } from "../constants.mjs";
@@ -16,7 +16,7 @@ import Q from "../modal-layout/index.vue2.mjs";
 import X from "../../../ag-grid/index.vue.mjs";
 function we(t) {
   let c, f = null, g = null;
-  const d = new H(), [K, S] = N(), {
+  const d = new G(), [K, S] = N(), {
     t: k
   } = Y(), [s, x] = U({
     onSelectedRows(e) {
@@ -39,13 +39,13 @@ function we(t) {
   }, m = u(t.getRowKey) ? t.getRowKey : (e) => e[t.getRowKey], P = () => {
     const e = t.mergeRule || "old", o = s.getSelectedRows() || [];
     return {
-      keys: O(o),
+      keys: A(o),
       rows: o.map((a) => {
         const r = m(a);
         return e === "old" && c?.[r] ? c[r] : D(a);
       })
     };
-  }, C = async () => {
+  }, h = async () => {
     const e = P(), o = t.maxCount || 1 / 0;
     return e.keys.length > o ? (V.warning(k("ap.apTableModal.messageMaxCount", {
       maxCount: o
@@ -65,7 +65,7 @@ function we(t) {
       }
     },
     setup(e) {
-      const o = L(e.modalConfig);
+      const o = H(e.modalConfig);
       return g = (l) => {
         o.value = {
           ...o.value,
@@ -75,12 +75,13 @@ function we(t) {
         const l = e.selectedRows?.map((r) => F(r, o.value.getRowKey)), n = o.value, a = E(n.modalLayout);
         return i(x, null, {
           default: () => [i(J, {
+            height: n.height,
             rowHeight: n.rowHeight
           }, {
             default: () => [t.renderHeader?.(p(s, "setInstance"), {
               updateProps: y
             }), i(Q, a.props, {
-              default: () => [i(X, j({
+              default: () => [i(X, L({
                 ref: s.setInstance,
                 searchForm: {
                   sortable: !1,
@@ -105,7 +106,8 @@ function we(t) {
                     return u(n.disabledCheckbox) ? n.disabledCheckbox(r, p(s, "setInstance")) : n.disabledCheckbox ?? !1;
                   },
                   ...t.rowSelection
-                }
+                },
+                autoHeight: !!o.value.height
               }, t.gridProps), n.gridSlots)],
               ...a.slots
             })]
@@ -114,15 +116,15 @@ function we(t) {
       };
     }
   });
-  function R(e) {
+  function C(e) {
     return i(I, {
       modalConfig: t,
       selectedRows: e
     }, null);
   }
-  function A() {
-    const e = Object.values(c || {}), o = R(e);
-    f = G.createModal({
+  function v() {
+    const e = Object.values(c || {}), o = C(e);
+    f = q.createModal({
       title: i(K, {
         title: t.title,
         maxCount: t.maxCount || 1 / 0
@@ -130,7 +132,7 @@ function we(t) {
       width: t.width,
       destroyOnClose: !0,
       maskClosable: !1,
-      onOk: C,
+      onOk: h,
       onCancel: M,
       afterOpenChange(l) {
         l === !1 && (s.setInstance(void 0), s.setDataSourceLength(0));
@@ -139,28 +141,28 @@ function we(t) {
       ...t.modalProps || {}
     });
   }
-  function O(e) {
+  function A(e) {
     return e?.map(m) || [];
   }
-  function h(e, o, l = !1) {
+  function R(e, o, l = !1) {
     if (c = e?.reduce((n, a) => {
       const r = m(a);
       return n[r] = a, n;
-    }, {}), w.setExtraParams(o?.extraParams), A(), l)
+    }, {}), w.setExtraParams(o?.extraParams), v(), l)
       return d.buildPromise();
   }
-  function v(e, o) {
-    return h(e, o, !0);
+  function O(e, o) {
+    return R(e, o, !0);
   }
-  return q(() => {
+  return j(() => {
     d.reject("component is Unmounted!");
   }), {
-    open: h,
-    asyncOpen: v,
+    open: R,
+    asyncOpen: O,
     refresh: s.refresh,
     getAgGridInstance: s.getInstance,
-    genContent: R,
-    validate: C,
+    genContent: C,
+    validate: h,
     updateProps: y
   };
 }

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

@@ -1,4 +1,4 @@
-import { StyleValue, VNodeChild } from 'vue';
+import { CSSProperties, StyleValue, VNodeChild } from 'vue';
 import { AgGridColumnType, AgGridExpose, AgGridProps, AgGridRowSelection, AgGridSlots } from '../../ag-grid';
 import { CreateModalFuncProps } from '../../ap-modal';
 import { Recordable } from '../../type';
@@ -19,6 +19,7 @@ export interface AgGridModalBasicProps<TableRowType = any> {
         updateProps: UpdatePropsFn<TableRowType>;
     }) => VNodeChild;
     rowHeight?: number;
+    height?: CSSProperties['height'];
 }
 /** 刷新方式 */
 export type RefreshType = 'reset' | 'submit' | 'submitWith';

package/es/src/business/ag-grid-modal/wrapper/index.vue.d.ts

@@ -1,6 +1,7 @@
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+import { CSSProperties, DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 type __VLS_Props = {
     rowHeight?: number;
+    height?: CSSProperties['height'];
 };
 declare function __VLS_template(): {
     attrs: Partial<{}>;
@@ -14,6 +15,7 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+    height: import("csstype").Property.Height<string | number>;
     rowHeight: number;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     wrapperContainer: HTMLDivElement;

package/es/src/business/ag-grid-modal/wrapper/index.vue2.mjs

@@ -1,42 +1,43 @@
-import { defineComponent as p, useTemplateRef as f, computed as g, ref as h, watch as d, onMounted as m, createElementBlock as H, openBlock as v, normalizeStyle as _, unref as y, renderSlot as w } from "vue";
-import { SMALL_HEIGHT as l, LARGER_HEIGHT as S } from "../constants.mjs";
+import { defineComponent as h, useTemplateRef as g, computed as p, ref as f, watch as d, onMounted as m, createElementBlock as H, openBlock as v, normalizeStyle as y, unref as w, renderSlot as S } from "vue";
+import { SMALL_HEIGHT as l, LARGER_HEIGHT as _ } from "../constants.mjs";
 import { useAgGridModalInject as L } from "../hooks/use-ag-grid-instance.mjs";
-const G = /* @__PURE__ */ p({
+const k = /* @__PURE__ */ h({
   __name: "index",
   props: {
-    rowHeight: { default: 32 }
+    rowHeight: { default: 32 },
+    height: { default: void 0 }
   },
   setup(c) {
-    const s = c, t = f("wrapperContainer"), u = L(), r = g(
-      () => u?.dataSourceLength?.value || 0
-    ), a = h(l), i = () => {
+    const u = c, t = g("wrapperContainer"), s = L(), r = p(
+      () => s?.dataSourceLength?.value || 0
+    ), i = f(l), a = () => {
       const e = t.value?.clientHeight, o = t.value?.querySelector(
         ".ag-body.ag-layout-normal"
       )?.clientHeight;
       let n = 0;
-      !e || !o ? n = 0 : n = e - o, r.value * s.rowHeight > 480 - n && (a.value = S);
+      !e || !o ? n = 0 : n = e - o, r.value * u.rowHeight > 480 - n && (i.value = _);
     };
     return d(
       () => r.value,
       () => {
-        i();
+        a();
       }
     ), m(() => {
-      i();
+      a();
     }), (e, o) => (v(), H("div", {
       ref_key: "wrapperContainer",
       ref: t,
-      style: _({
-        minHeight: y(l),
-        height: a.value,
+      style: y({
+        minHeight: e.height ? "unset" : w(l),
+        height: e.height ?? i.value,
         display: "flex",
         flexDirection: "column"
       })
     }, [
-      w(e.$slots, "default")
+      S(e.$slots, "default")
     ], 4));
   }
 });
 export {
-  G as default
+  k as default
 };

package/es/src/business/ap-value-select-card/style/index.mjs

@@ -18,7 +18,7 @@ const l = (o) => {
           boxSizing: "border-box",
           padding: "8px 16px",
           color: o.textColor2,
-          border: `1px solid ${o.colorBg1}`,
+          border: `1px solid ${o.borderColorBase}`,
           borderRadius: o.borderRadius,
           cursor: "pointer",
           "&-close": {
@@ -69,7 +69,7 @@ const l = (o) => {
               color: o.textColor3,
               background: "#f9f9fa",
               cursor: "not-allowed",
-              border: `1px solid ${o.colorBg1}`
+              border: `1px solid ${o.borderColorBase}`
             },
             "&.select": {
               backgroundColor: o.colorBgControl,

package/es/src/index.d.ts

@@ -10,6 +10,7 @@ export * from './ap-button';
 export * from './ap-drawer';
 export * from './ap-pro-card';
 export * from './loading-bar';
+export * from './render';
 export * from './business';
 export * from './ap-table';
 export * from './editable-table';