@aplus-frontend/ui 6.35.1 → 6.36.0

package/es/src/ap-form/search-form/index.vue.mjs

@@ -1,28 +1,29 @@
-import { isVNode as se, defineComponent as ie, useSlots as ue, ref as U, shallowRef as z, computed as _, unref as a, watch as M, createVNode as o, Fragment as w, createBlock as y, openBlock as p, mergeProps as ce, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
-import { Col as R, Flex as k, Button as q, Row as me } from "@aplus-frontend/antdv";
+import { isVNode as ie, defineComponent as ce, useSlots as ue, ref as B, shallowRef as M, computed as w, unref as a, watch as q, createVNode as o, Fragment as R, createBlock as x, openBlock as p, mergeProps as pe, withCtx as I, resolveDynamicComponent as T, createElementBlock as de, renderList as fe, normalizeStyle as me } from "vue";
+import { Col as _, Flex as k, Button as H, Row as he } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as H } from "../item-group/helper.mjs";
+import { genRealChildren as G } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
-import { isDef as G } from "../../utils/index.mjs";
-import { execFunc as J, diffFormItem as ge } from "./utils.mjs";
+import { isArray as ge, isBoolean as xe, omit as ye } from "lodash-unified";
+import { isDef as J } from "../../utils/index.mjs";
+import { execFunc as K, diffFormItem as ve } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
-import { useCountPerRow as ve } from "./hooks/use-count-per-row.mjs";
+import { useCountPerRow as Se } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
 import { useSorter as Ce } from "./hooks/use-sorter.mjs";
-import { getTargetNode as Se } from "./hooks/use-collapse-input-count.mjs";
-import { floorWith as K } from "@fruits-chain/utils";
+import { getTargetNode as we } from "./hooks/use-collapse-input-count.mjs";
+import { floorWith as Q } from "@fruits-chain/utils";
+import { useDevWarning as Re } from "../../utils/warning.mjs";
 import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as we } from "../../config-provider/hooks/use-locale.mjs";
