@nocobase/client 1.7.0 → 1.7.1

package/es/block-provider/TemplateBlockProvider.d.ts

@@ -13,8 +13,6 @@ import { FC } from 'react';
 export declare const useTemplateBlockContext: () => {
     templateFinished?: boolean;
     onTemplateSuccess?: Function;
-    isBlockTemplate?: () => boolean;
-    setIsBlockTemplate?: (value: boolean) => void;
 };
 declare const TemplateBlockProvider: FC<{
     onTemplateLoaded?: () => void;

package/es/index.mjs

@@ -6459,26 +6459,13 @@ const TreeRecordContext = createContext(null), TreeRecordProvider = ({ children:
   return e == null ? void 0 : e.parent;
 }, TemplateBlockContext = createContext({});
 TemplateBlockContext.displayName = "TemplateBlockContext";
-const useTemplateBlockContext = () => useContext(TemplateBlockContext), _isBlockTemplate = (e, t = 1) => {
-  if (!e || t >= 3)
-    return !1;
-  const o = Object.keys(e.properties || {});
-  for (const n of o) {
-    const r = e.properties[n];
-    if (r["x-component"] === "BlockTemplate" || _isBlockTemplate(r, t + 1))
-      return !0;
-  }
-  return !1;
-}, TemplateBlockProvider = ({ onTemplateLoaded: e, children: t }) => {
-  const o = useFieldSchema(), [n, r] = useState(!1), a = useCallback(() => {
-    r(!0), setTimeout(() => {
+const useTemplateBlockContext = () => useContext(TemplateBlockContext), TemplateBlockProvider = ({ onTemplateLoaded: e, children: t }) => {
+  const [o, n] = useState(!1), r = useCallback(() => {
+    n(!0), setTimeout(() => {
       e == null || e();
     });
-  }, [e]), i = useCallback(() => _isBlockTemplate(o) || o["x-component"] === "BlockTemplate", [o]), l = useMemo(
-    () => ({ templateFinished: n, onTemplateSuccess: a, isBlockTemplate: i }),
-    [a, n, i]
-  );
-  return /* @__PURE__ */ jsx(TemplateBlockContext.Provider, { value: l, children: t });
+  }, [e]), a = useMemo(() => ({ templateFinished: o, onTemplateSuccess: r }), [r, o]);
+  return /* @__PURE__ */ jsx(TemplateBlockContext.Provider, { value: a, children: t });
 }, FormActiveFieldsContext = createContext(null), FormActiveFieldsProvider = ({
   children: e,
   name: t,
@@ -8398,7 +8385,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.0", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.1", 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.6.1",
@@ -8419,9 +8406,9 @@ const name = "@nocobase/client", version = "1.7.0", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.0",
-  "@nocobase/sdk": "1.7.0",
-  "@nocobase/utils": "1.7.0",
+  "@nocobase/evaluators": "1.7.1",
+  "@nocobase/sdk": "1.7.1",
+  "@nocobase/utils": "1.7.1",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -18049,7 +18036,7 @@ const InternalDetailsBlockProvider = (e) => {
     resource: i,
     formBlockRef: d
   }), [t, n, r, i, l]);
-  return n.loaded = !0, /* @__PURE__ */ jsx(CurrentRecordContextProvider, { recordData: u, collectionName: a == null ? void 0 : a.name, children: /* @__PURE__ */ jsx(DetailsBlockContext.Provider, { value: p, children: /* @__PURE__ */ jsx("div", { ref: d, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !1, record: u, parent: c == null ? void 0 : c.data, children: e.children }) }) }) });
+  return l.loading && !n.loaded ? /* @__PURE__ */ jsx(Spin, {}) : (n.loaded = !0, /* @__PURE__ */ jsx(CurrentRecordContextProvider, { recordData: u, collectionName: a == null ? void 0 : a.name, children: /* @__PURE__ */ jsx(DetailsBlockContext.Provider, { value: p, children: /* @__PURE__ */ jsx("div", { ref: d, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !1, record: u, parent: c == null ? void 0 : c.data, children: e.children }) }) }) }));
 }, useCompatDetailsBlockParams = (e) => {
   const t = useFieldSchema();
   let o, n = !1;
@@ -28002,8 +27989,8 @@ BlockRequestLoadingContext.displayName = "BlockRequestLoadingContext";
 const BlockRequestDataContext = createContext(null);
 BlockRequestDataContext.displayName = "BlockRequestDataContext";
 function useRecordRequest(e) {
-  const t = useDataLoadingMode(), o = useDataBlockResource(), { action: n, params: r = {}, record: a, requestService: i, requestOptions: l, sourceId: c, association: u, parentRecord: d } = e, p = useAPIClient(), m = useDataBlockProps(), h = useDataSourceHeaders(m.dataSource), g = useSourceKey(u), [f, C] = useMemo(() => [JSON.stringify(r), JSON.stringify(a)], [r, a]), { isBlockTemplate: b, templateFinished: S } = useTemplateBlockContext(), y = (T) => {
-    var B;
+  const t = useDataLoadingMode(), o = useDataBlockResource(), { action: n, params: r = {}, record: a, requestService: i, requestOptions: l, sourceId: c, association: u, parentRecord: d } = e, p = useAPIClient(), m = useDataBlockProps(), h = useDataSourceHeaders(m.dataSource), g = useSourceKey(u), [f, C] = useMemo(() => [JSON.stringify(r), JSON.stringify(a)], [r, a]), b = (v) => {
+    var T;
     if (a)
       return Promise.resolve({ data: a });
     if (!n)
@@ -28012,19 +27999,19 @@ function useRecordRequest(e) {
       return console.warn(
         '[nocobase]: The "filterByTk" parameter is missing in the "DataBlockRequestProvider" component'
       );
-    const R = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r, D = x(x({}, R), T);
-    return (B = o[n]) == null ? void 0 : B.call(o, D).then((N) => N.data);
-  }, v = (...T) => b != null && b() && !S ? null : (i || y)(...T);
-  return useRequest((...T) => q(this, null, function* () {
-    const [R, D] = yield Promise.all([
-      v(...T),
+    const F = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r, I = x(x({}, F), v);
+    return (T = o[n]) == null ? void 0 : T.call(o, I).then((R) => R.data);
+  };
+  return useRequest((...v) => q(this, null, function* () {
+    const [F, I] = yield Promise.all([
+      (i || b)(...v),
       requestParentRecordData({ sourceId: c, association: u, parentRecord: d, api: p, headers: h, sourceKey: g })
     ]);
-    return R && (R.parentRecord = D == null ? void 0 : D.data), R;
+    return F && (F.parentRecord = I == null ? void 0 : I.data), F;
   }), P(x({}, l), {
     manual: t === "manual",
     ready: !!n,
-    refreshDeps: [n, f, C, o, u, d, c, S]
+    refreshDeps: [n, f, C, o, u, d, c]
   }));
 }
 function requestParentRecordData(i) {
@@ -40174,40 +40161,40 @@ const useFormBlockHeight = () => {
     o["x-linkage-rules"] && (t = o["x-linkage-rules"]);
   }), t;
 }, WithForm = (e) => {
-  var m, h;
-  const { form: t } = e, o = useFieldSchema(), { setFormValueChanged: n } = useActionContext(), r = useVariables$1(), a = useLocalVariables$1({ currentForm: t }), { templateFinished: i } = useTemplateBlockContext(), { loading: l, data: c } = useDataBlockRequest() || {}, u = useApp(), d = ((h = getLinkageRules(o) || ((m = o.parent) == null ? void 0 : m["x-linkage-rules"])) == null ? void 0 : h.filter((g) => !g.disabled)) || [], { confirmBeforeClose: p = !0 } = useDataBlockProps() || {};
+  var p, m;
+  const { form: t } = e, o = useFieldSchema(), { setFormValueChanged: n } = useActionContext(), r = useVariables$1(), a = useLocalVariables$1({ currentForm: t }), { templateFinished: i } = useTemplateBlockContext(), { loading: l } = useDataBlockRequest() || {}, c = useApp(), u = ((m = getLinkageRules(o) || ((p = o.parent) == null ? void 0 : p["x-linkage-rules"])) == null ? void 0 : m.filter((h) => !h.disabled)) || [], { confirmBeforeClose: d = !0 } = useDataBlockProps() || {};
   return useEffect(() => {
-    const g = uid();
-    return t.addEffects(g, () => {
+    const h = uid();
+    return t.addEffects(h, () => {
       onFormInputChange(() => {
-        n == null || n(p);
+        n == null || n(d);
       });
     }), e.disabled && (t.disabled = e.disabled), () => {
-      t.removeEffects(g);
+      t.removeEffects(h);
     };
-  }, [t, e.disabled, n, p]), useEffect(() => {
-    if (l || _.isEmpty(c == null ? void 0 : c.data))
+  }, [t, e.disabled, n, d]), useEffect(() => {
+    if (l)
       return;
-    const g = uid(), f = [];
+    const h = uid(), g = [];
     return setTimeout(() => {
-      t.addEffects(g, () => {
-        forEachLinkageRule(d, (C, b) => {
-          var S;
-          if ((S = C.targetFields) != null && S.length) {
-            const y = C.targetFields.join(",");
-            onFieldInit(`*(${y})`, (v, F) => {
-              f.push(
+      t.addEffects(h, () => {
+        forEachLinkageRule(u, (f, C) => {
+          var b;
+          if ((b = f.targetFields) != null && b.length) {
+            const S = f.targetFields.join(",");
+            onFieldInit(`*(${S})`, (y, v) => {
+              g.push(
                 bindLinkageRulesToFiled(
                   {
-                    field: v,
-                    linkageRules: d,
-                    formValues: F.values,
+                    field: y,
+                    linkageRules: u,
+                    formValues: v.values,
                     localVariables: a,
-                    action: C,
-                    rule: b,
+                    action: f,
+                    rule: C,
                     variables: r
                   },
-                  u.jsonLogic
+                  c.jsonLogic
                 )
               );
             });
@@ -40215,11 +40202,11 @@ const useFormBlockHeight = () => {
         });
       });
     }), () => {
-      t.removeEffects(g), f.forEach((C) => {
-        C();
+      t.removeEffects(h), g.forEach((f) => {
+        f();
       });
     };
-  }, [d, i, l]), o["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
+  }, [u, i, l]), o["x-decorator"] === "FormV2" ? /* @__PURE__ */ jsx(FormDecorator, x({}, e)) : /* @__PURE__ */ jsx(FormComponent, x({}, e));
 }, WithoutForm = (e) => {
   const t = useFieldSchema(), { setFormValueChanged: o } = useActionContext(), { confirmBeforeClose: n = !0 } = useDataBlockProps() || {}, r = useMemo(
     () => createForm({
@@ -47082,10 +47069,10 @@ const CronSetInternal = (e) => {
   return /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: !0, children: t && (l ? o(l) : /* @__PURE__ */ jsx(Cron.ReadPretty, x({}, e))) });
 }, CronSet = connect(CronSetInternal, mapReadPretty(ReadPretty$3)), Details = withDynamicSchemaProps(
   withSkeletonComponent((e) => {
-    const { data: t, loading: o } = useDataBlockRequest() || {}, n = useFieldSchema(), { isBlockTemplate: r, templateFinished: a } = useTemplateBlockContext();
-    return (r != null && r() ? !o && a && t && _.isEmpty(t.data) : _.isEmpty(t == null ? void 0 : t.data)) ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+    const t = useDataBlockRequestData(), o = useFieldSchema();
+    return _.isEmpty(t == null ? void 0 : t.data) ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
       /* @__PURE__ */ jsx(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE }),
-      /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: n.properties.pagination, name: "pagination" })
+      /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: o.properties.pagination, name: "pagination" })
     ] }) : /* @__PURE__ */ jsx("div", { className: "nb-details", children: /* @__PURE__ */ jsx(FormWithDataTemplates, x({}, e)) });
   }),
   { displayName: "NocoBaseDetails" }