@nocobase/flow-engine 2.4.0-alpha.1 → 2.4.0-alpha.10

package/lib/FlowDefinition.d.ts

@@ -13,6 +13,7 @@ export declare class FlowDefinition {
     _steps: Map<string, FlowStep>;
     protected options: Omit<FlowDefinitionOptions, 'steps'>;
     constructor(options: FlowDefinitionOptions, flowRegistry: IFlowRepository);
+    get model(): import(".").FlowModel<import("./types").DefaultStructure>;
     get key(): string;
     get title(): string;
     set title(title: string);

package/lib/FlowDefinition.js

@@ -53,6 +53,9 @@ const _FlowDefinition = class _FlowDefinition {
   }
   _steps = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
   options;
+  get model() {
+    return this.flowRegistry.model;
+  }
   get key() {
     return this.options.key;
   }

package/lib/data-source/jioToJoiSchema.js

@@ -94,7 +94,15 @@ function jioToJoiSchema(jioConfig) {
     if (name === "required") hasRequired = true;
     if (typeof schema[name] === "function") {
       try {
-        schema = schema[name](...getArgs(name, args));
+        if (jioConfig.type === "number" && name === "precision") {
+          const precisionSchema = import_joi.default.number().precision(getArgs(name, args)[0]).strict();
+          schema = schema.custom((value, helpers) => {
+            const { error } = precisionSchema.validate(value);
+            return error ? helpers.error("number.precision", error.details[0].context) : value;
+          });
+        } else {
+          schema = schema[name](...getArgs(name, args));
+        }
       } catch (err) {
         console.warn(`\u8C03\u7528 Joi \u65B9\u6CD5 ${name} \u5931\u8D25:`, err);
       }

package/lib/flow-registry/BaseFlowRegistry.d.ts

@@ -8,8 +8,10 @@
  */
 import { FlowDefinitionOptions } from '../types';
 import { FlowDefinition } from '../FlowDefinition';
+import type { FlowModel } from '../models';
 type FlowKey = string;
 export interface IFlowRepository {
+    readonly model?: FlowModel;
     addFlows(flowDefs: Record<string, Omit<FlowDefinitionOptions, 'key'>>): void;
     addFlow(flowKey: string, flowOptions: Omit<FlowDefinitionOptions, 'key'>): FlowDefinition | void;
     removeFlow(flowKey: string): void;

package/lib/flow-registry/InstanceFlowRegistry.d.ts

@@ -11,7 +11,7 @@ import { FlowModel } from '../models';
 import { BaseFlowRegistry } from './BaseFlowRegistry';
 type FlowKey = string;
 export declare class InstanceFlowRegistry extends BaseFlowRegistry {
-    protected model: FlowModel;
+    readonly model: FlowModel;
     static readonly _type: "instance";
     constructor(model: FlowModel);
     save(): Promise<void>;

package/lib/flowContext.d.ts

@@ -349,6 +349,7 @@ declare class BaseFlowEngineContext extends FlowContext {
      */
     renderJson: (template: JSONValue) => Promise<any>;
     resolveJsonTemplate: (template: JSONValue, options?: ResolveJsonTemplateOptions) => Promise<any>;
+    variableContractModelUid?: string;
     getVar: (path: string) => Promise<any>;
     request: (options: RequestOptions) => Promise<any>;
     runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;

package/lib/flowContext.js

@@ -2518,7 +2518,7 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
           try {
             const contractRd = (0, import_params_resolvers.buildFlowModelResolveDescriptor)(
               this,
-              options == null ? void 0 : options.contractModelUid
+              (options == null ? void 0 : options.contractModelUid) ?? this.variableContractModelUid
             );
             serverResolved = await (0, import_params_resolvers.enqueueVariablesResolve)(this, {
               ...contractRd ? { contractRd } : {},
@@ -2986,11 +2986,16 @@ __name(_FlowForkModelContext, "FlowForkModelContext");
 let FlowForkModelContext = _FlowForkModelContext;
 const _FlowRuntimeContext = class _FlowRuntimeContext extends BaseFlowModelContext {
   constructor(model, flowKey, _mode = "runtime") {
+    var _a, _b;
     super();
     this.model = model;
     this.flowKey = flowKey;
     this._mode = _mode;
     this.addDelegate(this.model.context);
+    const owner = (_b = (_a = model.getFlow) == null ? void 0 : _a.call(model, flowKey)) == null ? void 0 : _b.model;
+    if (owner && owner.uid !== model.uid) {
+      this.defineProperty("variableContractModelUid", { value: owner.uid });
+    }
     this.defineMethod("getStepParams", (stepKey) => {
       return model.getStepParams(flowKey, stepKey) || {};
     });

package/lib/models/CollectionFieldModel.d.ts

@@ -38,7 +38,7 @@ export declare class CollectionFieldModel<T extends DefaultStructure = DefaultSt
     get collectionField(): CollectionField;
     afterAddAsSubModel(): Promise<void>;
     static getBindingsByField(ctx: FlowEngineContext, collectionField: CollectionField): BindingOptions[];
-    static getDefaultBindingByField(ctx: FlowEngineContext, collectionField: CollectionField, options?: {
+    static getDefaultBindingByField(ctx: FlowEngineContext, collectionField: CollectionField | null | undefined, options?: {
         useStrict?: boolean;
         fallbackToTargetTitleField?: boolean;
         targetCollectionTitleField?: CollectionField;

package/lib/models/CollectionFieldModel.js

@@ -83,7 +83,7 @@ function FieldDeletePlaceholder() {
     const dataSourcePrefix = dataSource ? `${t(dataSource.displayName || dataSource.key)} > ` : "";
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : "";
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource, name, t]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -111,7 +111,7 @@ function FieldWithoutPermissionPlaceholder() {
     const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : "";
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource.displayName, dataSource.key, name, t]);
   const { actionName } = model.forbidden;
   const messageValue = (0, import_react.useMemo)(() => {
     return t(
@@ -121,7 +121,7 @@ function FieldWithoutPermissionPlaceholder() {
         actionName: t(import_lodash.default.capitalize(actionName))
       }
     ).replaceAll(">", ">");
-  }, [nameValue, t]);
+  }, [actionName, nameValue, t]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: messageValue }, /* @__PURE__ */ import_react.default.createElement(import_FormItem.FormItem, { showLabel: true, label: model.context.collectionField.title || name, style: { opacity: "0.4" } }, /* @__PURE__ */ import_react.default.createElement(import_icons.LockOutlined, null)));
 }
 __name(FieldWithoutPermissionPlaceholder, "FieldWithoutPermissionPlaceholder");
@@ -188,6 +188,9 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     );
   }
   static getDefaultBindingByField(ctx, collectionField, options = {}) {
+    if (!collectionField) {
+      return null;
+    }
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {

package/lib/views/createViewMeta.js

@@ -360,7 +360,9 @@ function createPopupMeta(ctx, anchorView) {
           const view = getPopupView(ctx, anchorView);
           const inputArgs = view == null ? void 0 : view.inputArgs;
           const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
-          let assoc = inputArgs == null ? void 0 : inputArgs.associationName;
+          const hasSourceId = srcId != null && srcId !== "";
+          const pendingSourceAssoc = !hasSourceId && typeof (inputArgs == null ? void 0 : inputArgs.sourceAssociationName) === "string" ? inputArgs.sourceAssociationName : void 0;
+          let assoc = (inputArgs == null ? void 0 : inputArgs.associationName) || pendingSourceAssoc;
           let dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
           if (!assoc || typeof assoc !== "string" || !assoc.includes(".")) {
             const stack = getViewStack(view);
@@ -376,7 +378,7 @@ function createPopupMeta(ctx, anchorView) {
               dsKey = (p == null ? void 0 : p.dataSourceKey) || dsKey;
             }
           }
-          if (srcId != null && srcId !== "" && assoc && typeof assoc === "string") {
+          if ((hasSourceId || pendingSourceAssoc) && assoc && typeof assoc === "string") {
             const parentCollectionName = String(assoc).includes(".") ? String(assoc).split(".")[0] : void 0;
             if (parentCollectionName) {
               const parentCollectionAccessor = /* @__PURE__ */ __name(() => {
@@ -388,11 +390,15 @@ function createPopupMeta(ctx, anchorView) {
                   return null;
                 }
               }, "parentCollectionAccessor");
-              const srcMeta = await (0, import_variablesParams.buildRecordMeta)(parentCollectionAccessor, t("Current popup parent record"), () => ({
-                collection: parentCollectionName,
-                dataSourceKey: dsKey,
-                filterByTk: srcId
-              }));
+              const srcMeta = await (0, import_variablesParams.buildRecordMeta)(
+                parentCollectionAccessor,
+                t("Current popup parent record"),
+                () => hasSourceId ? {
+                  collection: parentCollectionName,
+                  dataSourceKey: dsKey,
+                  filterByTk: srcId
+                } : void 0
+              );
               if (srcMeta) {
                 props.sourceRecord = srcMeta;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.4.0-alpha.1",
+  "version": "2.4.0-alpha.10",
   "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.4.0-alpha.1",
-    "@nocobase/shared": "2.4.0-alpha.1",
+    "@nocobase/sdk": "2.4.0-alpha.10",
+    "@nocobase/shared": "2.4.0-alpha.10",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "82ecd3aed067e4cc98c32e7a0039b6e55cee76a7"
+  "gitHead": "c869865c0413fbe4ef85b26be1f2b8d7078c38df"
 }

package/src/FlowDefinition.ts

@@ -27,6 +27,10 @@ export class FlowDefinition {
     }
   }
 
+  get model() {
+    return this.flowRegistry.model;
+  }
+
   get key() {
     return this.options.key;
   }

package/src/__tests__/createViewMeta.popup.test.ts

@@ -8,7 +8,7 @@
  */
 
 import { describe, it, expect, vi } from 'vitest';
-import { FlowContext } from '../flowContext';
+import { FlowContext, type PropertyMeta } from '../flowContext';
 import { FlowEngine } from '../flowEngine';
 import type { FlowView } from '../views/FlowView';
 import { buildPopupRuntime, createPopupMeta, registerPopupVariable } from '../views/createViewMeta';
@@ -397,4 +397,86 @@ describe('createPopupMeta - popup variables', () => {
 
     expect(ctx.getPropertyOptions('popup')?.resolveOnServer?.('sourceRecord.department.title')).toBe(true);
   });
+
+  describe('popup sourceRecord meta for quick create popups', () => {
+    function makeCtxWithUsers() {
+      const engine = new FlowEngine();
+      const ds = engine.context.dataSourceManager.getDataSource('main');
+      ds.addCollection({
+        name: 'orgs',
+        filterTargetKey: 'id',
+        fields: [{ name: 'id', type: 'integer', interface: 'number' }],
+      });
+      ds.addCollection({
+        name: 'users',
+        filterTargetKey: 'id',
+        fields: [
+          { name: 'id', type: 'integer', interface: 'number' },
+          { name: 'nickname', type: 'string', interface: 'input' },
+          { name: 'orgs', type: 'hasMany', target: 'orgs', interface: 'o2m' },
+        ],
+      });
+      return engine.context;
+    }
+
+    function makeQuickCreatePopupView(inputArgs: Record<string, unknown>): FlowView {
+      return {
+        type: 'drawer',
+        inputArgs: {
+          openerUids: ['approval-form-uid'],
+          scene: 'create',
+          dataSourceKey: 'main',
+          collectionName: 'orgs',
+          ...inputArgs,
+        },
+        Header: null,
+        Footer: null,
+        close: () => void 0,
+        update: () => void 0,
+      } as unknown as FlowView;
+    }
+
+    async function getPopupProps(ctx: FlowContext, view: FlowView) {
+      const meta = await createPopupMeta(ctx, view)();
+      const props = typeof meta?.properties === 'function' ? await meta.properties() : meta?.properties;
+      return { meta, props: props || {} };
+    }
+
+    it('exposes the parent record meta from sourceAssociationName before the parent record has a primary key', async () => {
+      const ctx = makeCtxWithUsers();
+      const view = makeQuickCreatePopupView({ sourceAssociationName: 'users.orgs' });
+
+      const { meta, props } = await getPopupProps(ctx, view);
+      const sourceRecordMeta = props.sourceRecord as PropertyMeta;
+      expect(sourceRecordMeta?.title).toBe('Current popup parent record');
+      const fields =
+        typeof sourceRecordMeta.properties === 'function'
+          ? await sourceRecordMeta.properties()
+          : sourceRecordMeta.properties;
+      expect(fields).toHaveProperty('nickname');
+
+      // 父记录尚无主键时仅用于配置变量，不应生成服务端取值参数
+      const vars = (await meta?.buildVariablesParams?.(ctx)) as { sourceRecord?: unknown } | undefined;
+      expect(vars?.sourceRecord).toBeUndefined();
+    });
+
+    it('does not expose the parent record meta without sourceId or sourceAssociationName', async () => {
+      const ctx = makeCtxWithUsers();
+      const view = makeQuickCreatePopupView({});
+
+      const { props } = await getPopupProps(ctx, view);
+      expect(props.sourceRecord).toBeUndefined();
+    });
+
+    it('keeps resolving the parent record by sourceId once the parent record is persisted', async () => {
+      const ctx = makeCtxWithUsers();
+      const view = makeQuickCreatePopupView({ associationName: 'users.orgs', sourceId: 7 });
+
+      const { meta, props } = await getPopupProps(ctx, view);
+      expect((props.sourceRecord as PropertyMeta)?.title).toBe('Current popup parent record');
+
+      const vars = (await meta?.buildVariablesParams?.(ctx)) as { sourceRecord?: unknown } | undefined;
+      expect(vars?.sourceRecord).toEqual({ collection: 'users', dataSourceKey: 'main', filterByTk: 7 });
+    });
+  });
 });

package/src/__tests__/objectVariable.test.ts

@@ -9,7 +9,8 @@
 
 import { describe, expect, it, vi } from 'vitest';
 import { generateFlowModelRdFromToken } from '@nocobase/utils/client';
-import { FlowContext } from '../flowContext';
+import { FlowContext, FlowRuntimeContext } from '../flowContext';
+import { FlowModel } from '../models';
 import { FlowEngine } from '../flowEngine';
 import {
   createAssociationAwareObjectMetaFactory,
@@ -490,4 +491,39 @@ describe('objectVariable utilities', () => {
     expect(resolved).toEqual({ x: 'T1' });
     expect((ctx as any).api.request).not.toHaveBeenCalled();
   });
+
+  it('keeps runtime and configuration descriptors separate for a forwarded instance flow', async () => {
+    const engine = new FlowEngine();
+    const owner = new FlowModel({ uid: 'reference-owner', flowEngine: engine });
+    const target = new FlowModel({ uid: 'reference-target', flowEngine: engine });
+    owner.registerFlow({ key: 'forwarded', steps: {} });
+    const getFlow = vi.spyOn(target, 'getFlow').mockReturnValue(owner.getFlow('forwarded'));
+    const context = new FlowRuntimeContext(target, 'forwarded');
+    getFlow.mockRestore(); // Delayed getVar calls must retain the owner after the event bridge is restored.
+
+    type ResolveItem = { id: string; template: unknown; rd?: string; contractRd?: string };
+    const calls: ResolveItem[] = [];
+    const payload = Buffer.from(JSON.stringify({ userId: 1, signInTime: 'forwarded-flow' })).toString('base64url');
+    const token = `test.${payload}.sig`;
+    engine.context.defineProperty('api', {
+      value: {
+        auth: { token },
+        request: vi.fn(async ({ data }: { data: { values: { batch: ResolveItem[] } } }) => {
+          const batch = data.values.batch;
+          calls.push(...batch);
+          return { data: { data: { results: batch.map((item) => ({ id: item.id, data: 'resolved' })) } } };
+        }),
+      },
+    });
+    target.context.defineProperty('remote', { value: {}, resolveOnServer: true });
+
+    expect(await context.getVar('ctx.remote.name')).toBe('resolved');
+    expect(calls[0].rd).toBe(generateFlowModelRdFromToken(target.uid, token));
+    expect(calls[0].contractRd).toBe(generateFlowModelRdFromToken(owner.uid, token));
+    await context.resolveJsonTemplate('{{ ctx.remote.name }}', { contractModelUid: 'explicit-owner' });
+    expect(calls[1].contractRd).toBe(generateFlowModelRdFromToken('explicit-owner', token));
+    await new FlowRuntimeContext(target, 'local').resolveJsonTemplate('{{ ctx.remote.name }}');
+    expect(calls[2].contractRd).toBeUndefined();
+    expect(owner.getFlow('forwarded')?.serialize()).not.toHaveProperty('model');
+  });
 });

package/src/data-source/__tests__/index.test.ts

@@ -114,6 +114,34 @@ describe('DataSource & Collection APIs', () => {
     await expect(rules[0].validator({}, '123')).rejects.toBe('单行文本 长度必须为 18 个字符');
   });
 
+  it('enforces collection field precision in component validation rules', async () => {
+    const { m, engine } = makeManager();
+    const translate = vi.spyOn(engine, 'translate').mockImplementation((key) => key);
+    const ds = new DataSource({ key: 'main' });
+    m.addDataSource(ds);
+    ds.addCollection({
+      name: 'employees',
+      fields: [
+        {
+          name: 'years',
+          type: 'double',
+          interface: 'number',
+          title: 'Years',
+          validation: { type: 'number', rules: [{ name: 'precision', args: { limit: 2 } }] },
+        },
+      ],
+    });
+    const rules = ds.getCollection('employees').getField('years').getComponentProps().rules;
+
+    await expect(rules[0].validator({}, 39.2234)).rejects.toContain('2 decimal places');
+    expect(translate).toHaveBeenCalledWith(
+      'number.precision',
+      expect.objectContaining({ ns: 'data-source-main', label: 'Years', limit: 2 }),
+    );
+    await expect(rules[0].validator({}, 39.22)).resolves.toBeUndefined();
+    translate.mockRestore();
+  });
+
   it('ensureLoaded, reload and data source events work for main loader', async () => {
     const { m, engine } = makeManager();
     const loadedListener = vi.fn();

package/src/data-source/__tests__/jioToJoiSchema.test.ts

@@ -49,6 +49,57 @@ describe('jioToJoiSchema', () => {
     expect(s2.validate('zz').error).toBeTruthy();
   });
 
+  describe('number precision', () => {
+    const schema = jioToJoiSchema({ type: 'number', rules: [{ name: 'precision', args: { limit: 2 } }] });
+
+    it.each([39.2234, -39.2234, 0.001, 1e-7])('rejects %s without rounding', (value) => {
+      const result = schema.validate(value);
+      expect(result.error?.details[0]).toMatchObject({ type: 'number.precision', context: { limit: 2 } });
+      expect(result.value).toBe(value);
+    });
+
+    it.each([39.22, -39.22, 39.2, 39, 0, 0.01, '', null, undefined])('accepts %s', (value) => {
+      expect(schema.validate(value).error).toBeUndefined();
+    });
+
+    it('supports zero precision', () => {
+      const integerSchema = jioToJoiSchema({ type: 'number', rules: [{ name: 'precision', args: { limit: 0 } }] });
+      expect(integerSchema.validate(39).error).toBeUndefined();
+      expect(integerSchema.validate(39.2).error?.details[0].type).toBe('number.precision');
+    });
+
+    it('validates numeric strings without rounding them', () => {
+      expect(schema.validate('39.22')).toEqual({ value: 39.22 });
+      expect(schema.validate('39.2200')).toEqual({ value: 39.22 });
+      expect(schema.validate('39.2234').error?.details[0].type).toBe('number.precision');
+      expect(schema.validate('1e-7').error?.details[0].type).toBe('number.precision');
+      expect(schema.validate('not a number').error?.details[0].type).toBe('number.base');
+    });
+
+    it('preserves required and min/max validation', () => {
+      const requiredSchema = jioToJoiSchema({
+        type: 'number',
+        rules: [
+          { name: 'precision', args: { limit: 2 } },
+          { name: 'min', args: { limit: 1 } },
+          { name: 'max', args: { limit: 10 } },
+          { name: 'required' },
+        ],
+      });
+      expect(requiredSchema.validate(undefined).error?.details[0].type).toBe('any.required');
+      expect(requiredSchema.validate('').error).toBeDefined();
+      expect(requiredSchema.validate(null).error).toBeDefined();
+      expect(requiredSchema.validate(0.99).error?.details[0].type).toBe('number.min');
+      expect(requiredSchema.validate(10.01).error?.details[0].type).toBe('number.max');
+      expect(requiredSchema.validate(1.23).error).toBeUndefined();
+    });
+
+    it('preserves numeric string conversion when precision is not configured', () => {
+      const numberSchema = jioToJoiSchema({ type: 'number', rules: [{ name: 'min', args: { limit: 1 } }] });
+      expect(numberSchema.validate('39.2234')).toEqual({ value: 39.2234 });
+    });
+  });
+
   it('optional when no required and allows empty string', () => {
     const schema = jioToJoiSchema({ type: 'string' });
     expect(schema.validate('').error).toBeUndefined();

package/src/data-source/jioToJoiSchema.ts

@@ -85,7 +85,16 @@ export function jioToJoiSchema<T extends JioType>(jioConfig: {
     if (name === 'required') hasRequired = true;
     if (typeof schema[name] === 'function') {
       try {
-        schema = schema[name](...getArgs(name, args));
+        if (jioConfig.type === 'number' && name === 'precision') {
+          // Validate precision without rounding, while preserving the outer schema's numeric string conversion.
+          const precisionSchema = Joi.number().precision(getArgs(name, args)[0]).strict();
+          schema = schema.custom((value: number, helpers: Joi.CustomHelpers) => {
+            const { error } = precisionSchema.validate(value);
+            return error ? helpers.error('number.precision', error.details[0].context) : value;
+          });
+        } else {
+          schema = schema[name](...getArgs(name, args));
+        }
       } catch (err) {
         console.warn(`调用 Joi 方法 ${name} 失败:`, err);
       }

package/src/flow-registry/BaseFlowRegistry.ts

@@ -10,10 +10,12 @@
 import { FlowDefinitionOptions } from '../types';
 import { FlowDefinition } from '../FlowDefinition';
 import { observable } from '@formily/reactive';
+import type { FlowModel } from '../models';
 
 type FlowKey = string;
 
 export interface IFlowRepository {
+  readonly model?: FlowModel;
   addFlows(flowDefs: Record<string, Omit<FlowDefinitionOptions, 'key'>>): void;
   addFlow(flowKey: string, flowOptions: Omit<FlowDefinitionOptions, 'key'>): FlowDefinition | void;
   removeFlow(flowKey: string): void;

package/src/flow-registry/InstanceFlowRegistry.ts

@@ -15,7 +15,7 @@ type FlowKey = string;
 
 export class InstanceFlowRegistry extends BaseFlowRegistry {
   static readonly _type = 'instance' as const;
-  constructor(protected model: FlowModel) {
+  constructor(public readonly model: FlowModel) {
     super();
   }
 

package/src/flowContext.ts

@@ -3051,6 +3051,7 @@ class BaseFlowEngineContext extends FlowContext {
    */
   declare renderJson: (template: JSONValue) => Promise<any>;
   declare resolveJsonTemplate: (template: JSONValue, options?: ResolveJsonTemplateOptions) => Promise<any>;
+  declare variableContractModelUid?: string;
   declare getVar: (path: string) => Promise<any>;
   declare request: (options: RequestOptions) => Promise<any>;
   declare runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;
@@ -3408,7 +3409,7 @@ export class FlowEngineContext extends BaseFlowEngineContext {
           try {
             const contractRd = buildFlowModelResolveDescriptor(
               this as FlowRuntimeContext<FlowModel>,
-              options?.contractModelUid,
+              options?.contractModelUid ?? this.variableContractModelUid,
             );
             serverResolved = await enqueueVariablesResolve(this as FlowRuntimeContext<FlowModel>, {
               ...(contractRd ? { contractRd } : {}),
@@ -3943,6 +3944,11 @@ export class FlowRuntimeContext<
   ) {
     super();
     this.addDelegate(this.model.context);
+    const owner = model.getFlow?.(flowKey)?.model;
+    if (owner && owner.uid !== model.uid) {
+      // A forwarded instance flow keeps its configuration owner, without changing the runtime model.
+      this.defineProperty('variableContractModelUid', { value: owner.uid });
+    }
     this.defineMethod('getStepParams', (stepKey: string) => {
       return model.getStepParams(flowKey, stepKey) || {};
     });

package/src/models/CollectionFieldModel.tsx

@@ -51,7 +51,7 @@ export function FieldDeletePlaceholder() {
     const dataSourcePrefix = dataSource ? `${t(dataSource.displayName || dataSource.key)} > ` : '';
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : '';
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource, name, t]);
   return (
     <Form.Item>
       <div
@@ -80,7 +80,7 @@ function FieldWithoutPermissionPlaceholder() {
     const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : '';
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource.displayName, dataSource.key, name, t]);
   const { actionName } = model.forbidden;
   const messageValue = useMemo(() => {
     return t(
@@ -90,7 +90,7 @@ function FieldWithoutPermissionPlaceholder() {
         actionName: t(_.capitalize(actionName)),
       },
     ).replaceAll('&gt;', '>');
-  }, [nameValue, t]);
+  }, [actionName, nameValue, t]);
 
   return (
     <Tooltip title={messageValue}>
@@ -198,13 +198,16 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
 
   static getDefaultBindingByField(
     ctx: FlowEngineContext,
-    collectionField: CollectionField,
+    collectionField: CollectionField | null | undefined,
     options: {
       useStrict?: boolean;
       fallbackToTargetTitleField?: boolean;
       targetCollectionTitleField?: CollectionField;
     } = {},
   ): BindingOptions | null {
+    if (!collectionField) {
+      return null;
+    }
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {

package/src/models/__tests__/CollectionFieldModel.test.ts

@@ -108,6 +108,11 @@ describe('CollectionFieldModel', () => {
     expect(defaultBinding).toBeNull();
   });
 
+  it('should return null when the collection field has been deleted', () => {
+    const defaultBinding = TestModel.getDefaultBindingByField(mockContext, undefined);
+    expect(defaultBinding).toBeNull();
+  });
+
   it('should return null if no bindings exist for the interface', () => {
     class Test1Model extends CollectionFieldModel {}
     class Test2Model extends Test1Model {}

package/src/views/createViewMeta.ts

@@ -390,7 +390,13 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
           const view = getPopupView(ctx, anchorView);
           const inputArgs = view?.inputArgs;
           const srcId = inputArgs?.sourceId;
-          let assoc: string | undefined = inputArgs?.associationName;
+          const hasSourceId = srcId != null && srcId !== '';
+          // 上级记录暂无主键时（如审批配置态表单里的快速创建弹窗），只会传 sourceAssociationName：仍展示变量结构，取值依赖运行时的 sourceId
+          const pendingSourceAssoc =
+            !hasSourceId && typeof inputArgs?.sourceAssociationName === 'string'
+              ? inputArgs.sourceAssociationName
+              : undefined;
+          let assoc: string | undefined = inputArgs?.associationName || pendingSourceAssoc;
           let dsKey: string = inputArgs?.dataSourceKey || 'main';
 
           // 兜底：若 associationName 缺失或不含“.”，尝试从当前视图模型的 openView 参数推断
@@ -409,7 +415,7 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
             }
           }
 
-          if (srcId != null && srcId !== '' && assoc && typeof assoc === 'string') {
+          if ((hasSourceId || pendingSourceAssoc) && assoc && typeof assoc === 'string') {
             const parentCollectionName = String(assoc).includes('.') ? String(assoc).split('.')[0] : undefined;
             if (parentCollectionName) {
               const parentCollectionAccessor = () => {
@@ -420,11 +426,15 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
                   return null;
                 }
               };
-              const srcMeta = await buildRecordMeta(parentCollectionAccessor, t('Current popup parent record'), () => ({
-                collection: parentCollectionName,
-                dataSourceKey: dsKey,
-                filterByTk: srcId,
-              }));
+              const srcMeta = await buildRecordMeta(parentCollectionAccessor, t('Current popup parent record'), () =>
+                hasSourceId
+                  ? {
+                      collection: parentCollectionName,
+                      dataSourceKey: dsKey,
+                      filterByTk: srcId,
+                    }
+                  : undefined,
+              );
               if (srcMeta) {
                 props.sourceRecord = srcMeta;
               }