@dazhicheng/ui 1.6.17 → 1.6.18

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

@@ -1,7 +1,7 @@
-import { unref as V, ref as n, computed as N, watch as k } from "vue";
+import { unref as V, ref as n, shallowRef as N, computed as O, watch as j, toRaw as k } from "vue";
 import "axios";
 import "element-plus";
-import { isFunction as o, isBoolean as E, isString as S } from "../../../../packages/utils/src/is.js";
+import { isFunction as o, isBoolean as E, isObject as A, isString as q } from "../../../../packages/utils/src/is.js";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -13,76 +13,76 @@ 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 A } from "es-toolkit/compat";
-import { useFormValues as B } from "vee-validate";
-import { injectFormProps as C } from "../useFormContext.js";
-const K = /* @__PURE__ */ new Set(["ElInput", "FormElInput", "ElInputNumber", "ElInputTag", "ElMention"]);
-function ir(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";
+import { get as B } from "es-toolkit/compat";
+import { useFormValues as C } from "vee-validate";
+import { injectFormProps as K } from "../useFormContext.js";
+const M = /* @__PURE__ */ new Set(["ElInput", "FormElInput", "ElInputNumber", "ElInputTag", "ElMention"]);
+function ar(r) {
+  const t = q(r) ? r : (r == null ? void 0 : r.name) ?? (r == null ? void 0 : r.__name);
+  return q(t) && M.has(t) ? "required" : "selectRequired";
 }
-function M(r, e) {
-  if (e.startsWith("[") && e.endsWith("]")) {
-    const w = e.slice(1, -1);
-    return r[w];
+function W(r, t) {
+  if (t.startsWith("[") && t.endsWith("]")) {
+    const p = t.slice(1, -1);
+    return r[p];
   }
-  return A(r, e);
+  return B(r, t);
 }
-function ur(r) {
+function or(r) {
   var x;
-  const e = B(), [w] = C(), u = V(w).formApi;
-  if (!e)
+  const t = C(), [p] = K(), s = V(p).formApi;
+  if (!t)
     throw new Error("useDependencies should be used within <TtForm>");
-  const l = n(!0), f = n(!1), m = n(!0), g = n(!1), h = n({}), F = n(), _ = N(() => {
+  const l = n(!0), f = n(!1), m = n(!0), g = n(!1), h = n({}), F = N(), S = O(() => {
     var i;
-    return (((i = r()) == null ? void 0 : i.triggerFields) ?? []).map((d) => M(e.value, d));
+    return (((i = r()) == null ? void 0 : i.triggerFields) ?? []).map((d) => W(t.value, d));
   });
   let I = 0;
-  return k(
-    [_, r],
-    async ([b, i]) => {
-      var R;
-      if (!i || !((R = i == null ? void 0 : i.triggerFields) != null && R.length))
+  return j(
+    [S, r],
+    async ([_, i]) => {
+      var b;
+      if (!i || !((b = i == null ? void 0 : i.triggerFields) != null && b.length))
         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;
+      const d = ++I, u = () => d !== I, { componentProps: R, disabled: v, if: c, required: y, rules: P, show: w, trigger: T } = i, a = t.value;
       if (o(c)) {
-        const t = !!await c(a, u);
-        if (s() || (l.value = t, !l.value)) return;
+        const e = !!await c(a, s);
+        if (u() || (l.value = e, !l.value)) return;
       } else if (E(c)) {
         if (l.value = c, !l.value) return;
       } else
         l.value = !0;
-      if (o(p)) {
-        const t = !!await p(a, u);
-        if (s()) return;
-        m.value = t;
-      } else E(p) ? m.value = p : m.value = !0;
-      if (o(y)) {
-        const t = await y(a, u);
-        if (s()) return;
-        h.value = t;
+      if (o(w)) {
+        const e = !!await w(a, s);
+        if (u()) return;
+        m.value = e;
+      } else E(w) ? m.value = w : m.value = !0;
+      if (o(R)) {
+        const e = await R(a, s);
+        if (u()) return;
+        h.value = e;
       } else
         h.value = {};
-      if (o(T)) {
-        const t = await T(a, u);
-        if (s()) return;
-        F.value = t;
+      if (o(P)) {
+        const e = await P(a, s);
+        if (u()) return;
+        F.value = A(e) ? k(e) : e;
       } else
         F.value = void 0;
       if (o(v)) {
-        const t = !!await v(a, u);
-        if (s()) return;
-        f.value = t;
+        const e = !!await v(a, s);
+        if (u()) return;
+        f.value = e;
       } else E(v) ? f.value = v : f.value = !1;
-      if (o(P)) {
-        const t = !!await P(a, u);
-        if (s()) return;
-        g.value = t;
+      if (o(y)) {
+        const e = !!await y(a, s);
+        if (u()) return;
+        g.value = e;
       } else
         g.value = !1;
-      if (o(q)) {
-        if (s()) return;
-        await q(a, u);
+      if (o(T)) {
+        if (u()) return;
+        await T(a, s);
       }
     },
     { deep: !0, immediate: ((x = r()) == null ? void 0 : x.immediate) ?? !0 }
@@ -96,7 +96,7 @@ function ur(r) {
   };
 }
 export {
-  ur as default,
-  ir as resolveRequiredRuleName,
-  M as resolveValueByFieldName
+  or as default,
+  ar as resolveRequiredRuleName,
+  W as resolveValueByFieldName
 };

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

@@ -1,33 +1,33 @@
-import { defineComponent as ee, useSlots as oe, computed as n, createBlock as C, openBlock as p, resolveDynamicComponent as D, normalizeProps as re, guardReactiveProps as te, withCtx as g, createElementVNode as le, normalizeClass as y, createElementBlock as f, renderSlot as d, Fragment as v, renderList as M, unref as b, mergeProps as R, createSlots as se } from "vue";
+import { defineComponent as ee, useSlots as oe, computed as n, toRaw as re, createBlock as v, openBlock as p, resolveDynamicComponent as D, normalizeProps as te, guardReactiveProps as le, withCtx as g, createElementVNode as se, normalizeClass as y, createElementBlock as d, renderSlot as c, Fragment as b, renderList as M, unref as R, mergeProps as w, createSlots as ne } from "vue";
 import "../components/Slot.js";
 import "axios";
 import "element-plus";
-import { isString as ne, isFunction as ae } from "../../../../packages/utils/src/is.js";
+import { isString as ae, isFunction as pe } from "../../../../packages/utils/src/is.js";
 import "dayjs";
 import "numeral";
-import { clnm as w } from "../../../../packages/utils/src/tool.js";
-import { mergeWithArrayOverride as pe } from "../../../../packages/utils/src/merge.js";
+import { clnm as F } from "../../../../packages/utils/src/tool.js";
+import { mergeWithArrayOverride as me } from "../../../../packages/utils/src/merge.js";
 import "../../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
 import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
 import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
 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 { Form as me } from "vee-validate";
+import { Form as ie } from "vee-validate";
 import "../../../tt-form-item-error-tooltip/index.js";
 import "../../../tt-icon/index.js";
 import "@vueuse/core";
 /* empty css                          */
 import "../form/RenderContent.vue.js";
-import { provideFormRenderProps as ie } from "./context.js";
-import { useExpandable as ue } from "./expandable.js";
-import { FORM_RENDER_DEFAULT_WRAPPER_CLASS as fe, getFormRootWrapperClass as de } from "./rootWrapperClass.js";
-import { FieldRenderer as ce } from "./FormFieldContact.js";
-import { getBaseRules as Ce, getDefaultValueInZodStack as ge } from "./helper.js";
+import { provideFormRenderProps as ue } from "./context.js";
+import { useExpandable as fe } from "./expandable.js";
+import { FORM_RENDER_DEFAULT_WRAPPER_CLASS as de, getFormRootWrapperClass as ce } from "./rootWrapperClass.js";
+import { FieldRenderer as Ce } from "./FormFieldContact.js";
+import { getBaseRules as ve, getDefaultValueInZodStack as ge } from "./helper.js";
 import "../../../../node_modules/.pnpm/vue-types@5.1.3_vue@3.5.21_typescript@5.9.3_/node_modules/vue-types/shim/index.modern.js";
 import { useDesign as ye } from "../../../../packages/hooks/src/useDesign.js";
 import "vue-router";
-const He = /* @__PURE__ */ ee({
+const Je = /* @__PURE__ */ ee({
   name: "FormRender",
   __name: "form",
   props: {
@@ -44,57 +44,58 @@ const He = /* @__PURE__ */ ee({
     layout: {},
     schema: {},
     showCollapseButton: { type: Boolean, default: !1 },
-    wrapperClass: { default: fe },
+    wrapperClass: { default: de },
     globalCommonConfig: { default: () => ({}) }
   },
   emits: ["submit"],
   setup(A, { expose: T, emit: W }) {
-    const r = A, F = W, z = oe(), V = n(
-      () => de({
+    const r = A, P = W, z = oe(), V = n(
+      () => ce({
         layout: r.layout,
         compact: r.compact,
         wrapperClass: r.wrapperClass
       })
     );
-    ie(r);
-    const { prefixCls: P } = ye("form-render"), u = r.form;
+    ue(r);
+    const { prefixCls: _ } = ye("form-render"), f = r.form;
     function i(e) {
       return e && e.type === "slot";
     }
     function Z(e) {
       return !i(e) && !e.useArraySchema;
     }
-    const _ = n(() => ({
-      values: (u == null ? void 0 : u.values) ?? {},
-      formActions: u
-    })), { isCalculated: q, keepFormItemIndex: h, wrapperRef: k } = ue(r), j = n(() => {
+    const k = n(() => ({
+      values: (f == null ? void 0 : f.values) ?? {},
+      formActions: f
+    })), { isCalculated: q, keepFormItemIndex: j, wrapperRef: I } = fe(r), U = n(() => {
       const e = [];
       return (r.schema || []).forEach((a) => {
+        var u;
         if (i(a)) return;
-        const { fieldName: o } = a, l = a.rules;
+        const { fieldName: o } = a, t = a.rules ? re(a.rules) : void 0;
         let s = "";
-        l && !ne(l) && (s = l.def.type);
-        const m = Ce(l);
+        t && !ae(t) && (s = ((u = t.def) == null ? void 0 : u.type) ?? "");
+        const m = t ? ve(t) : null;
         e.push({
-          default: ge(l),
+          default: t ? ge(t) : void 0,
           fieldName: o,
           required: !["ZodNullable", "ZodOptional"].includes(s),
           rules: m
         });
       }), e;
-    }), U = n(() => r.form ? "form" : me), G = n(() => r.form ? {
-      onSubmit: r.form.handleSubmit((e) => F("submit", e))
+    }), h = n(() => r.form ? "form" : ie), G = n(() => r.form ? {
+      onSubmit: r.form.handleSubmit((e) => P("submit", e))
     } : {
-      onSubmit: (e) => F("submit", e)
+      onSubmit: (e) => P("submit", e)
     }), H = n(() => r.collapsed && q.value), J = n(() => {
       const {
         colon: e = !1,
         componentProps: a = {},
         controlClass: o = "",
-        disabled: l,
+        disabled: t,
         disabledOnChangeListener: s = !0,
         disabledOnInputListener: m = !0,
-        emptyStateValue: I = void 0,
+        emptyStateValue: u = void 0,
         formFieldProps: B = {},
         formItemClass: Q = "",
         hideLabel: S = !1,
@@ -103,17 +104,17 @@ const He = /* @__PURE__ */ ee({
         labelWidth: $ = 70,
         modelPropName: x = "",
         wrapperClass: X = ""
-      } = pe(r.commonConfig, r.globalCommonConfig);
+      } = me(r.commonConfig, r.globalCommonConfig);
       let L = 0;
-      return (r.schema || []).map((t) => {
-        if (i(t)) return t;
-        if (!Z(t))
+      return (r.schema || []).map((l) => {
+        if (i(l)) return l;
+        if (!Z(l))
           return {
             colon: e,
-            disabled: l,
+            disabled: t,
             disabledOnChangeListener: s,
             disabledOnInputListener: m,
-            emptyStateValue: I,
+            emptyStateValue: u,
             hideLabel: S,
             hideRequiredMark: E,
             labelWidth: $,
@@ -122,82 +123,82 @@ const He = /* @__PURE__ */ ee({
             controlClass: o,
             formFieldProps: B,
             labelClass: N,
-            ...t
+            ...l
           };
-        const O = h.value, Y = r.showCollapseButton && H.value && O ? O <= L : !1;
+        const O = j.value, Y = r.showCollapseButton && H.value && O ? O <= L : !1;
         L++;
-        let c = t.formItemClass;
-        if (ae(t.formItemClass))
+        let C = l.formItemClass;
+        if (pe(l.formItemClass))
           try {
-            c = t.formItemClass();
+            C = l.formItemClass();
           } catch {
-            c = "";
+            C = "";
           }
         return {
           colon: e,
-          disabled: l,
+          disabled: t,
           disabledOnChangeListener: s,
           disabledOnInputListener: m,
-          emptyStateValue: I,
+          emptyStateValue: u,
           hideLabel: S,
           hideRequiredMark: E,
           labelWidth: $,
           modelPropName: x,
           wrapperClass: X,
-          ...t,
+          ...l,
           commonComponentProps: a,
-          componentProps: t.componentProps,
-          controlClass: w(o, t.controlClass),
+          componentProps: l.componentProps,
+          controlClass: F(o, l.controlClass),
           formFieldProps: {
             ...B,
-            ...t.formFieldProps
+            ...l.formFieldProps
           },
-          formItemClass: w("flex-shrink-0", { hidden: Y }, Q, c),
-          labelClass: w(N, t.labelClass)
+          formItemClass: F("flex-shrink-0", { hidden: Y }, Q, C),
+          labelClass: F(N, l.labelClass)
         };
       });
     }), K = n(() => Object.keys(z).filter((e) => e !== "default"));
     return T({
-      wrapperRef: n(() => k.value)
-    }), (e, a) => (p(), C(D(U.value), re(te(G.value)), {
+      wrapperRef: n(() => I.value)
+    }), (e, a) => (p(), v(D(h.value), te(le(G.value)), {
       default: g(() => [
-        le("div", {
+        se("div", {
           ref_key: "wrapperRef",
-          ref: k,
+          ref: I,
           class: y(V.value)
         }, [
-          (p(!0), f(v, null, M(J.value, (o, l) => (p(), f(v, {
-            key: i(o) ? `slot-${l}` : o.fieldName
+          (p(!0), d(b, null, M(J.value, (o, t) => (p(), d(b, {
+            key: i(o) ? `slot-${t}` : o.fieldName
           }, [
-            i(o) ? (p(), f(v, { key: 0 }, [
-              typeof o.content == "string" ? (p(), f("div", {
+            i(o) ? (p(), d(b, { key: 0 }, [
+              typeof o.content == "string" ? (p(), d("div", {
                 key: 0,
-                class: y([`${b(P)}__slot`, o.wrapperClass])
+                class: y([`${R(_)}__slot`, o.wrapperClass])
               }, [
-                d(e.$slots, o.content, R({ ref_for: !0 }, _.value))
-              ], 2)) : (p(), C(D(o.content(_.value)), {
+                c(e.$slots, o.content, w({ ref_for: !0 }, k.value))
+              ], 2)) : (p(), v(D(o.content(k.value)), {
                 key: 1,
-                class: y([`${b(P)}__slot`, o.wrapperClass])
+                class: y([`${R(_)}__slot`, o.wrapperClass])
               }, null, 8, ["class"]))
-            ], 64)) : (p(), C(b(ce), {
+            ], 64)) : (p(), v(R(Ce), {
               key: 1,
               "field-config": o,
               rules: o.rules
-            }, se({
+            }, ne({
               default: g((s) => [
-                d(e.$slots, o.fieldName, R({ ref_for: !0 }, s))
+                c(e.$slots, o.fieldName, w({ ref_for: !0 }, s))
               ]),
               _: 2
             }, [
               M(K.value, (s) => ({
                 name: s,
                 fn: g((m) => [
-                  d(e.$slots, s, R({ ref_for: !0 }, m))
+                  c(e.$slots, s, w({ ref_for: !0 }, m))
                 ])
               }))
             ]), 1032, ["field-config", "rules"]))
           ], 64))), 128)),
-          d(e.$slots, "default", { shapes: j.value })
+          c(e.$slots, "default", { shapes: U.value })
         ], 2)
       ]),
       _: 3
@@ -205,5 +206,5 @@ const He = /* @__PURE__ */ ee({
   }
 });
 export {
-  He as default
+  Je as default
 };

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

@@ -1,7 +1,7 @@
+import { toRaw as i } from "vue";
 import "axios";
 import "element-plus";
-import { isObject as f, isString as n } from "../../../../packages/utils/src/is.js";
-import "vue";
+import { isObject as p, isString as o } from "../../../../packages/utils/src/is.js";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -13,24 +13,28 @@ 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";
-function r(t) {
-  return !t || n(t) ? null : "innerType" in t.def ? r(t.def.innerType) : "schema" in t.def ? r(t.def.schema) : t;
+function n(e) {
+  if (!e || o(e)) return null;
+  const r = i(e);
+  return r.def ? "innerType" in r.def ? n(i(r.def.innerType)) : "schema" in r.def ? n(i(r.def.schema)) : r : r;
 }
-function i(t) {
-  if (!t || n(t))
+function f(e) {
+  if (!e || o(e))
     return;
-  const e = t;
-  if (e.def.type === "default") return e.def.defaultValue;
-  if ("innerType" in e.def)
-    return i(e.def.innerType);
-  if ("schema" in e.def)
-    return i(e.def.schema);
+  const t = i(e);
+  if (t.def) {
+    if (t.def.type === "default") return t.def.defaultValue;
+    if ("innerType" in t.def)
+      return f(i(t.def.innerType));
+    if ("schema" in t.def)
+      return f(i(t.def.schema));
+  }
 }
-function v(t) {
-  return !t || !f(t) ? !1 : Reflect.has(t, "target") && Reflect.has(t, "stopPropagation");
+function v(e) {
+  return !e || !p(e) ? !1 : Reflect.has(e, "target") && Reflect.has(e, "stopPropagation");
 }
 export {
-  r as getBaseRules,
-  i as getDefaultValueInZodStack,
+  n as getBaseRules,
+  f as getDefaultValueInZodStack,
   v as isEventObjectLike
 };