@nocobase/client-v2 2.2.0-beta.5 → 2.2.0-beta.7

package/src/flow/components/__tests__/fieldAssignOptions.test.ts

@@ -14,6 +14,15 @@ import {
   collectFieldAssignCascaderOptions,
 } from '../fieldAssignOptions';
 
+type TestCollectionField = {
+  name?: string;
+  title?: string;
+  interface?: string;
+  target?: string;
+  targetCollection?: unknown;
+  isAssociationField?: () => boolean;
+};
+
 describe('fieldAssignOptions', () => {
   it('marks subform node as non-leaf so Cascader can lazy-load target collection fields', () => {
     const usersCollection = {
@@ -98,8 +107,58 @@ describe('fieldAssignOptions', () => {
     ).toBe(true);
   });
 
+  it('preserves configured display association field paths as nested cascader options', () => {
+    const orgNameField = {
+      name: 'orgname',
+      title: '公司名称(单行文本)',
+      interface: 'input',
+      type: 'string',
+      isAssociationField: () => false,
+    };
+    const orgCollection = {
+      getFields: () => [orgNameField],
+      getField: (name: string) => (name === 'orgname' ? orgNameField : null),
+    };
+    const orgAssociationField = {
+      name: 'org_m2o',
+      title: 'org_m2o',
+      interface: 'm2o',
+      type: 'belongsTo',
+      target: 'org',
+      isAssociationField: () => true,
+      targetCollection: orgCollection,
+    };
+    const rootCollection = {
+      getField: (name: string) => (name === 'org_m2o' ? orgAssociationField : null),
+      getFields: () => [orgAssociationField],
+    };
+    const displayAssociationItemModel = {
+      props: { label: '公司名称(单行文本)' },
+      getStepParams: (flowKey: string, stepKey: string) => {
+        if (flowKey === 'fieldSettings' && stepKey === 'init') return { fieldPath: 'org_m2o.orgname' };
+        return {};
+      },
+      subModels: {
+        field: {
+          context: { collectionField: orgNameField },
+        },
+      },
+    };
+    const formBlockModel = {
+      context: { collection: rootCollection },
+      subModels: { grid: { subModels: { items: [displayAssociationItemModel] } } },
+    };
+
+    const options = collectFieldAssignCascaderOptions({ formBlockModel, t: (s) => s });
+    const orgOption = options.find((option) => option.value === 'org_m2o');
+
+    expect(orgOption?.isLeaf).toBe(false);
+    expect(orgOption?.children?.some((child) => child.value === 'orgname' && child.isLeaf === true)).toBe(true);
+    expect(options.some((option) => option.value === 'orgname')).toBe(false);
+  });
+
   it('hides configured association fields deeper than relation / relation / field', () => {
-    const makeItem = (fieldPath: string, field: any, label: string) => ({
+    const makeItem = (fieldPath: string, field: TestCollectionField, label: string) => ({
       props: { label },
       getStepParams: (flowKey: string, stepKey: string) => {
         if (flowKey === 'fieldSettings' && stepKey === 'init') return { fieldPath };
@@ -141,9 +200,98 @@ describe('fieldAssignOptions', () => {
     };
 
     const options = collectFieldAssignCascaderOptions({ formBlockModel, t: (s) => s });
+    const usersOption = options.find((item) => item.value === 'users');
+    const departmentOption = usersOption?.children?.find((item) => item.value === 'department');
+
+    expect(departmentOption?.children?.map((item) => item.value)).toContain('name');
+    expect(departmentOption?.children?.map((item) => item.value)).not.toContain('company');
+  });
+
+  it('hides configured non-association fields under a third association level', () => {
+    const codeField = {
+      name: 'code',
+      title: 'Code',
+      interface: 'input',
+      isAssociationField: () => false,
+    };
+    const companyCollection = {
+      getField: (name: string) => (name === 'code' ? codeField : null),
+      getFields: () => [codeField],
+    };
+    const companyField = {
+      name: 'company',
+      title: 'Company',
+      interface: 'm2o',
+      target: 'companies',
+      isAssociationField: () => true,
+      targetCollection: companyCollection,
+    };
+    const nameField = {
+      name: 'name',
+      title: 'Name',
+      interface: 'input',
+      isAssociationField: () => false,
+    };
+    const departmentCollection = {
+      getField: (name: string) => (name === 'name' ? nameField : name === 'company' ? companyField : null),
+      getFields: () => [nameField, companyField],
+    };
+    const departmentField = {
+      name: 'department',
+      title: 'Department',
+      interface: 'm2o',
+      target: 'departments',
+      isAssociationField: () => true,
+      targetCollection: departmentCollection,
+    };
+    const userCollection = {
+      getField: (name: string) => (name === 'department' ? departmentField : null),
+      getFields: () => [departmentField],
+    };
+    const usersField = {
+      name: 'users',
+      title: 'Users',
+      interface: 'm2m',
+      target: 'users',
+      isAssociationField: () => true,
+      targetCollection: userCollection,
+    };
+    const rootCollection = {
+      getField: (name: string) => (name === 'users' ? usersField : null),
+      getFields: () => [usersField],
+    };
+    const makeItem = (fieldPath: string, field: TestCollectionField, label: string) => ({
+      props: { label },
+      getStepParams: (flowKey: string, stepKey: string) => {
+        if (flowKey === 'fieldSettings' && stepKey === 'init') return { fieldPath };
+        return {};
+      },
+      subModels: {
+        field: {
+          context: { collectionField: field },
+        },
+      },
+    });
+    const formBlockModel = {
+      context: { collection: rootCollection },
+      subModels: {
+        grid: {
+          subModels: {
+            items: [
+              makeItem('users.department.name', nameField, 'Department name'),
+              makeItem('users.department.company.code', codeField, 'Company code'),
+            ],
+          },
+        },
+      },
+    };
+
+    const options = collectFieldAssignCascaderOptions({ formBlockModel, t: (s) => s });
+    const usersOption = options.find((item) => item.value === 'users');
+    const departmentOption = usersOption?.children?.find((item) => item.value === 'department');
 
-    expect(options.map((item) => item.value)).toContain('name');
-    expect(options.map((item) => item.value)).not.toContain('company');
+    expect(departmentOption?.children?.map((item) => item.value)).toContain('name');
+    expect(departmentOption?.children?.map((item) => item.value)).not.toContain('company');
   });
 
   it('hides lazy-loaded association selector options after two association levels', () => {

package/src/flow/components/code-editor/__tests__/useCodeRunner.test.tsx

@@ -20,8 +20,6 @@ import {
   FlowEngineProvider,
   FlowModelRenderer,
   ElementProxy,
-  createSafeWindow,
-  createSafeDocument,
   createViewScopedEngine,
 } from '@nocobase/flow-engine';
 import { JSEditableFieldModel } from '../../../models/fields/JSEditableFieldModel';
@@ -167,11 +165,7 @@ describe('useCodeRunner (beforeRender)', () => {
             const code = ctx?.inputArgs?.preview?.code || '';
             ctx.onRefReady(ctx.ref, async (el) => {
               ctx.defineProperty('element', { get: () => new ElementProxy(el as any) });
-              await ctx.runjs(
-                code,
-                { window: createSafeWindow(), document: createSafeDocument() },
-                { preprocessTemplates: true },
-              );
+              await ctx.runjs(code, undefined, { preprocessTemplates: true });
             });
           },
         },
@@ -286,16 +280,7 @@ return currentUsername;
             const code = ctx?.inputArgs?.preview?.code || '';
             ctx.onRefReady(ctx.ref, async (el) => {
               ctx.defineProperty('element', { get: () => new ElementProxy(el as any) });
-              const navigator = { userAgent: 'test' } as any;
-              await ctx.runjs(
-                code,
-                {
-                  window: createSafeWindow({ navigator }),
-                  document: createSafeDocument(),
-                  navigator,
-                },
-                { preprocessTemplates: true },
-              );
+              await ctx.runjs(code, undefined, { preprocessTemplates: true });
             });
           },
         },

package/src/flow/components/code-editor/hooks/useCodeRunner.ts

@@ -9,14 +9,7 @@
 
 import { useCallback, useRef, useState } from 'react';
 import { parseErrorLineColumn, WRAPPER_PRELUDE_LINES } from '../errorHelpers';
-import {
-  FlowModelContext,
-  JSRunner,
-  createSafeWindow,
-  createSafeDocument,
-  createSafeNavigator,
-  prepareRunJsCode,
-} from '@nocobase/flow-engine';
+import { FlowModelContext, JSRunner, prepareRunJsCode } from '@nocobase/flow-engine';
 
 export type RunLog = { level: 'log' | 'info' | 'warn' | 'error'; msg: string; line?: number; column?: number };
 type RunResult = Awaited<ReturnType<JSRunner['run']>>;
@@ -286,12 +279,7 @@ export function useCodeRunner(hostCtx: FlowModelContext, version = 'v1') {
           const eventName = typeof onDef === 'string' ? onDef : onDef?.eventName;
           if (!flow) {
             // 无可用流程（典型场景：联动规则里的 RunJS 预览），直接在当前上下文执行代码
-            const navigator = createSafeNavigator();
-            await directRunCtx.runjs(
-              code,
-              { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-              { version },
-            );
+            await directRunCtx.runjs(code, undefined, { version });
           } else if (typeof eventName === 'string') {
             await m.dispatchEvent(eventName, { preview: { code } }, { sequential: true, useCache: false });
           } else if (isManual) {

package/src/flow/components/code-editor/runjsDiagnostics.ts

@@ -20,10 +20,8 @@ import * as acornWalk from 'acorn-walk';
 import {
   JSRunner,
   FlowContext,
-  createSafeDocument,
-  createSafeNavigator,
-  createSafeWindow,
   prepareRunJsCode,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates,
 } from '@nocobase/flow-engine';
 
@@ -604,41 +602,7 @@ function collectHeuristicIssues(code: string): RunJSIssue[] {
     return issues;
   }
 
-  const declared = new Set<string>([
-    // Common globals / allowed runtime context roots
-    'ctx',
-    'console',
-    'window',
-    'document',
-    'navigator',
-    'Math',
-    'Date',
-    'Array',
-    'Object',
-    'Number',
-    'String',
-    'Boolean',
-    'Promise',
-    'RegExp',
-    'Set',
-    'Map',
-    'WeakSet',
-    'WeakMap',
-    'JSON',
-    'Intl',
-    'URL',
-    'Error',
-    'TypeError',
-    'encodeURIComponent',
-    'decodeURIComponent',
-    'parseInt',
-    'parseFloat',
-    'isNaN',
-    'isFinite',
-    'undefined',
-    'NaN',
-    'Infinity',
-  ]);
+  const declared = new Set<string>(RUNJS_ALLOWED_BARE_GLOBAL_NAMES);
 
   const addId = (id: any) => {
     if (id && typeof id.name === 'string') declared.add(id.name);
@@ -1036,15 +1000,14 @@ export async function diagnoseRunJS(
     const { consoleCapture, loggerCapture } = createLogCollectors(logs);
 
     const baseGlobals: Record<string, any> = { console: consoleCapture };
-    try {
-      if (typeof window !== 'undefined') {
-        const navigator = createSafeNavigator();
+    if (typeof window !== 'undefined') {
+      baseGlobals.window = window;
+      if (typeof navigator !== 'undefined') {
         baseGlobals.navigator = navigator;
-        baseGlobals.window = createSafeWindow({ navigator });
-        baseGlobals.document = createSafeDocument();
       }
-    } catch (_) {
-      // ignore safe globals failures
+    }
+    if (typeof document !== 'undefined') {
+      baseGlobals.document = document;
     }
 
     let prepared = src;

package/src/flow/components/fieldAssignOptions.ts

@@ -57,12 +57,11 @@ function getItemLabel(itemModel: any, t: (key: string) => string): string {
   return '';
 }
 
-function getLastPathSegment(path: string): string {
-  const segs = String(path || '')
+function splitFieldPath(path: string): string[] {
+  return String(path || '')
     .split('.')
     .map((s) => s.trim())
     .filter(Boolean);
-  return segs.length ? segs[segs.length - 1] : '';
 }
 
 type CollectionLike = {
@@ -70,6 +69,15 @@ type CollectionLike = {
   getFields?: () => unknown[];
 };
 
+type CollectionFieldLike = {
+  name?: unknown;
+  title?: unknown;
+  interface?: unknown;
+  target?: unknown;
+  isAssociationField?: () => boolean;
+  targetCollection?: CollectionLike | null;
+};
+
 function getCollectionFromFormBlockModel(model: any): CollectionLike | null {
   if (!model || typeof model !== 'object') return null;
   const collection = (model as any)?.collection || (model as any)?.context?.collection;
@@ -89,14 +97,7 @@ export function buildFieldAssignCascaderOptionsFromCollection(
   const out: FieldAssignCascaderOption[] = [];
   for (const rawField of fields) {
     if (!rawField) continue;
-    const f = rawField as {
-      name?: unknown;
-      title?: unknown;
-      interface?: unknown;
-      target?: unknown;
-      isAssociationField?: () => boolean;
-      targetCollection?: any;
-    };
+    const f = rawField as CollectionFieldLike;
     const fieldInterface = typeof f.interface === 'string' ? f.interface : undefined;
     if (!fieldInterface) continue;
     if (fieldInterface === 'formula') continue;
@@ -123,23 +124,143 @@ export function buildFieldAssignCascaderOptionsFromCollection(
 function mergeRootOptions(
   configured: FieldAssignCascaderOption[],
   allFields: FieldAssignCascaderOption[],
+): FieldAssignCascaderOption[] {
+  return mergeCascaderOptions(configured, allFields);
+}
+
+function mergeCascaderOptions(
+  configured: FieldAssignCascaderOption[],
+  allFields: FieldAssignCascaderOption[],
 ): FieldAssignCascaderOption[] {
   const configuredList = Array.isArray(configured) ? configured : [];
   const allList = Array.isArray(allFields) ? allFields : [];
+  const result = configuredList.map((item) => cloneCascaderOption(item));
 
-  const configuredValues = new Set<string>();
-  for (const it of configuredList) {
-    const v = it?.value ? String(it.value) : '';
-    if (v) configuredValues.add(v);
+  for (const item of allList) {
+    mergeCascaderOptionInto(result, item);
   }
 
-  const extra = allList.filter((it) => {
-    const v = it?.value ? String(it.value) : '';
-    if (!v) return false;
-    return !configuredValues.has(v);
-  });
+  return result;
+}
+
+function cloneCascaderOption(option: FieldAssignCascaderOption): FieldAssignCascaderOption {
+  return {
+    ...option,
+    children: option.children?.map((child) => cloneCascaderOption(child)),
+  };
+}
+
+function mergeCascaderOptionInto(options: FieldAssignCascaderOption[], source: FieldAssignCascaderOption) {
+  const value = source?.value ? String(source.value) : '';
+  if (!value) return;
+
+  const existing = options.find((item) => String(item?.value || '') === value);
+  if (!existing) {
+    options.push(cloneCascaderOption(source));
+    return;
+  }
+
+  if (!existing.label && source.label) {
+    existing.label = source.label;
+  }
+  if (source.isLeaf === false || existing.children?.length || source.children?.length) {
+    existing.isLeaf = false;
+  }
+  if (source.loading) {
+    existing.loading = source.loading;
+  }
+  if (source.children?.length) {
+    existing.children = mergeCascaderOptions(existing.children || [], source.children);
+  }
+}
+
+function getCollectionField(collection: CollectionLike | null, name: string): CollectionFieldLike | undefined {
+  const field = typeof collection?.getField === 'function' ? collection.getField(name) : undefined;
+  return field && typeof field === 'object' ? (field as CollectionFieldLike) : undefined;
+}
+
+function isAssociationFieldLike(field?: CollectionFieldLike | null) {
+  return !!(field?.isAssociationField?.() || field?.target || field?.targetCollection);
+}
+
+function getFieldLabelFromCollection(collection: CollectionLike | null, name: string, t: (key: string) => string) {
+  const field = getCollectionField(collection, name);
+  const title = typeof field?.title === 'string' && field.title ? field.title : name;
+  return t(title);
+}
+
+function getAssociationDepthFromFieldPath(
+  rootCollection: CollectionLike | null,
+  segments: string[],
+): number | undefined {
+  if (!rootCollection) return undefined;
+
+  let collection: CollectionLike | null = rootCollection;
+  let associationDepth = 0;
+  for (let index = 0; index < segments.length; index++) {
+    const field = getCollectionField(collection, segments[index]);
+    if (!field) return undefined;
+
+    if (isAssociationFieldLike(field)) {
+      associationDepth += 1;
+      collection = field.targetCollection || null;
+      continue;
+    }
+
+    if (index < segments.length - 1) return undefined;
+  }
+
+  return associationDepth;
+}
+
+function shouldIncludeConfiguredFieldPath(options: {
+  segments: string[];
+  rootCollection: CollectionLike | null;
+  leafField?: CollectionFieldLike | null;
+  maxAssociationFieldDepth: number;
+}) {
+  const resolvedAssociationDepth = getAssociationDepthFromFieldPath(options.rootCollection, options.segments);
+  if (typeof resolvedAssociationDepth === 'number') {
+    return resolvedAssociationDepth <= options.maxAssociationFieldDepth;
+  }
+
+  const leafIsAssociation = isAssociationFieldLike(options.leafField);
+  const maxPathLength = leafIsAssociation ? options.maxAssociationFieldDepth : options.maxAssociationFieldDepth + 1;
+  return options.segments.length <= maxPathLength;
+}
+
+function buildNestedOptionFromFieldPath(options: {
+  targetPath: string;
+  leaf: FieldAssignCascaderOption;
+  rootCollection: CollectionLike | null;
+  t: (key: string) => string;
+}): FieldAssignCascaderOption {
+  const segments = splitFieldPath(options.targetPath);
+  if (segments.length <= 1) {
+    return options.leaf;
+  }
+
+  const build = (index: number, collection: CollectionLike | null): FieldAssignCascaderOption => {
+    const value = segments[index];
+    const isLast = index === segments.length - 1;
+    if (isLast) {
+      return {
+        ...options.leaf,
+        value,
+      };
+    }
+
+    const field = getCollectionField(collection, value);
+    const nextCollection = field?.targetCollection || null;
+    return {
+      label: getFieldLabelFromCollection(collection, value, options.t),
+      value,
+      isLeaf: false,
+      children: [build(index + 1, nextCollection)],
+    };
+  };
 
-  return [...configuredList, ...extra];
+  return build(0, options.rootCollection);
 }
 
 export function collectFieldAssignCascaderOptions(options: {
@@ -167,7 +288,8 @@ export function collectFieldAssignCascaderOptions(options: {
       const targetPath = getItemFieldPath(item);
       if (!targetPath) continue;
 
-      const seg = getLastPathSegment(targetPath);
+      const segments = splitFieldPath(targetPath);
+      const seg = segments[segments.length - 1];
       if (!seg) continue;
 
       const node: FieldAssignCascaderOption = {
@@ -179,10 +301,16 @@ export function collectFieldAssignCascaderOptions(options: {
       const childItems = fieldModel?.subModels?.grid?.subModels?.items;
       const cf: (CollectionField & { target?: unknown; targetCollection?: unknown }) | undefined =
         fieldModel?.context?.collectionField;
-      const isAssociation = !!(cf?.isAssociationField?.() || cf?.target || cf?.targetCollection);
+      const isAssociation = isAssociationFieldLike(cf);
       const hasTargetCollection = !!cf?.targetCollection;
-      const associationDepth = isAssociation ? targetPath.split('.').filter(Boolean).length : 0;
-      if (isAssociation && associationDepth > maxAssociationFieldDepth) {
+      if (
+        !shouldIncludeConfiguredFieldPath({
+          segments,
+          rootCollection,
+          leafField: cf,
+          maxAssociationFieldDepth,
+        })
+      ) {
         continue;
       }
 
@@ -203,7 +331,7 @@ export function collectFieldAssignCascaderOptions(options: {
             node.isLeaf = true;
           }
         }
-        out.push(node);
+        mergeCascaderOptionInto(out, buildNestedOptionFromFieldPath({ targetPath, leaf: node, rootCollection, t }));
         continue;
       }
 
@@ -215,7 +343,7 @@ export function collectFieldAssignCascaderOptions(options: {
         node.isLeaf = true;
       }
 
-      out.push(node);
+      mergeCascaderOptionInto(out, buildNestedOptionFromFieldPath({ targetPath, leaf: node, rootCollection, t }));
     }
 
     return out;

package/src/flow/models/actions/JSActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel } from '../base';
@@ -72,12 +72,7 @@ ctx.message.info('Hello JS action.');
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },

package/src/flow/models/actions/JSCollectionActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel, ActionSceneEnum } from '../base';
@@ -78,12 +78,7 @@ if (!rows.length) {
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },

package/src/flow/models/actions/JSItemActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ElementProxy, createSafeDocument, createSafeNavigator, createSafeWindow, tExpr } from '@nocobase/flow-engine';
+import { ElementProxy, tExpr } from '@nocobase/flow-engine';
 import React from 'react';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel, ActionSceneEnum, CollectionActionGroupModel, RecordActionGroupModel } from '../base';
@@ -137,12 +137,7 @@ JSItemActionModel.registerFlow({
           ctx.defineProperty('element', {
             get: () => new ElementProxy(element),
           });
-          const navigator = createSafeNavigator();
-          await ctx.runjs(
-            code,
-            { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-            { version },
-          );
+          await ctx.runjs(code, undefined, { version });
         });
       },
     },

package/src/flow/models/actions/JSRecordActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionSceneEnum, RecordActionModel } from '../base';
@@ -78,12 +78,7 @@ if (!ctx.record) {
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },