@nocobase/client 2.0.19 → 2.0.21

package/es/flow/models/fields/AssociationFieldModel/AssociationFieldModel.d.ts

@@ -1,4 +1,5 @@
 import { FieldModel } from '../../base/FieldModel';
 export declare class AssociationFieldModel extends FieldModel {
     operator: string;
+    updateAssociation: boolean;
 }

package/es/index.mjs

@@ -9964,7 +9964,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.19", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.21", license = "Apache-2.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",
@@ -9987,10 +9987,10 @@ const name = "@nocobase/client", version = "2.0.19", license = "Apache-2.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.19",
-  "@nocobase/flow-engine": "2.0.19",
-  "@nocobase/sdk": "2.0.19",
-  "@nocobase/utils": "2.0.19",
+  "@nocobase/evaluators": "2.0.21",
+  "@nocobase/flow-engine": "2.0.21",
+  "@nocobase/sdk": "2.0.21",
+  "@nocobase/utils": "2.0.21",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -10649,49 +10649,55 @@ function useParsedFilter({
   filterOption: e,
   onFilterChange: t
 }) {
-  const { parseFilter: o, findVariable: n } = useParseDataScopeFilter(), [r, i] = useState({}), [a, l] = useState(!!e);
-  return useEffect(() => {
-    if (!e)
+  const { parseFilter: o, findVariable: n } = useParseDataScopeFilter(), r = JSON.stringify(e), i = useRef(e), a = useRef(t), [l, c] = useState({}), [u, d] = useState(() => e ? null : r), p = !!e && u !== r;
+  return i.current = e, a.current = t, useEffect(() => {
+    const m = i.current;
+    if (!m) {
+      c({}), d(r);
       return;
-    const c = () => L(this, null, function* () {
-      l(!0);
-      const d = yield o(e);
-      l(!1), i(d), t == null || t(d);
-    });
-    c();
-    const u = _.debounce(c, DEBOUNCE_WAIT);
-    reaction(
-      () => flatten(e, {
-        breakOn({ key: p }) {
-          return p.startsWith("$") && p !== "$and" && p !== "$or";
+    }
+    let h = !1;
+    const g = () => L(this, null, function* () {
+      var S;
+      const b = yield o(m);
+      h || (c(b), d(r), (S = a.current) == null || S.call(a, b));
+    });
+    g();
+    const f = _.debounce(g, DEBOUNCE_WAIT), y = reaction(
+      () => flatten(m, {
+        breakOn({ key: S }) {
+          return S.startsWith("$") && S !== "$and" && S !== "$or";
         },
-        transformValue(p) {
-          if (!isVariable$1(p))
-            return p;
-          const m = getVariableName(p), h = n(m);
-          let g = null;
-          const y = getPath(p).split(".");
-          return y.forEach((b, S) => {
-            const C = y.slice(0, S + 1).join("."), F = getValuesByPath(
+        transformValue(S) {
+          if (!isVariable$1(S))
+            return S;
+          const C = getVariableName(S), F = n(C);
+          let P = null;
+          const k = getPath(S).split(".");
+          return k.forEach((I, M) => {
+            const E = k.slice(0, M + 1).join("."), $ = getValuesByPath(
               {
-                [m]: (h == null ? void 0 : h.ctx) || {}
+                [C]: (F == null ? void 0 : F.ctx) || {}
               },
-              C
+              E
             );
-            _.isEmpty(F) || (g = F);
-          }), g;
+            _.isEmpty($) || (P = $);
+          }), P;
         }
       }),
-      u,
+      f,
       {
         equals: _.isEqual
       }
     );
-  }, [JSON.stringify(e), o, n]), {
+    return () => {
+      h = !0, f.cancel(), y();
+    };
+  }, [r, n, o]), {
     /** 数据范围的筛选参数 */
-    filter: r,
+    filter: l,
     /** 表示是否正在解析筛选参数中的变量 */
-    parseVariableLoading: a
+    parseVariableLoading: p
   };
 }
 const useParentRecordCommon = (e) => {
@@ -30264,10 +30270,10 @@ function requestParentRecordData(a) {
   });
 }
 const BlockRequestContextProvider = (e) => {
-  var l, c, u, d, p, m;
-  const t = useRef(e.recordRequest), o = useRef((l = e.recordRequest) == null ? void 0 : l.data), { active: n } = useKeepAlive(), r = useRef(n), i = useDeferredValue(n), a = useDataBlockProps();
-  return i && !r.current && (_.isNil(a.dataLoadingMode) || a.dataLoadingMode === "auto") && ((c = e.recordRequest) == null || c.refresh()), i && // the stage when loading just ended
-  r.current && !((u = e.recordRequest) != null && u.loading) && !_.isEqual(o.current, (d = e.recordRequest) == null ? void 0 : d.data) && (o.current = (p = e.recordRequest) == null ? void 0 : p.data), i !== r.current && (r.current = i), t.current = e.recordRequest, /* @__PURE__ */ jsx(BlockRequestRefContext.Provider, { value: t, children: /* @__PURE__ */ jsx(BlockRequestLoadingContext.Provider, { value: (m = e.recordRequest) == null ? void 0 : m.loading, children: /* @__PURE__ */ jsx(BlockRequestDataContext.Provider, { value: o.current, children: e.children }) }) });
+  var d, p, m, h, g, f;
+  const t = useRef(e.recordRequest), o = useRef((d = e.recordRequest) == null ? void 0 : d.data), { active: n } = useKeepAlive(), r = useLocationSearch(), i = useRef(n), a = useRef(r), l = useDeferredValue(n), c = useDataBlockProps(), u = i.current;
+  return l && !u && a.current === r && (_.isNil(c.dataLoadingMode) || c.dataLoadingMode === "auto") && ((p = e.recordRequest) == null || p.refresh()), l && // the stage when loading just ended
+  u && !((m = e.recordRequest) != null && m.loading) && !_.isEqual(o.current, (h = e.recordRequest) == null ? void 0 : h.data) && (o.current = (g = e.recordRequest) == null ? void 0 : g.data), n && u && (a.current = r), l !== u && (i.current = l), t.current = e.recordRequest, /* @__PURE__ */ jsx(BlockRequestRefContext.Provider, { value: t, children: /* @__PURE__ */ jsx(BlockRequestLoadingContext.Provider, { value: (f = e.recordRequest) == null ? void 0 : f.loading, children: /* @__PURE__ */ jsx(BlockRequestDataContext.Provider, { value: o.current, children: e.children }) }) });
 }, BlockRequestProvider = React.memo(({ children: e }) => {
   var y, b;
   const t = useDataBlockProps(), {
@@ -30624,7 +30630,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -72037,7 +72043,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -81187,6 +81193,7 @@ class AssociationFieldModel extends FieldModel {
   constructor() {
     super(...arguments);
     R(this, "operator", "$eq");
+    R(this, "updateAssociation", !0);
   }
 }
 AssociationFieldModel.registerFlow({
@@ -81196,7 +81203,13 @@ AssociationFieldModel.registerFlow({
     init: {
       handler(e, t) {
         return L(this, null, function* () {
-          e.model.updateAssociation && e.model.context.blockModel.context.resource.addUpdateAssociationValues(e.model.parent.fieldPath);
+          var o, n;
+          if (e.model.updateAssociation) {
+            const r = e.model.context.blockModel, i = (o = r == null ? void 0 : r.context) == null ? void 0 : o.resource, a = (n = e.model.parent) == null ? void 0 : n.fieldPath;
+            if (!i || !a)
+              return;
+            i.addUpdateAssociationValues(a);
+          }
         });
       }
     },