@aplus-frontend/ui 0.5.0-beta.1 → 0.5.0-beta.2

package/es/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,8 @@ import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+type WatchOptions<ValueType> = {
+    initialValue: ValueType;
+};
+export declare function useWatch<ValueType = any, StoreType = any>(name: NamePath | Ref<NamePath>, formOrOptions?: Ref<ApFormIns<StoreType> | undefined> | WatchOptions<ValueType>, options?: WatchOptions<ValueType>): Ref<ValueType | undefined, ValueType | undefined>;
 export default useWatch;

package/es/src/ap-form/hooks/use-watch.mjs

@@ -1,40 +1,42 @@
-import { useInjectForm as V } from "../context.mjs";
-import { ref as N, watchEffect as A, unref as l, watch as M } from "vue";
-import { isArray as R } from "lodash-unified";
-import { INTERNAL_FORM_INSTANCE_MARK as y } from "../constant.mjs";
-function w(t, e) {
-  return R(e) ? e.reduce((n, u) => n == null ? void 0 : n[u], t) : t == null ? void 0 : t[e];
+import { useInjectForm as M } from "../context.mjs";
+import { ref as R, watchEffect as d, unref as s, watch as y } from "vue";
+import { isArray as E } from "lodash-unified";
+import { INTERNAL_FORM_INSTANCE_MARK as _ } from "../constant.mjs";
+function N(e, t) {
+  return E(t) ? t.reduce((n, l) => n == null ? void 0 : n[l], e) : e == null ? void 0 : e[t];
 }
-function I(t) {
+function V(e) {
   try {
-    return JSON.stringify(t);
+    return JSON.stringify(e);
   } catch {
     return Math.random();
   }
 }
-const F = (t, e) => {
-  const { internalInstance: n, model: u } = V(), i = N();
-  let a = "", o = !0;
-  return A((s) => {
-    var f;
-    const r = ((f = e == null ? void 0 : e.value) == null ? void 0 : f.getInternalInstance(y)) || n;
-    if (!r) {
-      o = !1;
+function W(e, t, n) {
+  const { internalInstance: l, model: v } = M(), g = (n == null ? void 0 : n.initialValue) || (t == null ? void 0 : t.initialValue) || void 0, r = R(g);
+  let u = V(g), h = !0;
+  const i = t && "value" in t ? t : void 0;
+  return d((f) => {
+    var w;
+    const a = ((w = i == null ? void 0 : i.value) == null ? void 0 : w.getInternalInstance(_)) || l;
+    if (!a) {
+      h = !1;
       return;
     }
-    const c = r.registerWatch((S) => {
-      const g = w(S, l(t)), h = I(g);
-      h !== a && (i.value = g, a = h);
-    }, o);
-    s(c);
-  }), M(
-    () => l(t),
-    (s) => {
-      const r = w(l(u), s), c = I(r);
-      c !== a && (i.value = r, a = c);
+    const c = a.registerWatch((A) => {
+      const I = N(A, s(e)), S = V(I);
+      S !== u && (r.value = I, u = S);
+    }, h);
+    f(c);
+  }), y(
+    () => s(e),
+    (f) => {
+      const a = N(s(v), f), c = V(a);
+      c !== u && (r.value = a, u = c);
     }
-  ), i;
-};
+  ), r;
+}
 export {
-  F as default
+  W as default,
+  W as useWatch
 };

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

@@ -4,7 +4,7 @@ import "./item-group/index.vue2.mjs";
 import "./list/index.vue2.mjs";
 import "./search-form/index.vue2.mjs";
 import "./modal-form/index.vue2.mjs";
-import m from "./hooks/use-watch.mjs";
+import { useWatch as m } from "./hooks/use-watch.mjs";
 import "./dependency/index.vue2.mjs";
 import "./set/index.vue2.mjs";
 import "./drawer-form/index.vue2.mjs";

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

@@ -1,4 +1,4 @@
-import { isVNode as se, defineComponent as ie, useSlots as ce, ref as ue, unref as o, shallowRef as M, computed as S, watch as D, cloneVNode as pe, createVNode as a, Fragment as F, createBlock as C, openBlock as m, mergeProps as de, withCtx as E, resolveDynamicComponent as b, createElementBlock as fe, renderList as me } from "vue";
+import { isVNode as se, defineComponent as ie, useSlots as ue, ref as ce, unref as o, shallowRef as M, computed as S, watch as D, cloneVNode as pe, createVNode as a, Fragment as F, createBlock as C, openBlock as m, mergeProps as de, withCtx as E, resolveDynamicComponent as b, createElementBlock as fe, renderList as me } from "vue";
 import { Col as B, Flex as $, Space as he, Button as v, Row as xe } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
@@ -108,8 +108,8 @@ const r = 24, ze = /* @__PURE__ */ ie({
     emit: H
   }) {
     var I;
-    const c = ce(), n = h, G = H, {
-      value: u,
+    const u = ue(), n = h, G = H, {
+      value: c,
       updateValue: J
     } = Fe(n, G, {
       valuePropName: "collapse",
@@ -118,9 +118,9 @@ const r = 24, ze = /* @__PURE__ */ ie({
       b: K
     } = Be("ap-form-search-form"), Q = Re("uiMode"), {
       t: w
-    } = Ae(), g = ue();
+    } = Ae(), g = ce();
     function X() {
-      J(!o(u));
+      J(!o(c));
     }
     function Y() {
       var e, t;
@@ -131,12 +131,12 @@ const r = 24, ze = /* @__PURE__ */ ie({
       n.customReset || (t = (e = g.value) == null ? void 0 : e.resetFields) == null || t.call(e), W(n.onReset);
     }
     let N = [];
-    const R = M(L(c.default())), d = M((I = c.extra) == null ? void 0 : I.call(c)), k = S(() => Math.floor(r / n.countPerRow));
-    D(() => c.default(), (e) => {
+    const R = M(L(u.default())), d = M((I = u.extra) == null ? void 0 : I.call(u)), k = S(() => Math.floor(r / n.countPerRow));
+    D(() => u.default(), (e) => {
       N = R.value, R.value = Se(N, L(e));
     }), D(() => {
       var e;
-      return (e = c.extra) == null ? void 0 : e.call(c);
+      return (e = u.extra) == null ? void 0 : e.call(u);
     }, (e) => {
       d.value = e;
     });
@@ -158,9 +158,8 @@ const r = 24, ze = /* @__PURE__ */ ie({
       let V = 0, j = 0;
       const le = s.map((p, f) => {
         const x = p.props, y = x.span || l;
-        if (V += y, !n.forceExpand && o(u) && V > O) {
+        if (V += y, !n.forceExpand && o(c) && V > O) {
           t.push(pe(p, {
-            class: "ant-form-item-hidden",
             hidden: !0
           }));
           return;
@@ -187,7 +186,7 @@ const r = 24, ze = /* @__PURE__ */ ie({
       }, {
         default: () => [a(q, null, {
           default: () => [a($, {
-            justify: !o(u) && t.lastRowOnlyIncludeActionAndExtra && !(o(d) && n.extraInAction) ? "flex-end" : "space-between"
+            justify: !o(c) && t.lastRowOnlyIncludeActionAndExtra && !(o(d) && n.extraInAction) ? "flex-end" : "space-between"
           }, {
             default: () => [a(he, null, {
               default: () => [a(v, {
@@ -205,19 +204,19 @@ const r = 24, ze = /* @__PURE__ */ ie({
                 onClick: X,
                 icon: a(ye, {
                   style: Q.value === "aplus" ? "color:#B8C3D1" : "color:#BFBFBF",
-                  rotate: o(u) ? 90 : -90
+                  rotate: o(c) ? 90 : -90
                 }, null)
               }, null) : null]
             }), n.extraInAction ? o(d) : null]
           })]
         })]
       }), l = !n.extraInAction && o(d) ? a(B, {
-        span: o(u) ? t.actualExtraSpan : t.defaultExtraSpan,
+        span: o(c) ? t.actualExtraSpan : t.defaultExtraSpan,
         key: "extraNode"
       }, {
         default: () => [a(q, null, {
           default: () => [a($, {
-            justify: !o(u) && (t.defaultExtraSpan === r || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
+            justify: !o(c) && (t.defaultExtraSpan === r || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
           }, be(e = o(d)) ? e : {
             default: () => [e]
           })]
@@ -225,7 +224,7 @@ const r = 24, ze = /* @__PURE__ */ ie({
       }) : null, i = a(B, {
         span: t.defaultExtraSpan
       }, null);
-      return !o(u) && t.lastRowOnlyIncludeActionAndExtra ? a(F, null, [l || i, s]) : a(F, null, [s, l]);
+      return !o(c) && t.lastRowOnlyIncludeActionAndExtra ? a(F, null, [l || i, s]) : a(F, null, [s, l]);
     });
     return z({
       apForm: S(() => o(g))