@nocobase/flow-engine 2.4.0-alpha.8 → 2.4.0-alpha.9

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.8",
+  "version": "2.4.0-alpha.9",
   "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.8",
-    "@nocobase/shared": "2.4.0-alpha.8",
+    "@nocobase/sdk": "2.4.0-alpha.9",
+    "@nocobase/shared": "2.4.0-alpha.9",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "e8ec2bff07f4b405e08f984c9e92b44491bde462"
+  "gitHead": "d383bdb224c62d1ba21c3dffd682165f3385a11b"
 }

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/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;
               }