-import Q from "../item/index.vue.mjs";
-import Re from "./components/popover-filter.vue2.mjs";
-import be from "./components/popover-sorter/index.vue2.mjs";
-import Fe from "../ap-form.vue2.mjs";
-function Ae(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !se(d);
+import { useLocale as be } from "../../config-provider/hooks/use-locale.mjs";
+import X from "../item/index.vue.mjs";
+import Fe from "./components/popover-filter.vue2.mjs";
+import Ae from "./components/popover-sorter/index.vue2.mjs";
+import Ne from "../ap-form.vue2.mjs";
+function Be(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !ie(d);
 }
-const r = 100, Qe = /* @__PURE__ */ ie({
+const r = 100, et = /* @__PURE__ */ ce({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -114,164 +115,169 @@ const r = 100, Qe = /* @__PURE__ */ ie({
       default: !0
     },
     resizeTarget: {},
+    resize: {},
     loadingDelay: {
       default: 300
     }
   },
   setup(d, {
-    expose: X
+    expose: Y
   }) {
-    const g = ue(), t = d, {
+    const y = ue(), t = d;
+    Re("SearchForm").deprecated(typeof t.resizeTarget < "u", "resizeTarget", "resize.target");
+    const {
       b: f
     } = _e("ap-form-search-form"), {
-      t: T
-    } = we(), Y = ve(t), v = U(), P = U();
-    function E() {
+      t: P
+    } = be(), v = B(), E = B(), Z = Se(t, E), W = B();
+    function z() {
       const e = v.value?.getFieldsValueTransformed(!0);
-      J(t.onSubmit, e);
+      K(t.onSubmit, e);
     }
-    function Z() {
-      t.customReset || v.value?.resetFields?.(), J(t.onReset);
+    function ee() {
+      t.customReset || v.value?.resetFields?.(), K(t.onReset);
     }
-    const ee = (e) => G(e) ? (he(e) ? e : [e]).join("") : Date.now();
+    const te = (e) => J(e) ? (ge(e) ? e : [e]).join("") : Date.now();
     let O = [];
-    const m = z(H(g.default())), u = z(g.extra?.()), L = _(() => K(r / a(Y), 4)), {
+    const m = M(G(y.default())), c = M(y.extra?.()), L = w(() => Q(r / a(Z), 4)), {
       items: b,
-      sorted: W,
+      sorted: $,
       handleClickConfirm: F
     } = Ce(m);
-    M(() => g.default(), (e) => {
-      O = m.value, m.value = ge(O, H(e)), W.value = !1;
-    }), M(() => g.extra?.(), (e) => {
-      u.value = e;
+    q(() => y.default(), (e) => {
+      O = m.value, m.value = ve(O, G(e)), $.value = !1;
+    }), q(() => y.extra?.(), (e) => {
+      c.value = e;
     });
-    function te(e) {
-      return K(e * (r / 24), 4);
+    function oe(e) {
+      return Q(e * (r / 24), 4);
     }
-    const n = _(() => {
-      const e = m.value, c = [], l = [], x = [], s = a(L);
-      let C = 0, A = 0;
-      const ne = r * t.maxRows - s * (a(u) && !t.extraInAction ? 2 : 1);
+    const n = w(() => {
+      const e = m.value, u = [], l = [], g = [], s = a(L);
+      let S = 0, A = 0;
+      const le = r * t.maxRows - s * (a(c) && !t.extraInAction ? 2 : 1);
       e.forEach((N) => {
-        const j = Se(N);
-        if (!j)
+        const D = we(N);
+        if (!D)
           return;
-        const i = j.props;
-        if (xe(i.hidden) ? !!i.hidden : G(i.hidden))
-          c.push(N);
+        const i = D.props;
+        if (xe(i.hidden) ? !!i.hidden : J(i.hidden))
+          u.push(N);
         else {
-          let S = i.span ? te(i.span) : s;
+          let C = i.span ? oe(i.span) : s;
           const V = {
             node: N,
-            span: S,
-            key: `ApFormSearchFormItem-${ee(i.name)}-${i._signal}`
-          }, D = r - C % r;
-          D < S && (S += D), C += S, C > ne ? l.push(V) : (A = C, x.push(V));
+            span: C,
+            key: `ApFormSearchFormItem-${te(i.name)}-${i._signal}`
+          }, U = r - S % r;
+          U < C && (C += U), S += C, S > le ? l.push(V) : (A = S, g.push(V));
         }
       });
-      const $ = r - (A + s) % r, le = Math.ceil(A) % r < s, re = $ < s ? r : $;
+      const j = r - (A + s) % r, re = Math.ceil(A) % r < s, se = j < s ? r : j;
       return {
-        hideNode: o(w, null, [c]),
-        nodes: x,
+        hideNode: o(R, null, [u]),
+        nodes: g,
         collapseNodes: l,
-        extraSpan: re,
-        lastRowOnlyIncludeActionAndExtra: le
+        extraSpan: se,
+        lastRowOnlyIncludeActionAndExtra: re
       };
-    }), h = (e) => `${e}%`, oe = _(() => {
+    }), h = (e) => `${e}%`, ae = w(() => {
       let e;
-      const c = n.value.collapseNodes.length || t.sortable && m.value.length, l = o(R, {
+      const u = n.value.collapseNodes.length || t.sortable && m.value.length, l = o(_, {
         flex: h(a(L)),
         key: "actionWrapper"
       }, {
-        default: () => [o(Q, null, {
+        default: () => [o(X, null, {
           default: () => [o(k, {
             wrap: "wrap",
-            justify: n.value.lastRowOnlyIncludeActionAndExtra && !(a(u) && t.extraInAction) ? "flex-end" : "space-between"
+            justify: n.value.lastRowOnlyIncludeActionAndExtra && !(a(c) && t.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [o(k, {
               gap: 8,
               wrap: "wrap"
             }, {
-              default: () => [c ? o("div", {
+              default: () => [u ? o("div", {
                 class: f("column-setting-trigger-wrapper")
-              }, [n.value.collapseNodes.length ? o(Re, {
-                onSubmit: E,
+              }, [n.value.collapseNodes.length ? o(Fe, {
+                onSubmit: z,
                 config: n.value.collapseNodes,
                 submitLoading: t.submitLoading
-              }, null) : null, t.sortable && b.value.length ? o(be, {
-                ref: P,
+              }, null) : null, t.sortable && b.value.length ? o(Ae, {
+                ref: W,
                 items: b.value,
                 onClickConfirm: F,
-                sorted: W.value
-              }, null) : null]) : null, o(q, {
+                sorted: $.value
+              }, null) : null]) : null, o(H, {
                 type: "primary",
-                onClick: E,
+                onClick: z,
                 loading: t.submitLoading ? {
                   delay: t.loadingDelay
                 } : !1,
                 htmlType: "submit",
                 class: f("action-btn")
               }, {
-                default: () => [t.searchText || T("ap.apForm.search.search")]
-              }), o(q, {
-                onClick: Z,
+                default: () => [t.searchText || P("ap.apForm.search.search")]
+              }), o(H, {
+                onClick: ee,
                 type: "text",
                 class: [f("action-btn"), f("action-btn-reset")]
               }, {
-                default: () => [t.resetText || T("ap.apForm.search.reset")]
+                default: () => [t.resetText || P("ap.apForm.search.reset")]
               })]
-            }), t.extraInAction ? a(u) : null]
+            }), t.extraInAction ? a(c) : null]
           })]
         })]
-      }), x = !t.extraInAction && a(u) ? o(R, {
+      }), g = !t.extraInAction && a(c) ? o(_, {
         flex: h(n.value.extraSpan),
         key: "extraNode"
       }, {
-        default: () => [o(Q, null, {
+        default: () => [o(X, null, {
           default: () => [o(k, {
             justify: n.value.extraSpan === r || n.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, Ae(e = a(u)) ? e : {
+          }, Be(e = a(c)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null, s = o(R, {
+      }) : null, s = o(_, {
         flex: h(n.value.extraSpan)
       }, null);
-      return n.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [x || s, l]) : o(w, null, [l, x]);
+      return n.value.lastRowOnlyIncludeActionAndExtra ? o(R, null, [g || s, l]) : o(R, null, [l, g]);
     });
-    function ae() {
-      const e = P.value?.getCachedList();
+    function ne() {
+      const e = W.value?.getCachedList();
       F(e);
     }
-    return X({
-      apForm: _(() => a(v)),
+    return Y({
+      apForm: w(() => a(v)),
       getSorterItems: () => b.value,
       setSorterItems: F,
-      resetSorterItems: ae
-    }), (e, c) => (p(), y(Fe, ce({
+      resetSorterItems: ne
+    }), (e, u) => (p(), x(Ne, pe({
       ref_key: "apForm",
       ref: v,
       class: a(f)()
     }, a(ye)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(p(), y(I(n.value.hideNode))), o(a(me), {
+      default: I(() => [(p(), x(T(n.value.hideNode))), o(a(he), {
+        ref_key: "contentWrapperRef",
+        ref: E,
         gutter: 8
       }, {
-        default: B(() => [(p(!0), pe(w, null, de(n.value.nodes, (l) => (p(), y(a(R), {
+        default: I(() => [(p(!0), de(R, null, fe(n.value.nodes, (l) => (p(), x(a(_), {
           key: l.key,
           flex: h(l.span),
-          style: fe({
+          style: me({
             maxWidth: h(l.span)
           })
         }, {
-          default: B(() => [(p(), y(I(l.node)))]),
+          default: I(() => [(p(), x(T(l.node)))]),
           _: 2
-        }, 1032, ["flex", "style"]))), 128)), (p(), y(I(oe.value)))]),
+        }, 1032, ["flex", "style"]))), 128)), (p(), x(T(ae.value)))]),
         _: 1
-      })]),
+      }, 512)]),
       _: 1
     }, 16, ["class"]));
   }
 });
 export {
-  Qe as default
+  et as default
 };

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

@@ -1,39 +1,38 @@
-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 { 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 "../../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) => {
+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) => {
   let o, t;
   const {
-    destroyOnClose: a = !0,
+    destroyOnClose: p = !0,
     wrapperOffset: n = !1
-  } = p, {
+  } = a, {
     b: s
-  } = T("ap-modal");
+  } = H("ap-modal");
+  let m = !1;
   function i() {
-    o && o(!1), setTimeout(() => {
-      m(null, r), r.parentElement?.removeChild(r);
-    }, 500);
+    o && o(!1), m = !0;
   }
-  function h() {
+  function g() {
     o && o(!0);
   }
   function c() {
     o && o(!1);
   }
-  function C(e) {
+  function x(e) {
     t && t(e);
   }
-  const g = /* @__PURE__ */ b({
+  const O = /* @__PURE__ */ w({
     data() {
       return {
-        open: a,
-        props: p
+        open: p,
+        props: a
       };
     },
     created() {
@@ -52,7 +51,7 @@ const z = (p) => {
           const e = this.props?.content?.component?.exposed ?? void 0;
           await this.props?.onCancel(e);
         }
-        a ? i() : c();
+        p ? i() : c();
       },
       async handleOk() {
         try {
@@ -64,7 +63,7 @@ const z = (p) => {
           }
           t({
             confirmLoading: !1
-          }), a ? i() : c();
+          }), p ? i() : c();
         } catch {
           t({
             confirmLoading: !1
@@ -73,39 +72,43 @@ const z = (p) => {
       }
     },
     render() {
-      const e = L(this.props, ["onCancel", "onOk", "open", "onUpdate:open", "getContainer", "icon"]);
-      return l(N, f.value, {
-        default: () => [l(P, k({
+      const e = A(this.props, ["onCancel", "onOk", "open", "onUpdate:open", "getContainer", "icon"]);
+      return l(M, C.value, {
+        default: () => [l(L, P({
           class: {
             [s()]: !0,
             [s("wrapper")]: n
           },
+          centered: !0
+        }, e, {
           open: this.open,
           onCancel: this.handleCancel,
           onOk: this.handleOk,
-          centered: !0
-        }, e), {
+          afterOpenChange: (f) => {
+            !f && m && (h(null, r), r.parentElement?.removeChild(r)), e?.afterOpenChange && e?.afterOpenChange?.(f);
+          }
+        }), {
           default: () => [l("div", {
             class: {
               [s("body-wrapper")]: n
             },
             style: n === !1 ? {} : {
-              maxHeight: `calc(100vh - ${(n === !0 ? 100 : M(n) ? Number(n) : 100) * 2}px)`
+              maxHeight: `calc(100vh - ${(n === !0 ? 100 : D(n) ? Number(n) : 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), {
+  }), 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), {
     destroy: i,
-    update: C,
-    open: h,
+    update: x,
+    open: g,
     close: c
   };
 };
 export {
-  z as createModal
+  F as createModal
 };

package/es/src/ap-pro-card/components/card/index.vue.d.ts

@@ -21,9 +21,9 @@ declare const __VLS_component: DefineComponent<__VLS_PublicProps, {}, {}, {}, {}
     gutter: ApProCardGutter | ApProCardGutter[];
     ghost: boolean;
     bordered: boolean;
+    hoverable: boolean;
     collapsible: boolean;
     headerBordered: boolean;
-    hoverable: boolean;
     defaultCollapsed: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;