@nocobase/flow-engine 2.0.0-alpha.54 → 2.0.0-alpha.56

package/lib/components/settings/wrappers/component/SelectWithTitle.d.ts

@@ -14,5 +14,6 @@ export interface SelectWithTitleProps {
     fieldNames?: any;
     itemKey?: string;
     onChange?: (...args: any[]) => void;
+    dropdownRender?: any;
 }
 export declare function SelectWithTitle({ title, getDefaultValue, onChange, options, fieldNames, itemKey, ...others }: SelectWithTitleProps): React.JSX.Element;

package/lib/components/settings/wrappers/component/SelectWithTitle.js

@@ -123,7 +123,8 @@ function SelectWithTitle({
         style: { textAlign: "right", minWidth: 100 },
         onMouseEnter: () => {
           clearTimeout(timerRef.current);
-        }
+        },
+        dropdownRender: (menu) => others.dropdownRender ? others.dropdownRender(menu, setOpen, handleChange) : menu
       }
     )
   );

package/lib/flowContext.js

@@ -1091,6 +1091,7 @@ 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) ?? (((_d = (_c = model2.stepParams) == null ? void 0 : _c.popupSettings) == null ? void 0 : _d.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";

package/lib/flowEngine.js

@@ -391,8 +391,9 @@ const _FlowEngine = class _FlowEngine {
    * @returns {T} Created model instance
    */
   createModel(options, extra) {
+    var _a;
     const { parentId, uid, use: modelClassName, subModels } = options;
-    const parentModel = parentId ? this._modelInstances.get(parentId) : void 0;
+    const parentModel = parentId ? this.getModel(parentId) || ((_a = this.previousEngine) == null ? void 0 : _a.getModel(parentId)) : void 0;
     const ModelClass = this._resolveModelClass(
       typeof modelClassName === "string" ? this.getModelClass(modelClassName) : modelClassName,
       options,
@@ -411,8 +412,8 @@ const _FlowEngine = class _FlowEngine {
     if (extra == null ? void 0 : extra.delegate) {
       modelInstance.context.addDelegate(extra.delegate);
     }
-    if (parentId && this._modelInstances.has(parentId)) {
-      modelInstance.setParent(this._modelInstances.get(parentId));
+    if (parentModel) {
+      modelInstance.setParent(parentModel);
       if ((extra == null ? void 0 : extra.delegateToParent) === false) {
         modelInstance.removeParentDelegate();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.54",
+  "version": "2.0.0-alpha.56",
   "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.0.0-alpha.54",
-    "@nocobase/shared": "2.0.0-alpha.54",
+    "@nocobase/sdk": "2.0.0-alpha.56",
+    "@nocobase/shared": "2.0.0-alpha.56",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "68c84deaabba0ebec7407bf7245376b8d843449c"
+  "gitHead": "a26a7c3422ea8089e0f04c89c9d32ff25bc09a0c"
 }

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

@@ -25,6 +25,7 @@ describe('FlowModelContext.openView - navigation enforcement', () => {
       },
       getStepParams: vi.fn(() => undefined),
       setStepParams: vi.fn(),
+      setParent: vi.fn(),
       save: vi.fn(async () => undefined),
       dispatchEvent: vi.fn(async (_event: string, _params?: any) => undefined),
     };

package/src/__tests__/viewScopedFlowEngine.test.ts

@@ -59,6 +59,18 @@ describe('ViewScopedFlowEngine', () => {
     expect(child.getModel(uid)).toBe(cm);
   });
 
+  it('mounts parent model from previous engine when creating models in scoped engine', () => {
+    const parent = new FlowEngine();
+    const scoped = createViewScopedEngine(parent);
+
+    const parentModel = parent.createModel({ use: 'FlowModel', uid: 'parent-uid' });
+
+    const childModel = scoped.createModel({ use: 'FlowModel', uid: 'child-uid', parentId: parentModel.uid });
+
+    expect(childModel.parent).toBe(parentModel);
+    expect(childModel.parent?.uid).toBe('parent-uid');
+  });
+
   it('isolates beforeRender event cache across engines with identical model uid', async () => {
     const parent = new FlowEngine();
     const child = createViewScopedEngine(parent);

package/src/components/settings/wrappers/component/SelectWithTitle.tsx

@@ -18,6 +18,7 @@ export interface SelectWithTitleProps {
   fieldNames?: any;
   itemKey?: string;
   onChange?: (...args: any[]) => void;
+  dropdownRender?: any;
 }
 
 export function SelectWithTitle({
@@ -102,6 +103,7 @@ export function SelectWithTitle({
         onMouseEnter={() => {
           clearTimeout(timerRef.current);
         }}
+        dropdownRender={(menu) => (others.dropdownRender ? others.dropdownRender(menu, setOpen, handleChange) : menu)}
       />
     </div>
   );

package/src/flowContext.ts

@@ -1445,6 +1445,7 @@ export class FlowModelContext extends BaseFlowModelContext {
         }
       }
 
+      model.setParent(this.model);
       // 路由层级的 viewUid：优先使用 routeViewUid（仅用于路由展示）；
       // 否则回退到 opts.viewUid；再否则沿用原有规则（若子模型具备弹窗配置则使用子模型 uid，否则使用发起者 uid）。
       const viewUid =

package/src/flowEngine.ts

@@ -460,7 +460,9 @@ export class FlowEngine {
     extra?: { delegateToParent?: boolean; delegate?: FlowContext },
   ): T {
     const { parentId, uid, use: modelClassName, subModels } = options;
-    const parentModel = parentId ? (this._modelInstances.get(parentId) as FlowModel | undefined) : undefined;
+    const parentModel = parentId
+      ? ((this.getModel(parentId) || this.previousEngine?.getModel(parentId)) as FlowModel | undefined)
+      : undefined;
     const ModelClass = this._resolveModelClass(
       typeof modelClassName === 'string' ? this.getModelClass(modelClassName) : modelClassName,
       options,
@@ -484,8 +486,8 @@ export class FlowEngine {
       modelInstance.context.addDelegate(extra.delegate);
     }
 
-    if (parentId && this._modelInstances.has(parentId)) {
-      modelInstance.setParent(this._modelInstances.get(parentId));
+    if (parentModel) {
+      modelInstance.setParent(parentModel);
       if (extra?.delegateToParent === false) {
         modelInstance.removeParentDelegate();
       }