@aplus-frontend/ui 0.6.0-beta.19 → 0.6.0-beta.20

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

@@ -1,12 +1,12 @@
-import { defineComponent as Q, reactive as X, ref as A, unref as p, nextTick as Y, toRaw as _, watch as Z, onWatcherCleanup as z, computed as ee, createBlock as te, openBlock as re, mergeProps as le, withCtx as oe, renderSlot as se } from "vue";
-import { Form as ne } from "@aplus-frontend/antdv";
+import { defineComponent as Q, reactive as X, ref as E, unref as m, nextTick as Y, toRaw as B, watch as Z, onWatcherCleanup as z, computed as ee, createBlock as te, openBlock as re, mergeProps as oe, withCtx as le, renderSlot as ne } from "vue";
+import { Form as se } from "@aplus-frontend/antdv";
 import { useProvideForm as ie } from "./context.mjs";
-import { isArray as f, cloneDeep as ae, isFunction as B, isPlainObject as M, omit as ue } from "lodash-unified";
+import { isArray as f, cloneDeep as ae, isFunction as M, isPlainObject as _, omit as ue } from "lodash-unified";
 import { useUrlSearchParams as ce } from "@vueuse/core";
 import { INTERNAL_FORM_INSTANCE_MARK as fe } from "./constant.mjs";
 import { getRouteType as de, isDef as V } from "../utils/index.mjs";
 import ge from "./utils/set.mjs";
