@nocobase/client 2.0.34 → 2.0.35

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

@@ -16,6 +16,16 @@ export declare function buildRecordPickerParentItemContext(ctx: any): {
     parentItemResolver: ((subPath: string) => boolean) | undefined;
 };
 export declare function injectRecordPickerPopupContext(model: FlowModel, viewCtx: any, fieldModel?: any): void;
+export declare function buildRecordPickerPopupContextInputArgs(ctx: any, options?: {
+    currentItemValue?: any;
+    extraInputArgs?: Record<string, any>;
+}): {
+    parentItem: ItemChain;
+    parentItemMeta: any;
+    parentItemResolver: (subPath: string) => boolean;
+    currentItemValue: any;
+    openerUids: string[];
+};
 export declare function RecordPickerContent({ model, toOne }: {
     model: any;
     toOne?: boolean;

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

@@ -46,6 +46,8 @@ export declare function createItemChainMetaFactory(options: {
     title: string;
     showIndex?: boolean;
     showParentIndex?: boolean;
+    disableValueBranch?: boolean;
+    valueBranchDisabledReason?: string;
     collectionAccessor: () => any;
     propertiesAccessor: (ctx: any) => any;
     parentCollectionAccessor?: () => any;
@@ -54,6 +56,7 @@ export declare function createItemChainMetaFactory(options: {
 }): any;
 export declare function createItemChainResolver(options: {
     collectionAccessor: () => any;
+    disableValueBranch?: boolean;
     propertiesAccessor?: () => unknown;
     parentCollectionAccessor?: () => any;
     parentPropertiesAccessor?: () => unknown;
@@ -72,6 +75,8 @@ export type AssociationItemChainContextPropertyOptions = {
     title: string;
     showIndex?: boolean;
     showParentIndex?: boolean;
+    disableValueBranch?: boolean;
+    valueBranchDisabledReason?: string;
     collectionAccessor: () => any;
     propertiesAccessor: (ctx: any) => any;
     resolverPropertiesAccessor?: () => unknown;

package/es/index.mjs

@@ -3498,6 +3498,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get buildRecordPickerParentItemContext() {
     return buildRecordPickerParentItemContext;
   },
+  get buildRecordPickerPopupContextInputArgs() {
+    return buildRecordPickerPopupContextInputArgs;
+  },
   get canMakeAssociationBlock() {
     return canMakeAssociationBlock;
   },
@@ -9973,7 +9976,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.34", 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.35", 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",
@@ -9996,10 +9999,10 @@ const name = "@nocobase/client", version = "2.0.34", 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.34",
-  "@nocobase/flow-engine": "2.0.34",
-  "@nocobase/sdk": "2.0.34",
-  "@nocobase/utils": "2.0.34",
+  "@nocobase/evaluators": "2.0.35",
+  "@nocobase/flow-engine": "2.0.35",
+  "@nocobase/sdk": "2.0.35",
+  "@nocobase/utils": "2.0.35",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -83140,56 +83143,63 @@ function createItemChainMetaFactory(e) {
     title: o,
     showIndex: n,
     showParentIndex: r,
-    collectionAccessor: i,
-    propertiesAccessor: a,
-    parentCollectionAccessor: l,
-    parentPropertiesAccessor: c,
-    parentItemMetaAccessor: u
-  } = e, d = createAssociationAwareObjectMetaFactory(i, o, a), p = l ? createAssociationAwareObjectMetaFactory(
-    l,
+    disableValueBranch: i,
+    valueBranchDisabledReason: a,
+    collectionAccessor: l,
+    propertiesAccessor: c,
+    parentCollectionAccessor: u,
+    parentPropertiesAccessor: d,
+    parentItemMetaAccessor: p
+  } = e, m = createAssociationAwareObjectMetaFactory(l, o, c), h = u ? createAssociationAwareObjectMetaFactory(
+    u,
     o,
-    (h) => {
-      var g, f, y;
-      return (y = c == null ? void 0 : c(h)) != null ? y : (f = (g = h == null ? void 0 : h.item) == null ? void 0 : g.parentItem) == null ? void 0 : f.value;
+    (f) => {
+      var y, b, S;
+      return (S = d == null ? void 0 : d(f)) != null ? S : (b = (y = f == null ? void 0 : f.item) == null ? void 0 : y.parentItem) == null ? void 0 : b.value;
     }
-  ) : null, m = () => L(this, null, function* () {
-    var v, k;
-    const h = yield d();
-    if (!h)
+  ) : null, g = () => L(this, null, function* () {
+    var I, M;
+    const f = yield m();
+    if (!f)
       return null;
-    const g = yield resolveMetaFactory(u == null ? void 0 : u()), f = p ? yield p() : null, y = h.buildVariablesParams, b = g ? g.buildVariablesParams : f == null ? void 0 : f.buildVariablesParams, S = () => ({ type: "number", title: t("Index (starts from 0)") }), C = () => ({ type: "number", title: t("Total count") }), F = {};
-    if (n !== !1 && (F.index = S(), F.length = C()), F.value = A(x({}, h), { title: t("Attributes") }), g)
-      F.parentItem = A(x({}, g), {
-        title: ((v = g.title) == null ? void 0 : v.replace(t("Current item"), t("Parent item"))) || t("Parent item")
+    const y = yield resolveMetaFactory(p == null ? void 0 : p()), b = h ? yield h() : null, S = f.buildVariablesParams, C = y ? y.buildVariablesParams : b == null ? void 0 : b.buildVariablesParams, F = () => ({ type: "number", title: t("Index (starts from 0)") }), P = () => ({ type: "number", title: t("Total count") }), v = {};
+    if (n !== !1 && (v.index = F(), v.length = P()), v.value = x(A(x({}, f), {
+      title: t("Attributes")
+    }), i ? {
+      disabled: !0,
+      disabledReason: a || t("Attributes are unavailable before selecting a record")
+    } : {}), y)
+      v.parentItem = A(x({}, y), {
+        title: ((I = y.title) == null ? void 0 : I.replace(t("Current item"), t("Parent item"))) || t("Parent item")
       });
     else {
-      const I = {};
-      r !== !1 && (I.index = S(), I.length = C()), I.value = f ? A(x({}, f), { title: t("Attributes") }) : { type: "object", title: t("Attributes") }, F.parentItem = {
+      const E = {};
+      r !== !1 && (E.index = F(), E.length = P()), E.value = b ? A(x({}, b), { title: t("Attributes") }) : { type: "object", title: t("Attributes") }, v.parentItem = {
         type: "object",
-        title: ((k = g == null ? void 0 : g.title) == null ? void 0 : k.replace(t("Current item"), t("Parent item"))) || t("Parent item"),
-        properties: I
+        title: ((M = y == null ? void 0 : y.title) == null ? void 0 : M.replace(t("Current item"), t("Parent item"))) || t("Parent item"),
+        properties: E
       };
     }
     return {
       type: "object",
       title: o,
-      properties: F,
-      buildVariablesParams: (I) => L(this, null, function* () {
-        var E;
-        const M = {};
-        if (typeof y == "function") {
-          const $ = yield y(I);
-          $ && typeof $ == "object" && Object.keys($).length && (M.value = $);
-        }
-        if (typeof b == "function") {
-          const $ = yield b(createScopedItemContext(I, (E = I == null ? void 0 : I.item) == null ? void 0 : E.parentItem));
-          $ && typeof $ == "object" && Object.keys($).length && (M.parentItem = g ? $ : { value: $ });
-        }
-        return M;
+      properties: v,
+      buildVariablesParams: (E) => L(this, null, function* () {
+        var D;
+        const $ = {};
+        if (!i && typeof S == "function") {
+          const T = yield S(E);
+          T && typeof T == "object" && Object.keys(T).length && ($.value = T);
+        }
+        if (typeof C == "function") {
+          const T = yield C(createScopedItemContext(E, (D = E == null ? void 0 : E.item) == null ? void 0 : D.parentItem));
+          T && typeof T == "object" && Object.keys(T).length && ($.parentItem = y ? T : { value: T });
+        }
+        return $;
       })
     };
   });
-  return m.title = o, m;
+  return g.title = o, g;
 }
 function createItemChainResolver(e) {
   const t = createAssociationSubpathResolver(e.collectionAccessor, e.propertiesAccessor), o = typeof e.parentCollectionAccessor == "function" ? createAssociationSubpathResolver(e.parentCollectionAccessor, e.parentPropertiesAccessor) : null;
@@ -83199,7 +83209,7 @@ function createItemChainResolver(e) {
     if (!r || r === "value")
       return !1;
     if (r.startsWith("value."))
-      return t(r.slice(6));
+      return e.disableValueBranch ? !1 : t(r.slice(6));
     if (r === "parentItem")
       return !1;
     if (r.startsWith("parentItem.")) {
@@ -83224,6 +83234,8 @@ function createAssociationItemChainContextPropertyOptions(e) {
       title: e.title,
       showIndex: e.showIndex,
       showParentIndex: e.showParentIndex,
+      disableValueBranch: e.disableValueBranch,
+      valueBranchDisabledReason: e.valueBranchDisabledReason,
       collectionAccessor: e.collectionAccessor,
       propertiesAccessor: e.propertiesAccessor,
       parentCollectionAccessor: e.parentCollectionAccessor,
@@ -83232,6 +83244,7 @@ function createAssociationItemChainContextPropertyOptions(e) {
     },
     resolverOptions: {
       collectionAccessor: e.collectionAccessor,
+      disableValueBranch: e.disableValueBranch,
       propertiesAccessor: e.resolverPropertiesAccessor,
       parentCollectionAccessor: e.parentCollectionAccessor,
       parentPropertiesAccessor: t,
@@ -83289,6 +83302,8 @@ function injectRecordPickerPopupContext(e, t, o) {
   }, u = createAssociationItemChainContextPropertyOptions({
     t: i,
     title: buildCurrentItemTitle(i, r),
+    disableValueBranch: !0,
+    valueBranchDisabledReason: i("Attributes are unavailable before selecting a record"),
     collectionAccessor: () => a,
     propertiesAccessor: c,
     resolverPropertiesAccessor: c,
@@ -83308,6 +83323,16 @@ function injectRecordPickerPopupContext(e, t, o) {
     get: d
   }, u));
 }
+function buildRecordPickerPopupContextInputArgs(e, t = {}) {
+  const { parentItem: o, parentItemMeta: n, parentItemResolver: r } = buildRecordPickerParentItemContext(e), i = buildOpenerUids(e, e.inputArgs);
+  return A(x({}, t.extraInputArgs || {}), {
+    parentItem: o,
+    parentItemMeta: n,
+    parentItemResolver: r,
+    currentItemValue: t.currentItemValue,
+    openerUids: i
+  });
+}
 function RemoteModelRenderer$1({ options: e, fieldModel: t }) {
   const o = useFlowViewContext(), { data: n, loading: r } = useRequest$1(
     () => L(this, null, function* () {
@@ -83538,7 +83563,7 @@ RecordPickerFieldModel.registerFlow({
         size: "medium"
       },
       handler(e, t) {
-        var y, b, S, C, F, P, v;
+        var p, m, h, g, f, y, b;
         const { onChange: o } = e.inputArgs, n = ["belongsTo", "hasOne"].includes(e.collectionField.type), r = {
           drawer: {
             small: "30%",
@@ -83551,40 +83576,38 @@ RecordPickerFieldModel.registerFlow({
             large: "80%"
           },
           embed: {}
-        }, i = e.inputArgs.mode || t.mode || "drawer", a = e.inputArgs.size || t.size || "medium", l = (y = e.collectionField) == null ? void 0 : y.collection, c = (S = (b = e.item) == null ? void 0 : b.value) != null ? S : e.record, u = c ? (C = l == null ? void 0 : l.getFilterByTK) == null ? void 0 : C.call(l, c) : void 0, d = (F = e.collectionField) == null ? void 0 : F.resourceName, { parentItem: p, parentItemMeta: m, parentItemResolver: h } = buildRecordPickerParentItemContext(e), g = (P = e.inputArgs.currentItemValue) != null ? P : {}, f = buildOpenerUids(e, e.inputArgs);
+        }, i = e.inputArgs.mode || t.mode || "drawer", a = e.inputArgs.size || t.size || "medium", l = (p = e.collectionField) == null ? void 0 : p.collection, c = (h = (m = e.item) == null ? void 0 : m.value) != null ? h : e.record, u = c ? (g = l == null ? void 0 : l.getFilterByTK) == null ? void 0 : g.call(l, c) : void 0, d = (f = e.collectionField) == null ? void 0 : f.resourceName;
         e.viewer.open({
           type: i,
           width: r[i][a],
           inheritContext: !1,
           target: e.layoutContentElement,
-          inputArgs: A(x({
+          inputArgs: A(x(A(x({
             parentId: e.model.uid,
             scene: "select",
             dataSourceKey: e.collection.dataSourceKey,
-            collectionName: (v = e.collectionField) == null ? void 0 : v.target
+            collectionName: (y = e.collectionField) == null ? void 0 : y.target
           }, d && u != null ? { associationName: d, sourceId: u } : {}), {
-            collectionField: e.collectionField,
-            parentItem: p,
-            parentItemMeta: m,
-            parentItemResolver: h,
-            currentItemValue: g,
-            openerUids: f,
+            collectionField: e.collectionField
+          }), buildRecordPickerPopupContextInputArgs(e, {
+            currentItemValue: (b = e.inputArgs.currentItemValue) != null ? b : {}
+          })), {
             rowSelectionProps: {
               type: n ? "radio" : "checkbox",
               defaultSelectedRows: () => e.model.props.value,
               renderCell: void 0,
               selectedRowKeys: void 0,
-              onChange: (k, I) => {
-                var $, D;
-                const E = e.model.selectBlockModel.findSubModel("items", (T) => T);
+              onChange: (S, C) => {
+                var v, k;
+                const P = e.model.selectBlockModel.findSubModel("items", (I) => I);
                 if (n)
-                  e.model.selectedRows.value = I == null ? void 0 : I[0], o(e.model.selectedRows.value), (D = ($ = e.model)._closeView) == null || D.call($);
+                  e.model.selectedRows.value = C == null ? void 0 : C[0], o(e.model.selectedRows.value), (k = (v = e.model)._closeView) == null || k.call(v);
                 else {
-                  E.resource.setSelectedRows(I);
-                  const B = [...e.model.props.value || [], ...I].filter(
-                    (N, j, O) => j === O.findIndex((q) => q[e.collection.filterTargetKey] === N[e.collection.filterTargetKey])
+                  P.resource.setSelectedRows(C);
+                  const E = [...e.model.props.value || [], ...C].filter(
+                    ($, D, T) => D === T.findIndex((w) => w[e.collection.filterTargetKey] === $[e.collection.filterTargetKey])
                   );
-                  e.model.selectedRows.value = B;
+                  e.model.selectedRows.value = E;
                 }
               }
             }
@@ -85073,7 +85096,7 @@ SubTableFieldModel.registerFlow({
         size: "medium"
       },
       handler(e, t) {
-        var i;
+        var a, l, c;
         const o = {
           drawer: {
             small: "30%",
@@ -85087,35 +85110,40 @@ SubTableFieldModel.registerFlow({
           },
           embed: {}
         }, n = e.isMobileLayout ? "embed" : e.inputArgs.mode || t.mode || "drawer", r = e.inputArgs.size || t.size || "medium";
-        e.model.selectedRows.value = e.model.props.value || [], e.viewer.open({
+        e.model.selectedRows.value = e.model.props.value || [];
+        const i = (l = (a = e.inputArgs.currentItemValue) != null ? a : e.model.props.value) != null ? l : [];
+        e.viewer.open({
           type: n,
           width: o[n][r],
           inheritContext: !1,
           target: e.layoutContentElement,
-          inputArgs: {
+          inputArgs: A(x({
             parentId: e.model.uid,
             scene: "select",
             dataSourceKey: e.collection.dataSourceKey,
-            collectionName: (i = e.collectionField) == null ? void 0 : i.target,
-            collectionField: e.collectionField,
+            collectionName: (c = e.collectionField) == null ? void 0 : c.target,
+            collectionField: e.collectionField
+          }, buildRecordPickerPopupContextInputArgs(e, {
+            currentItemValue: i
+          })), {
             rowSelectionProps: {
               type: "checkbox",
               defaultSelectedRows: () => e.model.props.value,
               renderCell: void 0,
               selectedRowKeys: void 0,
-              onChange: (a, l) => {
-                const d = [
+              onChange: (u, d) => {
+                const h = [
                   ...e.model.props.value || [],
-                  ...l.map((p) => A(x({}, p), {
+                  ...d.map((g) => A(x({}, g), {
                     __is_stored__: !0
                   }))
                 ].filter(
-                  (p, m, h) => m === h.findIndex((g) => g[e.collection.filterTargetKey] === p[e.collection.filterTargetKey])
+                  (g, f, y) => f === y.findIndex((b) => b[e.collection.filterTargetKey] === g[e.collection.filterTargetKey])
                 );
-                e.model.selectedRows.value = d;
+                e.model.selectedRows.value = h;
               }
             }
-          },
+          }),
           content: () => /* @__PURE__ */ jsx(RecordPickerContent, { model: e.model }),
           styles: {
             content: x({
@@ -85607,7 +85635,7 @@ SubFormListFieldModel.registerFlow({
         size: "medium"
       },
       handler(e, t) {
-        var i;
+        var a, l, c;
         const o = {
           drawer: {
             small: "30%",
@@ -85621,37 +85649,42 @@ SubFormListFieldModel.registerFlow({
           },
           embed: {}
         }, n = e.isMobileLayout ? "embed" : e.inputArgs.mode || t.mode || "drawer", r = e.inputArgs.size || t.size || "medium";
-        e.model.selectedRows.value = e.model.props.value || [], e.viewer.open({
+        e.model.selectedRows.value = e.model.props.value || [];
+        const i = (l = (a = e.inputArgs.currentItemValue) != null ? a : e.model.props.value) != null ? l : [];
+        e.viewer.open({
           type: n,
           width: o[n][r],
           inheritContext: !1,
           target: e.layoutContentElement,
-          inputArgs: {
+          inputArgs: A(x({
             parentId: e.model.uid,
             scene: "select",
             dataSourceKey: e.collection.dataSourceKey,
-            collectionName: (i = e.collectionField) == null ? void 0 : i.target,
-            collectionField: e.collectionField,
+            collectionName: (c = e.collectionField) == null ? void 0 : c.target,
+            collectionField: e.collectionField
+          }, buildRecordPickerPopupContextInputArgs(e, {
+            currentItemValue: i
+          })), {
             rowSelectionProps: {
               type: "checkbox",
               defaultSelectedRows: () => e.model.props.value,
               renderCell: void 0,
               selectedRowKeys: void 0,
-              onChange: (a, l) => {
-                const d = [
+              onChange: (u, d) => {
+                const h = [
                   ...e.model.props.value || [],
-                  ...l.map((p) => A(x({}, p), {
+                  ...d.map((g) => A(x({}, g), {
                     __is_stored__: !0
                   }))
                 ].filter(
-                  (p, m, h) => m === h.findIndex(
-                    (g) => g[e.collection.filterTargetKey] === p[e.collection.filterTargetKey]
-                  ) || p.__is_new__
+                  (g, f, y) => f === y.findIndex(
+                    (b) => b[e.collection.filterTargetKey] === g[e.collection.filterTargetKey]
+                  ) || g.__is_new__
                 );
-                e.model.selectedRows.value = d;
+                e.model.selectedRows.value = h;
               }
             }
-          },
+          }),
           content: () => /* @__PURE__ */ jsx(RecordPickerContent, { model: e.model }),
           styles: {
             content: x({
@@ -87349,7 +87382,7 @@ PopupSubTableFieldModel.registerFlow({
         size: "medium"
       },
       handler(e, t) {
-        var i;
+        var a, l, c;
         const o = {
           drawer: {
             small: "30%",
@@ -87363,41 +87396,46 @@ PopupSubTableFieldModel.registerFlow({
           },
           embed: {}
         }, n = e.isMobileLayout ? "embed" : e.inputArgs.mode || t.mode || "drawer", r = e.inputArgs.size || t.size || "medium";
-        e.model.selectedRows.value = e.model.props.value || [], e.viewer.open({
+        e.model.selectedRows.value = e.model.props.value || [];
+        const i = (l = (a = e.inputArgs.currentItemValue) != null ? a : e.model.props.value) != null ? l : [];
+        e.viewer.open({
           type: n,
           width: o[n][r],
           inheritContext: !1,
           target: e.layoutContentElement,
-          inputArgs: {
+          inputArgs: A(x({
             parentId: e.model.uid,
             scene: "select",
             dataSourceKey: e.collection.dataSourceKey,
-            collectionName: (i = e.collectionField) == null ? void 0 : i.target,
-            collectionField: e.collectionField,
+            collectionName: (c = e.collectionField) == null ? void 0 : c.target,
+            collectionField: e.collectionField
+          }, buildRecordPickerPopupContextInputArgs(e, {
+            currentItemValue: i
+          })), {
             rowSelectionProps: {
               type: "checkbox",
               defaultSelectedRows: () => e.model.props.value,
               renderCell: void 0,
               selectedRowKeys: void 0,
-              onChange: (a, l) => {
-                const c = e.model.props.value || [], u = e.collection.filterTargetKey, d = [
-                  ...c,
-                  ...l.map((h) => A(x({}, h), {
+              onChange: (u, d) => {
+                const p = e.model.props.value || [], m = e.collection.filterTargetKey, h = [
+                  ...p,
+                  ...d.map((y) => A(x({}, y), {
                     __is_stored__: !0
                   }))
-                ], p = /* @__PURE__ */ new Map(), m = [];
-                for (const h of d) {
-                  const g = getRowKey(h, u);
-                  if (g == null) {
-                    m.push(h);
+                ], g = /* @__PURE__ */ new Map(), f = [];
+                for (const y of h) {
+                  const b = getRowKey(y, m);
+                  if (b == null) {
+                    f.push(y);
                     continue;
                   }
-                  p.has(g) || (p.set(g, h), m.push(h));
+                  g.has(b) || (g.set(b, y), f.push(y));
                 }
-                e.model.selectedRows.value = m;
+                e.model.selectedRows.value = f;
               }
             }
-          },
+          }),
           content: () => /* @__PURE__ */ jsx(RecordPickerContent, { model: e.model }),
           styles: {
             content: x({
@@ -95828,6 +95866,7 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   ViewActionModel,
   buildDisplayPathFromValue,
   buildRecordPickerParentItemContext,
+  buildRecordPickerPopupContextInputArgs,
   collectAssociationHydrationCandidates,
   collectCascadeHydrationCandidate,
   connectFields,
@@ -108622,6 +108661,7 @@ export {
   blockLinkageRules,
   buildDisplayPathFromValue,
   buildRecordPickerParentItemContext,
+  buildRecordPickerPopupContextInputArgs,
   canMakeAssociationBlock,
   collectAssociationHydrationCandidates,
   collectCascadeHydrationCandidate,