@nocobase/flow-engine 2.1.0-beta.44 → 2.1.0-beta.45

package/lib/components/subModel/utils.d.ts

@@ -19,6 +19,7 @@ export interface BuildFieldChildrenOptions {
     fieldUseModel?: string | ((field: any) => string);
     collection?: Collection;
     associationPathName?: string;
+    maxAssociationFieldDepth?: number;
     /**
      * 点击这些子项后，除自身路径外，还需要联动刷新的其他菜单路径前缀
      */

package/lib/components/subModel/utils.js

@@ -231,14 +231,18 @@ function buildSubModelGroups(subModelBaseClasses = []) {
 }
 __name(buildSubModelGroups, "buildSubModelGroups");
 function buildWrapperFieldChildren(ctx, options) {
-  var _a;
-  const { useModel, fieldUseModel, associationPathName, refreshTargets } = options;
+  var _a, _b;
+  const { useModel, fieldUseModel, associationPathName, refreshTargets, maxAssociationFieldDepth = 2 } = options;
   const collection = options.collection || ctx.model["collection"] || ctx.collection;
   const fields = collection.getFields();
   const defaultItemKeys = ["fieldSettings", "init"];
   const children = [];
+  const associationDepth = associationPathName ? associationPathName.split(".").filter(Boolean).length : 0;
   for (const f of fields) {
     if (!((_a = f == null ? void 0 : f.options) == null ? void 0 : _a.interface)) continue;
+    if (associationDepth >= maxAssociationFieldDepth && (((_b = f.isAssociationField) == null ? void 0 : _b.call(f)) || f.target || f.targetCollection)) {
+      continue;
+    }
     const fieldPath = associationPathName ? `${associationPathName}.${f.name}` : f.name;
     const childUse = typeof fieldUseModel === "function" ? fieldUseModel(f) : fieldUseModel ?? "FieldModel";
     if (childUse) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.0-beta.44",
+  "version": "2.1.0-beta.45",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.1.0-beta.44",
-    "@nocobase/shared": "2.1.0-beta.44",
+    "@nocobase/sdk": "2.1.0-beta.45",
+    "@nocobase/shared": "2.1.0-beta.45",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "540d4897b1696cc24c0754521b0b766978b4933c"
+  "gitHead": "42587115fc34c3eb01ef2b2549f1c998e5708318"
 }

package/src/components/subModel/utils.ts

@@ -232,6 +232,7 @@ export interface BuildFieldChildrenOptions {
   fieldUseModel?: string | ((field: any) => string);
   collection?: Collection;
   associationPathName?: string;
+  maxAssociationFieldDepth?: number;
   /**
    * 点击这些子项后，除自身路径外，还需要联动刷新的其他菜单路径前缀
    */
@@ -239,13 +240,17 @@ export interface BuildFieldChildrenOptions {
 }
 
 export function buildWrapperFieldChildren(ctx: FlowModelContext, options: BuildFieldChildrenOptions) {
-  const { useModel, fieldUseModel, associationPathName, refreshTargets } = options;
+  const { useModel, fieldUseModel, associationPathName, refreshTargets, maxAssociationFieldDepth = 2 } = options;
   const collection: Collection = options.collection || ctx.model['collection'] || ctx.collection;
   const fields = collection.getFields();
   const defaultItemKeys = ['fieldSettings', 'init'];
   const children: SubModelItem[] = [];
+  const associationDepth = associationPathName ? associationPathName.split('.').filter(Boolean).length : 0;
   for (const f of fields) {
     if (!f?.options?.interface) continue;
+    if (associationDepth >= maxAssociationFieldDepth && (f.isAssociationField?.() || f.target || f.targetCollection)) {
+      continue;
+    }
     const fieldPath = associationPathName ? `${associationPathName}.${f.name}` : f.name;
 
     const childUse = typeof fieldUseModel === 'function' ? fieldUseModel(f) : fieldUseModel ?? 'FieldModel';