@aplus-frontend/ui 6.39.0 → 6.39.1

package/es/index.mjs

@@ -116,36 +116,37 @@ import { ApDraggableGrid as Ut } from "./src/business/ap-draggable-grid/index.mj
 import { ApValueSelectCard as Vt } from "./src/business/ap-value-select-card/index.mjs";
 import { useAgGridModal as zt } from "./src/business/ag-grid-modal/hooks/use-ag-grid-modal.mjs";
 import { useAgGridSelectModal as jt } from "./src/business/ag-grid-modal/hooks/use-ag-grid-select-modal.mjs";
-import { useTablePaging as Wt } from "./src/ap-table/hooks/use-table-paging.mjs";
-import { ApTable as Jt } from "./src/ap-table/index.mjs";
-import { default as Xt } from "./src/editable-table/index.vue.mjs";
-import { default as Zt } from "./src/editable-table/form-item.vue.mjs";
-import { default as op } from "./src/ap-descriptions/ap-descriptions.vue.mjs";
-import { ensureRangeValue as tp } from "./src/scroll-bar/utils/index.mjs";
-import { default as ap } from "./src/scroll-bar/index.vue.mjs";
-import { default as mp } from "./src/scroll-bar/internal.vue.mjs";
-import { default as xp } from "./src/scroll-view/index.vue.mjs";
-import { default as sp } from "./src/portal/index.vue.mjs";
-import { default as Ap } from "./src/full-screen/index.vue.mjs";
-import { default as np } from "./src/resize-observer/index.vue.mjs";
-import { ROW_SELECTION_FIELD as Fp } from "./src/ap-grid/constants.mjs";
-import { toTreeArray as gp } from "./src/ap-grid/utils/to-tree-array.mjs";
-import { default as bp } from "./src/ap-grid/index.vue.mjs";
-import { default as Cp } from "./src/ap-grid/editable/index.vue.mjs";
-import { default as Dp } from "./src/ap-grid/editable/form-item.vue.mjs";
-import { default as Pp } from "./src/text/index.vue.mjs";
-import { default as Rp } from "./src/text/group.vue.mjs";
-import { default as Mp } from "./src/mask/index.vue.mjs";
-import { Splitter as vp } from "./src/splitter/index.mjs";
-import { default as wp } from "./src/ag-grid/index.vue.mjs";
-import { default as Kp } from "./src/ag-grid/editable/index.vue.mjs";
-import { default as Up } from "./src/ag-grid/editable/form-item.vue.mjs";
-import { useMessage as Vp } from "./src/hooks/useMessage.mjs";
-import { useControllableValue as zp } from "./src/hooks/useControllableValue.mjs";
-import { useManualRef as jp } from "./src/hooks/useManualRef.mjs";
-import { useThrottleRef as Wp } from "./src/hooks/useThrottleRef.mjs";
-import { useFullScreen as Jp } from "./src/hooks/useFullScreen.mjs";
-import { useResize as Xp } from "./src/hooks/useResize.mjs";
+import { ApSelectedItems as Wt } from "./src/business/ag-grid-modal/selected-items/index.mjs";
+import { useTablePaging as Jt } from "./src/ap-table/hooks/use-table-paging.mjs";
+import { ApTable as Xt } from "./src/ap-table/index.mjs";
+import { default as Zt } from "./src/editable-table/index.vue.mjs";
+import { default as op } from "./src/editable-table/form-item.vue.mjs";
+import { default as tp } from "./src/ap-descriptions/ap-descriptions.vue.mjs";
+import { ensureRangeValue as ap } from "./src/scroll-bar/utils/index.mjs";
+import { default as mp } from "./src/scroll-bar/index.vue.mjs";
+import { default as xp } from "./src/scroll-bar/internal.vue.mjs";
+import { default as sp } from "./src/scroll-view/index.vue.mjs";
+import { default as Ap } from "./src/portal/index.vue.mjs";
+import { default as np } from "./src/full-screen/index.vue.mjs";
+import { default as Fp } from "./src/resize-observer/index.vue.mjs";
+import { ROW_SELECTION_FIELD as gp } from "./src/ap-grid/constants.mjs";
+import { toTreeArray as bp } from "./src/ap-grid/utils/to-tree-array.mjs";
+import { default as Cp } from "./src/ap-grid/index.vue.mjs";
+import { default as Dp } from "./src/ap-grid/editable/index.vue.mjs";
+import { default as Pp } from "./src/ap-grid/editable/form-item.vue.mjs";
+import { default as Rp } from "./src/text/index.vue.mjs";
+import { default as Mp } from "./src/text/group.vue.mjs";
+import { default as vp } from "./src/mask/index.vue.mjs";
+import { Splitter as wp } from "./src/splitter/index.mjs";
+import { default as Kp } from "./src/ag-grid/index.vue.mjs";
+import { default as Up } from "./src/ag-grid/editable/index.vue.mjs";
+import { default as Vp } from "./src/ag-grid/editable/form-item.vue.mjs";
+import { useMessage as zp } from "./src/hooks/useMessage.mjs";
+import { useControllableValue as jp } from "./src/hooks/useControllableValue.mjs";
+import { useManualRef as Wp } from "./src/hooks/useManualRef.mjs";
+import { useThrottleRef as Jp } from "./src/hooks/useThrottleRef.mjs";
+import { useFullScreen as Xp } from "./src/hooks/useFullScreen.mjs";
+import { useResize as Zp } from "./src/hooks/useResize.mjs";
 const a = console.log;
 a(`APlus-UI version ${p}`);
 const l = {
@@ -158,7 +159,7 @@ const l = {
 };
 export {
   K as APConfigProvider,
-  wp as AgGrid,
+  Kp as AgGrid,
   $o as ApActionButton,
   To as ApActionGroup,
   uo as ApActionItem,
@@ -174,7 +175,7 @@ export {
   nr as ApCard,
   Ho as ApConfirmButton,
   St as ApCopy,
-  op as ApDescriptions,
+  tp as ApDescriptions,
   Lo as ApDownLoadNeedNameKeyDefault,
   No as ApDownload,
   Ut as ApDraggableGrid,
@@ -222,7 +223,7 @@ export {
   Re as ApFormProvider,
   ne as ApFormSearchForm,
   be as ApFormSet,
-  bp as ApGrid,
+  Cp as ApGrid,
   Pr as ApImage,
   Rr as ApInputRadio,
   Mt as ApKeepAlive,
@@ -237,17 +238,18 @@ export {
   Tt as ApProductInfo,
   ht as ApRadioGroup,
   kr as ApSelectLayout,
+  Wt as ApSelectedItems,
   It as ApSizeInput,
   Xo as ApStatisticCard,
   Or as ApStatus,
   Vr as ApStatusGroup,
   ft as ApSummary,
-  Jt as ApTable,
+  Xt as ApTable,
   or as ApTableModal,
   So as ApTag,
   Go as ApTagGroup,
-  Pp as ApText,
-  Rp as ApTextGroup,
+  Rp as ApText,
+  Mp as ApTextGroup,
   zr as ApTitle,
   Zo as ApTransformDataHelper,
   Eo as ApUpload,
@@ -260,23 +262,23 @@ export {
   y as ConfigProvider,
   n as DEFAULT_NAMESPACE,
   c as DEFAULT_UIMODE,
-  Kp as EditableAgGrid,
-  Up as EditableAgGridFormItem,
-  Cp as EditableGrid,
-  Dp as EditableGridFormItem,
-  Xt as EditableTable,
-  Zt as EditableTableFormItem,
-  Ap as FullScreen,
-  mp as InternalScrollBar,
+  Up as EditableAgGrid,
+  Vp as EditableAgGridFormItem,
+  Dp as EditableGrid,
+  Pp as EditableGridFormItem,
+  Zt as EditableTable,
+  op as EditableTableFormItem,
+  np as FullScreen,
+  xp as InternalScrollBar,
   vt as LruCacher,
-  Mp as Mask,
+  vp as Mask,
   ho as NeedNameKeyDefault,
-  sp as Portal,
-  Fp as ROW_SELECTION_FIELD,
-  np as ResizeObserver,
-  ap as ScrollBar,
-  xp as ScrollView,
-  vp as Splitter,
+  Ap as Portal,
+  gp as ROW_SELECTION_FIELD,
+  Fp as ResizeObserver,
+  mp as ScrollBar,
+  sp as ScrollView,
+  wp as Splitter,
   lo as adminToken,
   xo as aplusToken,
   C as buildLocaleContext,
@@ -287,7 +289,7 @@ export {
   Dr as convertExportField,
   l as default,
   R as defaultNamespace,
-  tp as ensureRangeValue,
+  ap as ensureRangeValue,
   rt as flattenColumns,
   Rt as forceStopTags,
   tt as formatDataIndex,
@@ -301,27 +303,27 @@ export {
   L as namespaceContextKey,
   s as pathMap,
   T as provideGlobalConfig,
-  gp as toTreeArray,
+  bp as toTreeArray,
   h as translate,
   zt as useAgGridModal,
   jt as useAgGridSelectModal,
   wt as useApKeepAliveInject,
-  zp as useControllableValue,
-  Jp as useFullScreen,
+  jp as useControllableValue,
+  Xp as useFullScreen,
   M as useGetDerivedNamespace,
   b as useGlobalConfig,
   Xr as useGridRefresh,
   P as useLocale,
-  jp as useManualRef,
-  Vp as useMessage,
+  Wp as useManualRef,
+  zp as useMessage,
   N as useNamespace,
   Zr as usePageListAgGrid,
   Jr as usePageListApGrid,
   jr as usePageListApTable,
-  Xp as useResize,
+  Zp as useResize,
   tr as useTableModal,
-  Wt as useTablePaging,
+  Jt as useTablePaging,
   Wr as useTableRefresh,
   ar as useTableSelectModal,
-  Wp as useThrottleRef
+  Jp as useThrottleRef
 };

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/business/ag-grid-modal/hooks/use-ag-grid-modal.d.ts

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

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

@@ -1,58 +1,95 @@
-import { createVNode as r } from "vue";
-import { ApModal as m } from "../../../ap-modal/index.mjs";
+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 d } from "../utils.mjs";
-import { useAgGridInstance as l } from "./use-ag-grid-instance.mjs";
-import { omit as c } from "lodash-unified";
+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 f from "../wrapper/index.vue2.mjs";
-import u from "../../../ag-grid/index.vue.mjs";
-function C(e) {
-  const [t, n] = l(), o = d(e.api, e.getRowKey, t.setDataSourceLength);
-  function a() {
-    m.createModal({
-      title: e.title,
-      width: e.width,
-      destroyOnClose: !0,
-      maskClosable: !1,
-      footer: null,
-      onCancel() {
-        t.setInstance(void 0), t.setDataSourceLength(0);
-      },
-      content: r(n, null, {
-        default: () => [r(f, {
-          rowHeight: e.rowHeight
+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.renderHeader?.(c(t, "setInstance")), r(u, {
-            ref: t.setInstance,
+          default: () => [e.value.renderHeader?.(q(r, "setInstance"), {
+            updateProps: u
+          }), n(H, {
+            ref: r.setInstance,
             searchForm: {
               sortable: !1,
               resize: {
                 target: "form"
               }
             },
-            rowKey: e.getRowKey,
-            request: o.request,
+            rowKey: e.value.getRowKey,
+            request: l.request,
             style: {
               padding: "0px"
             },
-            rowHeight: e.rowHeight,
-            columns: e.columns
-          }, e.gridSlots)]
+            rowHeight: e.value.rowHeight,
+            columns: e.value.columns
+          }, e.value.gridSlots)]
         })]
-      }),
-      ...e.modalProps || {}
+      });
+    }
+  });
+  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 i(s) {
-    o.setExtraParams(s?.extraParams), a();
+  function h(t) {
+    l.setExtraParams(t?.extraParams), p();
   }
   return {
-    open: i,
-    refresh: t.refresh,
-    getAgGridInstance: t.getInstance
+    open: h,
+    refresh: r.refresh,
+    getAgGridInstance: r.getInstance,
+    updateProps: u
   };
 }
 export {
-  C as useAgGridModal
+  L as useAgGridModal
 };