@nocobase/flow-engine 2.1.7 → 2.1.9

package/lib/flowContext.js

@@ -2294,6 +2294,36 @@ const _BaseFlowModelContext = class _BaseFlowModelContext extends BaseFlowEngine
 };
 __name(_BaseFlowModelContext, "BaseFlowModelContext");
 let BaseFlowModelContext = _BaseFlowModelContext;
+const OPEN_VIEW_INHERITED_INPUT_ARG_KEYS = [
+  "dataSourceKey",
+  "collectionName",
+  "associationName",
+  "filterByTk",
+  "sourceId",
+  "tabUid"
+];
+function pickDefinedKeys(source, keys) {
+  const res = {};
+  for (const key of keys) {
+    if (typeof (source == null ? void 0 : source[key]) !== "undefined") {
+      res[key] = source[key];
+    }
+  }
+  return res;
+}
+__name(pickDefinedKeys, "pickDefinedKeys");
+function pickDefinedOpenViewInputArgs(source) {
+  return pickDefinedKeys(source, OPEN_VIEW_INHERITED_INPUT_ARG_KEYS);
+}
+__name(pickDefinedOpenViewInputArgs, "pickDefinedOpenViewInputArgs");
+function applyDefinedDefaults(target, defaults) {
+  for (const [key, value] of Object.entries(defaults)) {
+    if (typeof target[key] === "undefined") {
+      target[key] = value;
+    }
+  }
+}
+__name(applyDefinedDefaults, "applyDefinedDefaults");
 const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContext {
   // public dataSourceManager: DataSourceManager;
   constructor(engine) {
@@ -2791,23 +2821,19 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
       }
     });
     this.defineMethod("openView", async function(uid, options) {
-      var _a, _b, _c, _d, _e;
-      const opts = { ...options };
+      var _a, _b, _c, _d;
+      const inheritedInputArgs = {
+        ...typeof ((_a = this.model) == null ? void 0 : _a["getInputArgs"]) === "function" ? pickDefinedOpenViewInputArgs(this.model["getInputArgs"]()) : {},
+        ...pickDefinedOpenViewInputArgs(this.inputArgs)
+      };
+      const opts = { ...options || {} };
+      applyDefinedDefaults(opts, inheritedInputArgs);
       if (opts.defineProperties || opts.defineMethods) {
         opts.navigation = false;
       }
       let model2 = null;
       model2 = await this.engine.loadModel({ uid });
       if (!model2) {
-        const pickDefined = /* @__PURE__ */ __name((src, keys) => {
-          const res = {};
-          for (const k of keys) {
-            if (typeof (src == null ? void 0 : src[k]) !== "undefined") {
-              res[k] = src[k];
-            }
-          }
-          return res;
-        }, "pickDefined");
         model2 = this.engine.createModel({
           uid,
           // 注意： 新建的 model 应该使用 ${parentModel.uid}-xxx 形式的 uid
@@ -2819,7 +2845,7 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
             popupSettings: {
               openView: {
                 // 仅在创建时持久化一份默认配置；运行时以本次 opts 为准，避免多个 opener 互相覆盖。
-                ...pickDefined(opts, ["dataSourceKey", "collectionName", "associationName", "mode", "size"])
+                ...pickDefinedKeys(opts, ["dataSourceKey", "collectionName", "associationName", "mode", "size"])
               }
             }
           }
@@ -2827,12 +2853,10 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
         await model2.save();
       }
       model2.setParent(this.model);
-      const viewUid = (opts == null ? void 0 : opts.routeViewUid) ?? (opts == null ? void 0 : opts.viewUid) ?? (((_b = (_a = model2.stepParams) == null ? void 0 : _a.popupSettings) == null ? void 0 : _b.openView) ? model2.uid : this.model.uid);
+      const viewUid = (opts == null ? void 0 : opts.routeViewUid) ?? (opts == null ? void 0 : opts.viewUid) ?? (((_c = (_b = model2.stepParams) == null ? void 0 : _b.popupSettings) == null ? void 0 : _c.openView) ? model2.uid : this.model.uid);
       const parentView = this.view;
       const pendingType = (opts == null ? void 0 : opts.isMobileLayout) ? "embed" : (opts == null ? void 0 : opts.mode) || "drawer";
       const pendingInputArgs = { ...opts, viewUid, navigation: opts.navigation };
-      pendingInputArgs.filterByTk = pendingInputArgs.filterByTk || ((_c = this.inputArgs) == null ? void 0 : _c.filterByTk);
-      pendingInputArgs.sourceId = pendingInputArgs.sourceId || ((_d = this.inputArgs) == null ? void 0 : _d.sourceId);
       const pendingView = {
         type: pendingType,
         inputArgs: pendingInputArgs,
@@ -2841,7 +2865,7 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
         engineCtx: this.engine.context
       };
       model2.context.defineProperty("view", { value: pendingView });
-      const popupFlow = (_e = model2.getFlow) == null ? void 0 : _e.call(model2, "popupSettings");
+      const popupFlow = (_d = model2.getFlow) == null ? void 0 : _d.call(model2, "popupSettings");
       const on = popupFlow == null ? void 0 : popupFlow.on;
       let openEventName = "click";
       if (typeof on === "string" && on) {
@@ -2849,17 +2873,10 @@ const _FlowModelContext = class _FlowModelContext extends BaseFlowModelContext {
       } else if (on && typeof on === "object" && typeof on.eventName === "string" && on.eventName) {
         openEventName = on.eventName;
       }
-      await model2.dispatchEvent(
-        openEventName,
-        {
-          // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
-          // ...this.model?.['getInputArgs']?.(), // 避免部分关系字段信息丢失, 仿照 ClickableCollectionField 做法
-          ...opts
-        },
-        {
-          debounce: true
-        }
-      );
+      await model2.dispatchEvent(openEventName, {
+        // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
+        ...opts
+      });
     });
     this.defineMethod("getEvents", function() {
       return this.model.getEvents();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.7",
+  "version": "2.1.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.1.7",
-    "@nocobase/shared": "2.1.7",
+    "@nocobase/sdk": "2.1.9",
+    "@nocobase/shared": "2.1.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": "fc3bc8bf6ef0c185a456cb5241abc4716af8c20c"
+  "gitHead": "2b612d81c6f6115af75ea7b279384751af869510"
 }

package/src/__tests__/flowModel.openView.navigation.test.ts

@@ -104,4 +104,32 @@ describe('FlowModelContext.openView - navigation enforcement', () => {
     expect(child.dispatchEvent).toHaveBeenCalledTimes(1);
     expect(child.dispatchEvent.mock.calls[0][0]).toBe('click');
   });
+
+  it('inherits current model input args when opening an external popup', async () => {
+    const { parent, child } = setup();
+    parent['getInputArgs'] = vi.fn(() => ({
+      filterByTk: 2,
+      sourceId: 10,
+      defaultInputKeys: ['filterByTk', 'sourceId'],
+    }));
+
+    await (parent.context as any).openView('child-uid', { mode: 'dialog' });
+
+    expect(child.dispatchEvent).toHaveBeenCalledTimes(1);
+    expect(child.dispatchEvent.mock.calls[0][1]).toMatchObject({
+      mode: 'dialog',
+      filterByTk: 2,
+      sourceId: 10,
+    });
+    expect(child.dispatchEvent.mock.calls[0][1]).not.toHaveProperty('defaultInputKeys');
+  });
+
+  it('does not debounce external popup dispatches', async () => {
+    const { parent, child } = setup();
+
+    await (parent.context as any).openView('child-uid', { mode: 'dialog', filterByTk: 1 });
+
+    expect(child.dispatchEvent).toHaveBeenCalledTimes(1);
+    expect(child.dispatchEvent.mock.calls[0][2]).toBeUndefined();
+  });
 });

package/src/flowContext.ts

@@ -3139,6 +3139,37 @@ class BaseFlowModelContext extends BaseFlowEngineContext {
   declare makeResource: <T extends FlowResource = FlowResource>(resourceType: ResourceType<T>) => T;
 }
 
+const OPEN_VIEW_INHERITED_INPUT_ARG_KEYS = [
+  'dataSourceKey',
+  'collectionName',
+  'associationName',
+  'filterByTk',
+  'sourceId',
+  'tabUid',
+];
+
+function pickDefinedKeys(source: Record<string, unknown> | null | undefined, keys: string[]) {
+  const res: Record<string, unknown> = {};
+  for (const key of keys) {
+    if (typeof source?.[key] !== 'undefined') {
+      res[key] = source[key];
+    }
+  }
+  return res;
+}
+
+function pickDefinedOpenViewInputArgs(source?: Record<string, unknown> | null) {
+  return pickDefinedKeys(source, OPEN_VIEW_INHERITED_INPUT_ARG_KEYS);
+}
+
+function applyDefinedDefaults(target: Record<string, unknown>, defaults: Record<string, unknown>) {
+  for (const [key, value] of Object.entries(defaults)) {
+    if (typeof target[key] === 'undefined') {
+      target[key] = value;
+    }
+  }
+}
+
 export class FlowEngineContext extends BaseFlowEngineContext {
   // public dataSourceManager: DataSourceManager;
   constructor(public engine: FlowEngine) {
@@ -3687,7 +3718,14 @@ export class FlowModelContext extends BaseFlowModelContext {
       },
     });
     this.defineMethod('openView', async function (uid: string, options) {
-      const opts = { ...options };
+      const inheritedInputArgs = {
+        ...(typeof this.model?.['getInputArgs'] === 'function'
+          ? pickDefinedOpenViewInputArgs(this.model['getInputArgs']())
+          : {}),
+        ...pickDefinedOpenViewInputArgs(this.inputArgs),
+      };
+      const opts = { ...(options || {}) };
+      applyDefinedDefaults(opts, inheritedInputArgs);
       // NOTE: when custom context is passed, route navigation must be disabled to avoid losing it after refresh.
       if (opts.defineProperties || opts.defineMethods) {
         opts.navigation = false; // 强制不使用路由导航, 避免刷新页面时丢失上下文
@@ -3695,15 +3733,6 @@ export class FlowModelContext extends BaseFlowModelContext {
       let model: FlowModel | null = null;
       model = await this.engine.loadModel({ uid });
       if (!model) {
-        const pickDefined = (src: Record<string, any>, keys: string[]) => {
-          const res: Record<string, any> = {};
-          for (const k of keys) {
-            if (typeof src?.[k] !== 'undefined') {
-              res[k] = src[k];
-            }
-          }
-          return res;
-        };
         model = this.engine.createModel({
           uid, // 注意： 新建的 model 应该使用 ${parentModel.uid}-xxx 形式的 uid
           use: 'PopupActionModel',
@@ -3714,7 +3743,7 @@ export class FlowModelContext extends BaseFlowModelContext {
             popupSettings: {
               openView: {
                 // 仅在创建时持久化一份默认配置；运行时以本次 opts 为准，避免多个 opener 互相覆盖。
-                ...pickDefined(opts, ['dataSourceKey', 'collectionName', 'associationName', 'mode', 'size']),
+                ...pickDefinedKeys(opts, ['dataSourceKey', 'collectionName', 'associationName', 'mode', 'size']),
               },
             },
           },
@@ -3734,8 +3763,6 @@ export class FlowModelContext extends BaseFlowModelContext {
       // 统一语义：为即将打开的外部视图定义一个 PendingView（占位视图）
       const pendingType = (opts?.isMobileLayout ? 'embed' : opts?.mode || 'drawer') as any;
       const pendingInputArgs = { ...opts, viewUid, navigation: opts.navigation };
-      pendingInputArgs.filterByTk = pendingInputArgs.filterByTk || this.inputArgs?.filterByTk;
-      pendingInputArgs.sourceId = pendingInputArgs.sourceId || this.inputArgs?.sourceId;
 
       const pendingView = {
         type: pendingType,
@@ -3754,17 +3781,10 @@ export class FlowModelContext extends BaseFlowModelContext {
       } else if (on && typeof on === 'object' && typeof (on as any).eventName === 'string' && (on as any).eventName) {
         openEventName = (on as any).eventName;
       }
-      await model.dispatchEvent(
-        openEventName,
-        {
-          // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
-          // ...this.model?.['getInputArgs']?.(), // 避免部分关系字段信息丢失, 仿照 ClickableCollectionField 做法
-          ...opts,
-        },
-        {
-          debounce: true,
-        },
-      );
+      await model.dispatchEvent(openEventName, {
+        // navigation: false, // TODO: 路由模式有bug，不支持多层同样viewId的弹窗，因此这里默认先用false
+        ...opts,
+      });
     });
     this.defineMethod('getEvents', function (this: BaseFlowModelContext) {
       return this.model.getEvents();