-import { genParams as b, setToParams as E } from "./utils/params.mjs";
+import { genParams as b, setToParams as x } from "./utils/params.mjs";
 import { useInjectFormProvider as Fe } from "./provider/context.mjs";
 const Re = /* @__PURE__ */ Q({
   name: "ApForm",
@@ -41,54 +41,54 @@ const Re = /* @__PURE__ */ Q({
   },
   setup(C, { expose: N }) {
     function S(e, t) {
-      return f(t) ? t.reduce((r, o) => r == null ? void 0 : r[o], e) : e == null ? void 0 : e[t];
+      return f(t) ? t.reduce((r, l) => r == null ? void 0 : r[l], e) : e == null ? void 0 : e[t];
     }
-    const l = C;
-    function v(e, t, r = !0, o) {
-      var s;
+    const o = C;
+    function v(e, t, r = !0, l) {
+      var n;
       if (f(e)) {
-        let a = n;
+        let a = s;
         for (let d = 0; d < e.length - 1; d++)
           e[d] in a || (a[e[d]] = {}), a = a[e[d]];
-        o ? o(a, e[e.length - 1]) : a[e[e.length - 1]] = t;
+        l ? l(a, e[e.length - 1]) : a[e[e.length - 1]] = t;
       } else
-        o ? o(n, e) : n[e] = t;
+        l ? l(s, e) : s[e] = t;
       let i = f(e) ? e[0] : e;
       if (r) {
-        const a = { [i]: n[i] };
-        y.triggerFormChange(l.name, a), (s = l.onValuesChange) == null || s.call(l, a, n, e);
+        const a = { [i]: s[i] };
+        p.triggerFormChange(o.name, a), (n = o.onValuesChange) == null || n.call(o, a, s, e);
       }
       T();
     }
-    const u = A(), I = ce(de()), y = Fe(), P = A(
-      l.syncToUrl ? b(l.syncToUrl, I, "get") : {}
+    const u = E(), U = ce(de()), p = Fe(), P = E(
+      o.syncToUrl ? b(o.syncToUrl, U, "get") : {}
     );
-    let m = ae(w()), g = {};
-    const n = X(w());
+    let y = ae(w()), g = {};
+    const s = X(w());
     let F = [];
     function w() {
-      const e = l.initialValues || {};
-      return l.syncToUrlPriority ? {
+      const e = o.initialValues || {};
+      return o.syncToUrlPriority ? {
         ...e,
-        ...p(P)
+        ...m(P)
       } : {
-        ...p(P),
+        ...m(P),
         ...e
       };
     }
     function W(e) {
       var r;
       const t = h(e, g);
-      y.triggerFormFinish(l.name, e), l.syncToUrl && E(I, b(l.syncToUrl, t, "set")), (r = l.onFinish) == null || r.call(l, t);
+      p.triggerFormFinish(o.name, e), o.syncToUrl && x(U, b(o.syncToUrl, t, "set")), (r = o.onFinish) == null || r.call(o, t);
     }
     const q = async () => {
       var e;
       (e = u.value) == null || e.resetFields(), await Y(() => {
-        Object.keys(n).forEach((t) => delete n[t]), Object.assign(n, m), T(), l.syncToUrl && E(
-          I,
+        Object.keys(s).forEach((t) => delete s[t]), Object.assign(s, y), T(), o.syncToUrl && x(
+          U,
           b(
-            l.syncToUrl,
-            h(m, g),
+            o.syncToUrl,
+            h(y, g),
             "set"
           )
         );
@@ -100,15 +100,15 @@ const Re = /* @__PURE__ */ Q({
       var r;
       return (r = u.value) == null ? void 0 : r.validateFields(e, t);
     }, K = async (e, t) => {
-      var o;
-      const r = await ((o = u.value) == null ? void 0 : o.validateFields(
+      var l;
+      const r = await ((l = u.value) == null ? void 0 : l.validateFields(
         e,
         t
       ));
       return h(r, g);
     }, O = (e) => {
       var t;
-      return e === !0 ? _(n) : (t = u.value) == null ? void 0 : t.getFieldsValue(e);
+      return e === !0 ? B(s) : (t = u.value) == null ? void 0 : t.getFieldsValue(e);
     }, L = (e) => {
       const t = O(e);
       return h(t, g);
@@ -119,26 +119,26 @@ const Re = /* @__PURE__ */ Q({
       var r;
       (r = u.value) == null || r.scrollToField(e, t);
     }, H = (e) => {
-      Object.assign(n, e), T();
-    }, U = (e, t, r = !0, o) => {
-      v(e, t, r, o), T();
+      Object.assign(s, e), T();
+    }, I = (e, t, r = !0, l) => {
+      v(e, t, r, l), T();
     };
     function R(e, t) {
-      return t || e(_(n)), F.push(e), () => {
+      return t || e(B(s)), F.push(e), () => {
         F = F.filter((r) => r !== e);
       };
     }
     function j({ initialValue: e, name: t, transform: r }) {
       if (V(e) && V(t)) {
-        const o = S(p(P), t);
-        if (!V(o) || !l.syncToUrlPriority)
+        const l = S(m(P), t);
+        if (!V(l) || !o.syncToUrlPriority)
           if (v(t, e, !1), f(t)) {
-            let i = m;
-            for (let s = 0; s < t.length - 1; s++)
-              V(i[t[s]]) || (i[t[s]] = {}), i = i[t[s]];
+            let i = y;
+            for (let n = 0; n < t.length - 1; n++)
+              V(i[t[n]]) || (i[t[n]] = {}), i = i[t[n]];
             i[t[t.length - 1]] = e;
           } else
-            m[t] = e;
+            y[t] = e;
       }
       r && (g = ge(
         g,
@@ -155,12 +155,12 @@ const Re = /* @__PURE__ */ Q({
       return {
         registerField: j,
         registerWatch: R,
-        setFieldValue: U
+        setFieldValue: I
       };
     }
     function T() {
       if (F.length) {
-        const e = _(n);
+        const e = B(s);
         F.forEach((t) => {
           t(e);
         });
@@ -170,25 +170,25 @@ const Re = /* @__PURE__ */ Q({
       if (e == null)
         return;
       let r = f(e) ? [] : {};
-      return Object.keys(e).forEach((o) => {
-        const i = e[o], s = t == null ? void 0 : t[o], a = B(s) ? s : s == null ? void 0 : s.transformer, d = B(s) ? !0 : s == null ? void 0 : s.flat;
-        if (B(a)) {
+      return Object.keys(e).forEach((l) => {
+        const i = e[l], n = t == null ? void 0 : t[l], a = M(n) ? n : n == null ? void 0 : n.transformer, d = M(n) ? !0 : n == null ? void 0 : n.flat;
+        if (M(a)) {
           const c = a(i);
-          d ? f(c) && f(r) ? r = [...r, ...c] : M(c) && M(r) ? r = {
+          d ? f(c) && f(r) ? r = [...r, ...c] : _(c) && _(r) ? r = {
             ...r,
             ...c
-          } : r[o] = c : r[o] = c;
-        } else if (M(i) || f(i)) {
+          } : r[l] = c : r[l] = c;
+        } else if (_(i) || f(i)) {
           const c = h(
             i,
-            s
+            n
           );
-          r[o] = c;
+          r[l] = c;
         } else
-          r[o] = i;
+          r[l] = i;
       }), r;
     }
-    const x = {
+    const A = {
       resetFields: q,
       clearValidate: D,
       validateFields: k,
@@ -196,42 +196,53 @@ const Re = /* @__PURE__ */ Q({
       validate: $,
       scrollToField: G,
       setFieldsValue: H,
-      setFieldValue: U,
+      setFieldValue: I,
       registerWatch: R,
       validateFieldsReturnTransformed: K,
       getFieldsValueTransformed: L,
       getInternalInstance: J
     };
     return Z(
-      () => l.name,
+      () => o.name,
       (e) => {
-        e && (y.registerForm(e, x), z(() => {
-          y.unregisterForm(l.name);
+        e && (p.registerForm(e, A), z(() => {
+          p.unregisterForm(o.name);
         }));
       },
       {
         immediate: !0
       }
     ), ie({
-      model: ee(() => n),
+      model: ee(() => s),
       updateModel: v,
       internalInstance: {
         registerWatch: R,
         registerField: j,
-        setFieldValue: U
+        setFieldValue: I
       }
-    }), N(x), (e, t) => (re(), te(p(ne), le({
-      ref_key: "formRef",
-      ref: u
-    }, p(ue)(l, ["initialValues", "onValuesChange", "onFinish"]), {
-      model: n,
-      onFinish: W
-    }), {
-      default: oe(() => [
-        se(e.$slots, "default")
+    }), N(A), (e, t) => (re(), te(m(se), oe(
+      {
+        ref_key: "formRef",
+        ref: u
+      },
+      m(ue)(o, [
+        "initialValues",
+        "onValuesChange",
+        "onFinish",
+        "syncToUrl",
+        "syncToUrlPriority"
+      ]),
+      {
+        model: s,
+        "data-form-name": e.name,
+        onFinish: W
+      }
+    ), {
+      default: le(() => [
+        ne(e.$slots, "default")
       ]),
       _: 3
-    }, 16, ["model"]));
+    }, 16, ["model", "data-form-name"]));
   }
 });
 export {

package/es/src/business/ap-keep-alive/hook.d.ts

@@ -3,7 +3,7 @@ import { CacheInterface, PropertyKeyType } from './interface';
 type DataModel = {
     getter: (key?: string) => Promise<any>;
     setter: (key: string, data: any) => Promise<any>;
-    has: (key: string) => Promise<any>;
+    has: (key?: string) => Promise<any>;
 };
 export declare const useApKeepAliveProvide: (cache: CacheInterface, currentModuleKey: Ref<PropertyKeyType>) => void;
 export declare const useApKeepAliveInject: () => DataModel;

package/es/src/business/ap-keep-alive/hook.mjs

@@ -1,23 +1,25 @@
-import { provide as o, nextTick as i, inject as v } from "vue";
-const a = Symbol("ApKeepAliveProvideKey"), c = (n, r) => {
-  o(a, {
+import { provide as v, nextTick as i, inject as o } from "vue";
+const a = Symbol("ApKeepAliveProvideKey"), f = (s, r) => {
+  v(a, {
     getter: async (e) => {
       await i();
-      const t = n.get(r.value);
+      const t = s.get(r.value);
       return t ? e ? t == null ? void 0 : t.get(e) : Object.fromEntries(t) : {};
     },
     setter: async (e, t) => {
       await i();
-      let s = n.get(r.value);
-      return s || (s = /* @__PURE__ */ new Map(), n.set(r.value, s)), s == null ? void 0 : s.set(e, t);
+      let n = s.get(r.value);
+      return n || (n = /* @__PURE__ */ new Map(), s.set(r.value, n)), n == null ? void 0 : n.set(e, t);
     },
     has: async (e) => {
-      await i();
-      const t = n.get(r.value);
-      return !!(t != null && t.has(e));
+      if (await i(), e) {
+        const t = s.get(r.value);
+        return !!(t != null && t.has(e));
+      }
+      return s.has(r.value);
     }
   });
-}, l = () => v(a, {
+}, l = () => o(a, {
   getter: async () => {
   },
   setter: async () => {
@@ -27,5 +29,5 @@ const a = Symbol("ApKeepAliveProvideKey"), c = (n, r) => {
 });
 export {
   l as useApKeepAliveInject,
-  c as useApKeepAliveProvide
+  f as useApKeepAliveProvide
 };

package/es/src/business/ap-keep-alive/index.d.ts

@@ -14,6 +14,7 @@ declare const ApKeepAlive: {
         };
         max: {
             type: PropType<number>;
+            default: number;
         };
         exclude: {
             type: PropType<MatchPattern>;
@@ -28,6 +29,7 @@ declare const ApKeepAlive: {
     }>> & Readonly<{}>, () => VNode<RendererNode, RendererElement, {
         [key: string]: any;
     }>[] | undefined, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
+        max: number;
         debug: boolean;
         stopTags: string[];
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
@@ -47,6 +49,7 @@ declare const ApKeepAlive: {
         };
         max: {
             type: PropType<number>;
+            default: number;
         };
         exclude: {
             type: PropType<MatchPattern>;
@@ -61,6 +64,7 @@ declare const ApKeepAlive: {
     }>> & Readonly<{}>, () => VNode<RendererNode, RendererElement, {
         [key: string]: any;
     }>[] | undefined, {}, {}, {}, {
+        max: number;
         debug: boolean;
         stopTags: string[];
     }>;
@@ -77,6 +81,7 @@ declare const ApKeepAlive: {
     };
     max: {
         type: PropType<number>;
+        default: number;
     };
     exclude: {
         type: PropType<MatchPattern>;
@@ -91,6 +96,7 @@ declare const ApKeepAlive: {
 }>> & Readonly<{}>, () => VNode<RendererNode, RendererElement, {
     [key: string]: any;
 }>[] | undefined, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
+    max: number;
     debug: boolean;
     stopTags: string[];
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {

package/es/src/business/ap-keep-alive/interface.d.ts

@@ -20,6 +20,7 @@ export declare const ApKeepAliveProps: () => {
     };
     max: {
         type: PropType<number>;
+        default: number;
     };
     exclude: {
         type: PropType<MatchPattern>;

package/es/src/business/ap-keep-alive/interface.mjs

@@ -4,10 +4,11 @@ const e = () => ({
   },
   debug: {
     type: Boolean,
-    default: !0
+    default: !1
   },
   max: {
-    type: Number
+    type: Number,
+    default: 30
   },
   exclude: {
     type: Array
@@ -30,10 +31,7 @@ const e = () => ({
   "APagination",
   "ApTablePagination",
   "ApView",
-  "ApFormItem",
-  "AFormItem",
   "ApTitle",
-  "ap-button",
   "span",
   "svg",
   "iframe",
@@ -44,8 +42,10 @@ const e = () => ({
   "ApGrid",
   "ApBatchActionGroup",
   "ApBatchAction",
-  "EditableGrid"
+  "EditableGrid",
   //todo  EditableGridFormItem 改名
+  // 'ApFormItem',
+  "AFormItem"
   // 'AForm', 不能忽略，有嵌套情况
 ];
 export {

package/es/src/business/ap-keep-alive/keep-alive.d.ts

@@ -10,6 +10,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     max: {
         type: PropType<number>;
+        default: number;
     };
     exclude: {
         type: PropType<MatchPattern>;
@@ -33,6 +34,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     max: {
         type: PropType<number>;
+        default: number;
     };
     exclude: {
         type: PropType<MatchPattern>;
@@ -45,6 +47,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         default: () => never[];
     };
 }>> & Readonly<{}>, {
+    max: number;
     debug: boolean;
     stopTags: string[];
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;

package/es/src/business/ap-keep-alive/keep-alive.mjs

@@ -6,74 +6,74 @@ import { LruCacher as C } from "./cacher/lru-cacher.mjs";
 import { forceStopTags as R, ApKeepAliveProps as _ } from "./interface.mjs";
 import { throttle as S } from "lodash-unified";
 import { useApKeepAliveProvide as $ } from "./hook.mjs";
-const c = console, s = "|", te = j({
+const c = console, a = "|", te = j({
   name: "ApKeepAlive",
   inheritAttrs: !1,
   props: _(),
-  setup(r, { slots: h }) {
-    const g = M(), v = (e) => !(r.include && (!e || !D(r.include, e)) || r.exclude && e && D(r.exclude, e)), d = r.store || new C(r.max || 50), u = E("");
+  setup(o, { slots: h }) {
+    const g = M(), v = (e) => !(o.include && (!e || !D(o.include, e)) || o.exclude && e && D(o.exclude, e)), d = o.store || new C(o.max), u = E("");
     let m = "";
-    const k = /* @__PURE__ */ new Set([...R, ...r.stopTags]), N = (e, o = "") => {
+    const k = /* @__PURE__ */ new Set([...R, ...o.stopTags]), p = (e, n = "") => {
       var f;
       const t = [];
       if (!e) return t;
-      const { VnodeName: i, vnodeSubPath: a } = T(
+      const { VnodeName: i, vnodeSubPath: s } = T(
         e,
         u.value
       );
-      a && (o += s + a);
+      s && (n += a + s);
       const l = I[i];
       if (l) {
-        const n = l.get(e);
-        !W(n) && t.push([o, n]);
+        const r = l.get(e);
+        !W(r) && t.push([n, r]);
       }
       if (k.has(i))
-        return r.debug && c.log("[ stop-VnodeName ] >", i, o), t;
+        return o.debug && c.log("[ stop-VnodeName ] >", i, n), t;
       if (e.children)
         if (Array.isArray(e.children))
-          e.children.forEach((n) => {
-            n = b(n), n && t.push(...N(n, o));
+          e.children.forEach((r) => {
+            r = b(r), r && t.push(...p(r, n));
           });
         else {
-          const n = K(e.children);
-          n && t.push(...N(n, o));
+          const r = K(e.children);
+          r && t.push(...p(r, n));
         }
-      return (f = e.component) != null && f.subTree && t.push(...N(e.component.subTree, o)), t;
-    }, V = async (e, o, t = "") => {
+      return (f = e.component) != null && f.subTree && t.push(...p(e.component.subTree, n)), t;
+    }, N = async (e, n, t = "") => {
       var f;
-      if (!e || !o || (o == null ? void 0 : o.size) < 1) return;
-      const { VnodeName: i, vnodeSubPath: a } = T(
+      if (!e || !n || (n == null ? void 0 : n.size) < 1) return;
+      const { VnodeName: i, vnodeSubPath: s } = T(
         e,
         u.value
       );
-      a && (t += s + a);
+      s && (t += a + s);
       const l = I[i];
       if (l) {
-        r.debug && c.log("[ vnkeeper ] >", i, e.key);
-        const n = t.split(s).slice(-1).join(s), U = o.get(n);
+        o.debug && c.log("[ vnkeeper ] >", i, e.key);
+        const r = t.split(a).slice(-1).join(a), U = n.get(r);
         await l.set(e, U);
       }
       if (k.has(i)) {
-        r.debug && c.log("[ stop VnodeName ] >", i, t);
+        o.debug && c.log("[ stop VnodeName ] >", i, t);
         return;
       }
       if (e.children)
         if (Array.isArray(e.children))
-          e.children.forEach((n) => {
-            n = b(n), n && V(n, o, t);
+          e.children.forEach((r) => {
+            r = b(r), r && N(r, n, t);
           });
         else {
-          const n = K(e.children);
-          n && V(n, o, t);
+          const r = K(e.children);
+          r && N(r, n, t);
         }
-      (f = e.component) != null && f.subTree && V(e.component.subTree, o, t);
-    }, y = S(() => {
+      (f = e.component) != null && f.subTree && N(e.component.subTree, n, t);
+    }, V = S(() => {
       B(() => {
-        const e = w(g), o = x(e), t = b(o);
+        const e = w(g), n = x(e), t = b(n);
         if (!t || typeof t.type == "string" || (typeof t.type == "object" && "name" in t.type && (m = t.type.name || ""), u.value = t.key || m || "", !v(m)) || !u.value)
           return;
         const i = d.get(u.value);
-        V(t, i), c.log(
+        N(t, i), c.log(
           "resetDataInVNode",
           g.vnode.key,
           u.value,
@@ -84,25 +84,25 @@ const c = console, s = "|", te = j({
       trailing: !1
     });
     z(() => {
-      if (r.debug) {
-        r.debug && c.log("[ onMounted ] >", r.exclude), A(() => {
-          y();
+      if (o.debug) {
+        c.log("[ onMounted ] >", o.exclude), A(() => {
+          V();
         });
         return;
       }
-      y();
+      V();
     }), F(() => {
-      if (r.debug) {
-        r.debug && c.log("[ onUpdated ] >", r.exclude), A(() => {
-          y();
+      if (o.debug) {
+        c.log("[ onUpdated ] >", o.exclude), A(() => {
+          V();
         });
         return;
       }
-      y();
+      V();
     });
-    const p = S(() => {
+    const y = S(() => {
       B(() => {
-        const e = w(g), o = x(e), t = b(o);
+        const e = w(g), n = x(e), t = b(n);
         if (!t) return;
         if (!u.value) {
           c.warn(
@@ -111,13 +111,13 @@ const c = console, s = "|", te = j({
           return;
         }
         if (!v(m)) return;
-        let i = N(t);
-        i = i.map((l) => [l[0].split(s).slice(-1).join(s), l[1]]);
-        const a = i.map((l) => l[0]);
-        a.length > new Set(a).size && c.warn(
+        let i = p(t);
+        i = i.map((l) => [l[0].split(a).slice(-1).join(a), l[1]]);
+        const s = i.map((l) => l[0]);
+        s.length > new Set(s).size && c.warn(
           "需要缓存的路径重复请合理设置组件key,保证在当前ApKeepAlive模块下唯一",
-          a
-        ), d.set(u.value, new Map(i)), r.debug && c.log(
+          s
+        ), d.set(u.value, new Map(i)), o.debug && c.log(
           "[ loadDataInVNode ] >",
           g.vnode.key,
           u.value,
@@ -128,21 +128,21 @@ const c = console, s = "|", te = j({
       trailing: !1
     });
     return L(() => {
-      if (r.debug) {
-        A(() => {
-          p();
-        }), r.debug && c.log("[ onBeforeUnmount ] >");
+      if (o.debug) {
+        c.log("[ onBeforeUnmount ] >"), A(() => {
+          y();
+        });
         return;
       }
-      p();
+      y();
     }), O(() => {
-      if (r.debug) {
-        A(() => {
-          p();
-        }), r.debug && c.log("[ onBeforeUpdate ] >");
+      if (o.debug) {
+        c.log("[ onBeforeUpdate ] >"), A(() => {
+          y();
+        });
         return;
       }
-      p();
+      y();
     }), $(d, u), () => {
       var e;
       return (e = h.default) == null ? void 0 : e.call(h);

package/es/src/business/ap-keep-alive/keeper/index.mjs

@@ -21,6 +21,7 @@ const w = {
   ApRadioGroup: a,
   EditableGrid: f,
   ASteps: d
+  // AFormItem: formItemKeeper
 };
 export {
   w as default