@nocobase/client 1.5.0-beta.13 → 1.5.0-beta.14

package/es/index.mjs

@@ -19809,19 +19809,13 @@ const useDateVariable = ({ operator: e, schema: t, noDisabled: n }) => {
     /** 变量的值 */
     currentUserCtx: (c = a == null ? void 0 : a.data) == null ? void 0 : c.data
   };
-}, useCurrentFormData = () => {
-  var t, n;
-  const e = useDataBlockRequestData();
-  if (!(((t = e == null ? void 0 : e.data) == null ? void 0 : t.length) > 1))
-    return ((n = e == null ? void 0 : e.data) == null ? void 0 : n[0]) || (e == null ? void 0 : e.data);
 }, useCurrentFormContext = ({ form: e } = {}) => {
-  var i;
-  const { form: t } = useFormBlockContext(), n = useCurrentFormData(), { isVariableParsedInOtherContext: o } = useFlag(), r = e || t;
+  const { form: t } = useFormBlockContext(), { isVariableParsedInOtherContext: n } = useFlag(), o = e || t;
   return {
     /** 变量值 */
-    currentFormCtx: (r == null ? void 0 : r.readPretty) === !1 && (r != null && r.values) && ((i = Object.keys(r == null ? void 0 : r.values)) != null && i.length) ? r == null ? void 0 : r.values : n || (r == null ? void 0 : r.values),
+    currentFormCtx: o == null ? void 0 : o.values,
     /** 用来判断是否可以显示`当前表单`变量 */
-    shouldDisplayCurrentForm: r && !r.readPretty && !o
+    shouldDisplayCurrentForm: o && !o.readPretty && !n
   };
 }, useCurrentFormVariable = ({
   collectionField: e,
@@ -34809,7 +34803,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.0-beta.13", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.0-beta.14", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -34831,9 +34825,9 @@ const name = "@nocobase/client", version = "1.5.0-beta.13", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.0-beta.13",
-  "@nocobase/sdk": "1.5.0-beta.13",
-  "@nocobase/utils": "1.5.0-beta.13",
+  "@nocobase/evaluators": "1.5.0-beta.14",
+  "@nocobase/sdk": "1.5.0-beta.14",
+  "@nocobase/utils": "1.5.0-beta.14",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -36445,45 +36439,49 @@ const useFormBlockHeight = () => {
     n["x-linkage-rules"] && (t = n["x-linkage-rules"]);
   }), t;
 }, WithForm = (e) => {
-  var c, u;
-  const { form: t } = e, n = useFieldSchema(), { setFormValueChanged: o } = useActionContext(), r = useVariables$1(), i = useLocalVariables$1({ currentForm: t }), { templateFinished: a } = useTemplateBlockContext(), l = ((u = getLinkageRules(n) || ((c = n.parent) == null ? void 0 : c["x-linkage-rules"])) == null ? void 0 : u.filter((d) => !d.disabled)) || [];
+  var u, d;
+  const { form: t } = e, n = useFieldSchema(), { setFormValueChanged: o } = useActionContext(), r = useVariables$1(), i = useLocalVariables$1({ currentForm: t }), { templateFinished: a } = useTemplateBlockContext(), { loading: l } = useDataBlockRequest() || {}, c = ((d = getLinkageRules(n) || ((u = n.parent) == null ? void 0 : u["x-linkage-rules"])) == null ? void 0 : d.filter((p) => !p.disabled)) || [];
   return useEffect(() => {
-    const d = uid();
-    return t.addEffects(d, () => {
+    const p = uid();
+    return t.addEffects(p, () => {
       onFormInputChange(() => {
         o == null || o(!0);
       });
     }), e.disabled && (t.disabled = e.disabled), () => {
-      t.removeEffects(d);
+      t.removeEffects(p);
     };
   }, [t, e.disabled, o]), useEffect(() => {
-    const d = uid(), p = [];
-    return t.addEffects(d, () => {
-      forEachLinkageRule(l, (m, h) => {
-        var g;
-        if ((g = m.targetFields) != null && g.length) {
-          const f = m.targetFields.join(",");
-          onFieldInit(`*(${f})`, (C, b) => {
-            p.push(
-              bindLinkageRulesToFiled({
-                field: C,
-                linkageRules: l,
-                formValues: b.values,
-                localVariables: i,
-                action: m,
-                rule: h,
-                variables: r
-              })
-            );
-          });
-        }
+    if (l)
+      return;
+    const p = uid(), m = [];
+    return setTimeout(() => {
+      t.addEffects(p, () => {
+        forEachLinkageRule(c, (h, g) => {
+          var f;
+          if ((f = h.targetFields) != null && f.length) {
+            const C = h.targetFields.join(",");
+            onFieldInit(`*(${C})`, (b, S) => {
+              m.push(
+                bindLinkageRulesToFiled({
+                  field: b,
+                  linkageRules: c,
+                  formValues: S.values,
+                  localVariables: i,
+                  action: h,
+                  rule: g,
+                  variables: r
+                })
+              );
+            });
+          }
+        });
       });
     }), () => {
-      t.removeEffects(d), p.forEach((m) => {
-        m();
+      t.removeEffects(p), m.forEach((h) => {
+        h();
       });
     };
-  }, [l, a]), n["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
+  }, [c, a, l]), n["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
 }, WithoutForm = (e) => {
   const t = useFieldSchema(), { setFormValueChanged: n } = useActionContext(), o = useMemo(
     () => createForm({

package/es/schema-component/common/utils/uitls.d.ts

@@ -29,11 +29,5 @@ export declare const conditionAnalyses: ({ ruleGroup, variables, localVariables,
      */
     variableNameOfLeftCondition?: string;
 }) => Promise<boolean>;
-/**
- * 转化成变量字符串，方便解析出值
- * @param targetField
- * @returns
- */
-export declare function targetFieldToVariableString(targetField: string[], variableName?: string): string;
 export declare function getRenderContent(templateEngine: any, content: any, variables: any, localVariables: any, defaultParse: any): Promise<any>;
 export {};