@dazhicheng/ui 1.5.224 → 1.5.225

package/dist/components/tt-form/src/form-render/dependencies.js

@@ -1,7 +1,7 @@
-import { ref as n, computed as V, watch as N } from "vue";
+import { unref as V, ref as n, computed as N, watch as k } from "vue";
 import "axios";
 import "element-plus";
-import { isFunction as o, isBoolean as F, isString as S } from "../../../../packages/utils/src/is.js";
+import { isFunction as l, isBoolean as E, isString as S } from "../../../../packages/utils/src/is.js";
 import "xe-utils";
 import "dayjs";
 import "dayjs/plugin/utc";
@@ -12,90 +12,90 @@ import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/en
 import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
 import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
 import "lodash-es";
-import { get as k } from "es-toolkit/compat";
+import { get as A } from "es-toolkit/compat";
 import { useFormValues as B } from "vee-validate";
-import { injectRenderFormProps as C } from "./context.js";
+import { injectFormProps as C } from "../useFormContext.js";
 const K = /* @__PURE__ */ new Set(["ElInput", "FormElInput", "ElInputNumber", "ElInputTag", "ElMention"]);
-function er(r) {
+function tr(r) {
   const e = S(r) ? r : (r == null ? void 0 : r.name) ?? (r == null ? void 0 : r.__name);
   return S(e) && K.has(e) ? "required" : "selectRequired";
 }
 function M(r, e) {
   if (e.startsWith("[") && e.endsWith("]")) {
-    const E = e.slice(1, -1);
-    return r[E];
+    const w = e.slice(1, -1);
+    return r[w];
   }
-  return k(r, e);
+  return A(r, e);
 }
-function tr(r) {
-  var R;
-  const e = B(), s = C().form;
+function ir(r) {
+  var x;
+  const e = B(), [w] = C(), u = V(w).formApi;
   if (!e)
     throw new Error("useDependencies should be used within <TtForm>");
-  const l = n(!0), f = n(!1), m = n(!0), w = n(!1), g = n({}), d = n(), _ = V(() => {
+  const o = n(!0), f = n(!1), m = n(!0), g = n(!1), h = n({}), F = n(), _ = N(() => {
     var i;
-    return (((i = r()) == null ? void 0 : i.triggerFields) ?? []).map((h) => M(e.value, h));
+    return (((i = r()) == null ? void 0 : i.triggerFields) ?? []).map((d) => M(e.value, d));
   });
   let I = 0;
-  return N(
+  return k(
     [_, r],
     async ([b, i]) => {
-      var q;
-      if (!i || !((q = i == null ? void 0 : i.triggerFields) != null && q.length))
+      var R;
+      if (!i || !((R = i == null ? void 0 : i.triggerFields) != null && R.length))
         return;
-      const h = ++I, u = () => h !== I, { componentProps: x, disabled: v, if: c, required: P, rules: y, show: p, trigger: T } = i, a = e.value;
-      if (o(c)) {
-        const t = !!await c(a, s);
-        if (u() || (l.value = t, !l.value)) return;
-      } else if (F(c)) {
-        if (l.value = c, !l.value) return;
+      const d = ++I, s = () => d !== I, { componentProps: y, disabled: v, if: c, required: P, rules: T, show: p, trigger: q } = i, a = e.value;
+      if (l(c)) {
+        const t = !!await c(a, u);
+        if (s() || (o.value = t, !o.value)) return;
+      } else if (E(c)) {
+        if (o.value = c, !o.value) return;
       } else
-        l.value = !0;
-      if (o(p)) {
-        const t = !!await p(a, s);
-        if (u()) return;
+        o.value = !0;
+      if (l(p)) {
+        const t = !!await p(a, u);
+        if (s()) return;
         m.value = t;
-      } else F(p) ? m.value = p : m.value = !0;
-      if (o(x)) {
-        const t = await x(a, s);
-        if (u()) return;
-        g.value = t;
+      } else E(p) ? m.value = p : m.value = !0;
+      if (l(y)) {
+        const t = await y(a, u);
+        if (s()) return;
+        h.value = t;
       } else
-        g.value = {};
-      if (o(y)) {
-        const t = await y(a, s);
-        if (u()) return;
-        d.value = t;
+        h.value = {};
+      if (l(T)) {
+        const t = await T(a, u);
+        if (s()) return;
+        F.value = t;
       } else
-        d.value = void 0;
-      if (o(v)) {
-        const t = !!await v(a, s);
-        if (u()) return;
+        F.value = void 0;
+      if (l(v)) {
+        const t = !!await v(a, u);
+        if (s()) return;
         f.value = t;
-      } else F(v) ? f.value = v : f.value = !1;
-      if (o(P)) {
-        const t = !!await P(a, s);
-        if (u()) return;
-        w.value = t;
+      } else E(v) ? f.value = v : f.value = !1;
+      if (l(P)) {
+        const t = !!await P(a, u);
+        if (s()) return;
+        g.value = t;
       } else
-        w.value = !1;
-      if (o(T)) {
-        if (u()) return;
-        await T(a, s);
+        g.value = !1;
+      if (l(q)) {
+        if (s()) return;
+        await q(a, u);
       }
     },
-    { deep: !0, immediate: ((R = r()) == null ? void 0 : R.immediate) ?? !0 }
+    { deep: !0, immediate: ((x = r()) == null ? void 0 : x.immediate) ?? !0 }
   ), {
-    dynamicComponentProps: g,
-    dynamicRules: d,
+    dynamicComponentProps: h,
+    dynamicRules: F,
     isDisabled: f,
-    isIf: l,
-    isRequired: w,
+    isIf: o,
+    isRequired: g,
     isShow: m
   };
 }
 export {
-  tr as default,
-  er as resolveRequiredRuleName,
+  ir as default,
+  tr as resolveRequiredRuleName,
   M as resolveValueByFieldName
 };

package/dist/components/tt-form/src/form-render/form.vue.d.ts

@@ -27,7 +27,7 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_Props, {
     onSubmit?: ((event: any) => any) | undefined;
 }>, {
     collapsedRows: number;
-    commonConfig: FormCommonConfig;
+    commonConfig: FormCommonConfig<Record<string, any>>;
     showCollapseButton: boolean;
     wrapperClass: import('../types').WrapperClassType;
     globalCommonConfig: FormCommonConfig;

package/dist/components/tt-form/src/formApi.d.ts

@@ -35,7 +35,7 @@ export declare class FormApi {
      */
     getFocusedField(): string | undefined;
     getLatestSubmissionValues(): Recordable<any>;
-    getState(): TtFormProps<keyof import('./types').BaseFormComponentMap> | null;
+    getState(): TtFormProps<Record<string, any>> | null;
     getValues<T = Recordable<any>>(): Promise<T>;
     isFieldValid(fieldName: string): Promise<boolean>;
     merge(formApi: FormApi): any;

package/dist/components/tt-form/src/group-form/GroupForm.vue.d.ts

@@ -32,7 +32,7 @@ declare const __VLS_component: import('vue').DefineComponent<GroupFormSectionPro
     whenAllRendered: typeof whenAllRendered;
     navItems: import('vue').ComputedRef<NavAnchorItem[]>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<GroupFormSectionProps> & Readonly<{}>, {
-    commonConfig: import('../types').FormCommonConfig;
+    commonConfig: import('../types').FormCommonConfig<Record<string, any>>;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     scrollRef: HTMLDivElement;
 }, any>;

package/dist/components/tt-form/src/group-form/GroupForm.vue2.js

@@ -53,18 +53,18 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
   },
   setup(Y, { expose: $ }) {
     var k;
-    const { prefixCls: A } = Te("group-form"), g = Y, h = se(), i = g.formApi, c = Oe();
+    const { prefixCls: A } = Te("group-form"), g = Y, h = se(), s = g.formApi, c = Oe();
     _(Ne, c), _(He, (e) => {
-      e.type === "group" ? i.setGroupVisible(e.key, e.visible) : i.setFieldsVisible(e.fieldNames, e.visible);
-    }), _(Pe, i.hiddenGroupKeys);
-    const { collapseStates: B } = i, f = g.formApi.useStore(), r = Re(g, f), M = /* @__PURE__ */ new Map(), U = a(
+      e.type === "group" ? s.setGroupVisible(e.key, e.visible) : s.setFieldsVisible(e.fieldNames, e.visible);
+    }), _(Pe, s.hiddenGroupKeys);
+    const { collapseStates: B } = s, p = g.formApi.useStore(), r = Re(g, p), M = /* @__PURE__ */ new Map(), U = a(
       () => ({
         ...r.value,
-        schema: f.value.schema
+        schema: p.value.schema
       })
-    ), { form: u } = Ae(U);
-    Be([r, u]);
-    const b = a(() => f.value.groupSchema ?? []), q = a(() => ({
+    ), { form: f } = Ae(U);
+    Be([r, f]);
+    const b = a(() => p.value.groupSchema ?? []), q = a(() => ({
       collapseStates: B,
       commonConfig: r.value.commonConfig,
       globalCommonConfig: Se,
@@ -77,15 +77,15 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
       estimateFieldHeight: r.value.estimateFieldHeight
     }));
     Fe({
-      schema: f.value.schema,
+      schema: p.value.schema,
       commonConfig: r.value.commonConfig,
       componentMap: _e,
       componentBindEventMap: Ee,
-      form: u,
+      form: f,
       layout: r.value.layout,
       compact: r.value.compact,
       wrapperClass: r.value.wrapperClass
-    }), Me(M), g.formApi.mount(u, M);
+    }), Me(M), g.formApi.mount(f, M);
     const v = ie("scrollRef"), y = a(() => {
       const e = r.value.containerHeight;
       return e !== "100%" && e !== void 0;
@@ -98,13 +98,13 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
       };
     });
     function W(e) {
-      i.toggleCollapse(e);
+      s.toggleCollapse(e);
     }
     function j(e) {
       const o = [];
       for (const t of e)
         if (Ie(t)) {
-          const n = t.title, l = ye(n) ? () => n(u.values, u) : n;
+          const n = t.title, l = ye(n) ? () => n(f.values, s) : n;
           o.push({ key: t.key, title: l });
         }
       return o;
@@ -117,8 +117,8 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
       })
     ), N = a(() => ({
       ...r.value.navAnchorProps ?? {},
-      badgeCounts: i.navErrorCounts
-    })), O = a(() => N.value.show ?? !1), S = a(() => O.value ? j(b.value).filter((e) => !i.hiddenGroupKeys.has(e.key)) : []), Q = a(() => {
+      badgeCounts: s.navErrorCounts
+    })), O = a(() => N.value.show ?? !1), S = a(() => O.value ? j(b.value).filter((e) => !s.hiddenGroupKeys.has(e.key)) : []), Q = a(() => {
       const { show: e, ...o } = N.value;
       return { ...o, items: S.value };
     }), E = ce(((k = S.value[0]) == null ? void 0 : k.key) || "");
@@ -126,7 +126,7 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
       var o;
       return ((o = h[`nav-description-${e.row.key}`]) == null ? void 0 : o.call(h, {
         row: e.row,
-        values: u.values
+        values: f.values
       })) ?? [];
     }
     function Z() {
@@ -163,14 +163,14 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
       e ? e.scrollTo({ top: n, behavior: t }) : window.scrollTo({ top: n, behavior: t });
     }
     function G(e) {
-      const o = v.value, t = f.value.scrollOffset ?? 0, n = ee(e) || o, l = n && n.scrollHeight > n.clientHeight ? n : null, s = l ?? document.documentElement, m = H(e, l, t);
-      P(l, m, "smooth");
+      const o = v.value, t = p.value.scrollOffset ?? 0, n = ee(e) || o, l = n && n.scrollHeight > n.clientHeight ? n : null, i = l ?? document.documentElement, u = H(e, l, t);
+      P(l, u, "smooth");
       let d = !1;
-      const p = () => {
-        d || (d = !0, s.removeEventListener("scrollend", p), clearTimeout(C), c.resume(), r.value.virtual && te(e, l, t));
+      const m = () => {
+        d || (d = !0, i.removeEventListener("scrollend", m), clearTimeout(C), c.resume(), r.value.virtual && te(e, l, t));
       };
-      s.addEventListener("scrollend", p, { once: !0 });
-      const C = setTimeout(p, 800);
+      i.addEventListener("scrollend", m, { once: !0 });
+      const C = setTimeout(m, 800);
     }
     function I(e) {
       c.pause(), R(() => {
@@ -194,27 +194,27 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
     }
     function te(e, o, t) {
       const n = o ?? document.documentElement;
-      let l, s;
-      function m() {
-        p.disconnect(), clearTimeout(l), cancelAnimationFrame(s);
+      let l, i;
+      function u() {
+        m.disconnect(), clearTimeout(l), cancelAnimationFrame(i);
       }
       function d() {
-        clearTimeout(l), l = setTimeout(m, Ve);
+        clearTimeout(l), l = setTimeout(u, Ve);
       }
-      const p = new ResizeObserver(() => {
+      const m = new ResizeObserver(() => {
         if (!e.isConnected) {
-          m();
+          u();
           return;
         }
-        cancelAnimationFrame(s), s = requestAnimationFrame(() => {
+        cancelAnimationFrame(i), i = requestAnimationFrame(() => {
           const C = H(e, o, t), le = o ? o.scrollTop : window.scrollY;
           Math.abs(C - le) > Le && P(o, C, "instant");
         }), d();
       });
-      p.observe(n), d();
+      m.observe(n), d();
     }
     function re(e) {
-      E.value = e, B[e] && i.toggleCollapse(e), I(e);
+      E.value = e, B[e] && s.toggleCollapse(e), I(e);
     }
     async function ne() {
       c.resume(), await c.whenAllSettled(), await R(), await new Promise((e) => requestAnimationFrame(() => e()));
@@ -235,10 +235,10 @@ const Le = 5, Ve = 500, po = /* @__PURE__ */ ae({
             key: w(Ge)(t, n),
             schema: t
           }, { ref_for: !0 }, q.value, { onToggleCollapse: W }), ve({ _: 2 }, [
-            x(w(h), (l, s) => ({
-              name: s,
-              fn: de((m) => [
-                ge(e.$slots, s, F({ ref_for: !0 }, m || {}))
+            x(w(h), (l, i) => ({
+              name: i,
+              fn: de((u) => [
+                ge(e.$slots, i, F({ ref_for: !0 }, u || {}))
               ])
             }))
           ]), 1040, ["schema"]))), 128))