@nocobase/flow-engine 2.0.11 → 2.0.13

package/lib/ViewScopedFlowEngine.js

@@ -65,7 +65,11 @@ function createViewScopedEngine(parent) {
     "_previousEngine",
     "_nextEngine",
     // getModel 需要在本地执行以确保全局查找时正确遍历整个引擎栈
-    "getModel"
+    "getModel",
+    // 视图销毁回调需要在本地存储，每个视图引擎有自己的销毁逻辑
+    "_destroyView",
+    "setDestroyView",
+    "destroyView"
   ]);
   const handler = {
     get(target, prop, receiver) {

package/lib/components/settings/wrappers/contextual/StepSettingsDialog.js

@@ -126,6 +126,15 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
     }
   };
   const openView = model.context.viewer[mode].bind(model.context.viewer);
+  const resolvedUiModeProps = (0, import_reactive.toJS)(uiModeProps) || {};
+  const { zIndex: uiModeZIndex, ...restUiModeProps } = resolvedUiModeProps;
+  const resolveDialogZIndex = /* @__PURE__ */ __name((rawZIndex) => {
+    var _a2, _b2;
+    const nextZIndex = typeof ((_a2 = model.context.viewer) == null ? void 0 : _a2.getNextZIndex) === "function" ? model.context.viewer.getNextZIndex() : (((_b2 = model.context.themeToken) == null ? void 0 : _b2.zIndexPopupBase) || 1e3) + 1;
+    const inputZIndex = Number(rawZIndex) || 0;
+    return Math.max(nextZIndex, inputZIndex);
+  }, "resolveDialogZIndex");
+  const mergedZIndex = resolveDialogZIndex(uiModeZIndex);
   const form = (0, import_core.createForm)({
     initialValues: (0, import_utils.compileUiSchema)(scopes, initialValues)
   });
@@ -141,7 +150,8 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
     title: dialogTitle || t(title),
     width: dialogWidth,
     destroyOnClose: true,
-    ...(0, import_reactive.toJS)(uiModeProps),
+    ...restUiModeProps,
+    zIndex: mergedZIndex,
     // 透传 navigation，便于变量元信息根据真实视图栈推断父级弹窗
     inputArgs,
     onClose: /* @__PURE__ */ __name(() => {
@@ -155,7 +165,11 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
         (0, import_react2.useEffect)(() => {
           return (0, import_reactive.autorun)(() => {
             const dynamicProps = (0, import_reactive.toJS)(uiModeProps);
-            currentDialog.update(dynamicProps);
+            const { zIndex, ...restDynamicProps } = dynamicProps || {};
+            currentDialog.update({
+              ...restDynamicProps,
+              zIndex: resolveDialogZIndex(zIndex)
+            });
           });
         }, []);
         const compiledFormSchema = (0, import_utils.compileUiSchema)(scopes, formSchema);

package/lib/flowEngine.d.ts

@@ -83,6 +83,12 @@ export declare class FlowEngine {
      */
     private _previousEngine?;
     private _nextEngine?;
+    /**
+     * 视图销毁回调。由 useDrawer / useDialog 在创建弹窗视图时注册，
+     * 供外部（如 afterSuccess）通过引擎栈遍历来关闭多层弹窗。
+     * embed 视图（usePage）不注册此回调，因此 destroyView() 会自然跳过。
+     */
+    private _destroyView?;
     private _resources;
     /**
      * Data change registry used to coordinate "refresh on active" across view-scoped engines.
@@ -151,6 +157,18 @@ export declare class FlowEngine {
      * 将当前引擎从栈中移除并修复相邻指针（用于视图关闭时）。
      */
     unlinkFromStack(): void;
+    /**
+     * 注册视图销毁回调（由 useDrawer / useDialog 调用）。
+     */
+    setDestroyView(fn: () => void): void;
+    /**
+     * 关闭当前引擎关联的弹窗视图。
+     * 路由触发的弹窗会先 navigation.back() 清理 URL，再 destroy() 移除元素；
+     * 非路由弹窗直接 destroy()。
+     * embed 视图不注册回调，调用时返回 false 自动跳过。
+     * @returns 是否成功执行
+     */
+    destroyView(): boolean;
     /**
      * Get the flow engine context object.
      * @returns {FlowEngineContext} Flow engine context
@@ -333,6 +351,7 @@ export declare class FlowEngine {
      * @returns {Promise<T | null>} Model instance or null
      */
     loadOrCreateModel<T extends FlowModel = FlowModel>(options: any, extra?: {
+        skipSave?: boolean;
         delegateToParent?: boolean;
         delegate?: FlowContext;
     }): Promise<T | null>;

package/lib/flowEngine.js

@@ -119,6 +119,12 @@ const _FlowEngine = class _FlowEngine {
      */
     __publicField(this, "_previousEngine");
     __publicField(this, "_nextEngine");
+    /**
+     * 视图销毁回调。由 useDrawer / useDialog 在创建弹窗视图时注册，
+     * 供外部（如 afterSuccess）通过引擎栈遍历来关闭多层弹窗。
+     * embed 视图（usePage）不注册此回调，因此 destroyView() 会自然跳过。
+     */
+    __publicField(this, "_destroyView");
     __publicField(this, "_resources", /* @__PURE__ */ new Map());
     /**
      * Data change registry used to coordinate "refresh on active" across view-scoped engines.
@@ -258,6 +264,26 @@ const _FlowEngine = class _FlowEngine {
       prev._nextEngine = void 0;
     }
   }
+  /**
+   * 注册视图销毁回调（由 useDrawer / useDialog 调用）。
+   */
+  setDestroyView(fn) {
+    this._destroyView = fn;
+  }
+  /**
+   * 关闭当前引擎关联的弹窗视图。
+   * 路由触发的弹窗会先 navigation.back() 清理 URL，再 destroy() 移除元素；
+   * 非路由弹窗直接 destroy()。
+   * embed 视图不注册回调，调用时返回 false 自动跳过。
+   * @returns 是否成功执行
+   */
+  destroyView() {
+    if (this._destroyView) {
+      this._destroyView();
+      return true;
+    }
+    return false;
+  }
   // （已移除）getModelGlobal/forEachModelGlobal/getAllModelsGlobal：不再维护冗余全局遍历 API
   /**
    * Get the flow engine context object.
@@ -829,7 +855,9 @@ const _FlowEngine = class _FlowEngine {
       model = this.createModel(data, extra);
     } else {
       model = this.createModel(options, extra);
-      await model.save();
+      if (!(extra == null ? void 0 : extra.skipSave)) {
+        await model.save();
+      }
     }
     if (model.parent) {
       const subModel = model.parent.findSubModel(model.subKey, (m2) => {

package/lib/utils/parsePathnameToViewParams.js

@@ -92,7 +92,7 @@ const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname) => {
             } catch (_) {
               parsed = decoded;
             }
-          } else if (decoded && decoded.includes("=") && decoded.includes("&")) {
+          } else if (decoded && /^[^=&]+=[^=&]*(?:&[^=&]+=[^=&]*)*$/.test(decoded)) {
             parsed = parseKeyValuePairs(decoded);
           }
           currentView.filterByTk = parsed;

package/lib/views/useDialog.js

@@ -103,12 +103,15 @@ function useDialog() {
     } else {
       ctx.addDelegate(flowContext.engine.context);
     }
+    let destroyed = false;
     const currentDialog = {
       type: "dialog",
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c2, _d;
+        if (destroyed) return;
+        destroyed = true;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         (_b2 = dialogRef.current) == null ? void 0 : _b2.destroy();
         closeFunc == null ? void 0 : closeFunc();
@@ -154,6 +157,13 @@ function useDialog() {
       get: /* @__PURE__ */ __name(() => currentDialog, "get"),
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
+    scopedEngine.setDestroyView(() => {
+      var _a2, _b2;
+      if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
+        config.inputArgs.navigation.back();
+      }
+      currentDialog.destroy();
+    });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDialog);
     const DialogWithContext = (0, import__.observer)(
       () => {

package/lib/views/useDrawer.js

@@ -122,12 +122,15 @@ function useDrawer() {
     } else {
       ctx.addDelegate(flowContext.engine.context);
     }
+    let destroyed = false;
     const currentDrawer = {
       type: "drawer",
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: /* @__PURE__ */ __name((result) => {
         var _a2, _b2, _c, _d;
+        if (destroyed) return;
+        destroyed = true;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         (_b2 = drawerRef.current) == null ? void 0 : _b2.destroy();
         closeFunc == null ? void 0 : closeFunc();
@@ -173,6 +176,13 @@ function useDrawer() {
       get: /* @__PURE__ */ __name(() => currentDrawer, "get"),
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
+    scopedEngine.setDestroyView(() => {
+      var _a2, _b2;
+      if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
+        config.inputArgs.navigation.back();
+      }
+      currentDrawer.destroy();
+    });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDrawer);
     const DrawerWithContext = React.memo(
       (0, import__.observer)((props) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "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.11",
-    "@nocobase/shared": "2.0.11",
+    "@nocobase/sdk": "2.0.13",
+    "@nocobase/shared": "2.0.13",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "657733e68b31cbb788f8b1b7c4926383c96b5889"
+  "gitHead": "3486d15dd3f821411f514b7e0b57e44d942917c9"
 }

package/src/ViewScopedFlowEngine.ts

@@ -62,6 +62,10 @@ export function createViewScopedEngine(parent: FlowEngine): FlowEngine {
     '_nextEngine',
     // getModel 需要在本地执行以确保全局查找时正确遍历整个引擎栈
     'getModel',
+    // 视图销毁回调需要在本地存储，每个视图引擎有自己的销毁逻辑
+    '_destroyView',
+    'setDestroyView',
+    'destroyView',
   ]);
 
   const handler: ProxyHandler<FlowEngine> = {

package/src/components/settings/wrappers/contextual/StepSettingsDialog.tsx

@@ -134,6 +134,17 @@ const openStepSettingsDialog = async ({
   };
 
   const openView = model.context.viewer[mode].bind(model.context.viewer);
+  const resolvedUiModeProps = toJS(uiModeProps) || {};
+  const { zIndex: uiModeZIndex, ...restUiModeProps } = resolvedUiModeProps;
+  const resolveDialogZIndex = (rawZIndex?: number) => {
+    const nextZIndex =
+      typeof model.context.viewer?.getNextZIndex === 'function'
+        ? model.context.viewer.getNextZIndex()
+        : (model.context.themeToken?.zIndexPopupBase || 1000) + 1;
+    const inputZIndex = Number(rawZIndex) || 0;
+    return Math.max(nextZIndex, inputZIndex);
+  };
+  const mergedZIndex = resolveDialogZIndex(uiModeZIndex);
 
   const form = createForm({
     initialValues: compileUiSchema(scopes, initialValues),
@@ -152,7 +163,8 @@ const openStepSettingsDialog = async ({
     title: dialogTitle || t(title),
     width: dialogWidth,
     destroyOnClose: true,
-    ...toJS(uiModeProps),
+    ...restUiModeProps,
+    zIndex: mergedZIndex,
     // 透传 navigation，便于变量元信息根据真实视图栈推断父级弹窗
     inputArgs,
     onClose: () => {
@@ -165,7 +177,11 @@ const openStepSettingsDialog = async ({
         useEffect(() => {
           return autorun(() => {
             const dynamicProps = toJS(uiModeProps);
-            currentDialog.update(dynamicProps);
+            const { zIndex, ...restDynamicProps } = dynamicProps || {};
+            currentDialog.update({
+              ...restDynamicProps,
+              zIndex: resolveDialogZIndex(zIndex),
+            });
           });
         }, []);
 

package/src/flowEngine.ts

@@ -117,6 +117,13 @@ export class FlowEngine {
   private _previousEngine?: FlowEngine;
   private _nextEngine?: FlowEngine;
 
+  /**
+   * 视图销毁回调。由 useDrawer / useDialog 在创建弹窗视图时注册，
+   * 供外部（如 afterSuccess）通过引擎栈遍历来关闭多层弹窗。
+   * embed 视图（usePage）不注册此回调，因此 destroyView() 会自然跳过。
+   */
+  private _destroyView?: () => void;
+
   private _resources = new Map<string, typeof FlowResource>();
 
   /**
@@ -282,6 +289,28 @@ export class FlowEngine {
     }
   }
 
+  /**
+   * 注册视图销毁回调（由 useDrawer / useDialog 调用）。
+   */
+  public setDestroyView(fn: () => void): void {
+    this._destroyView = fn;
+  }
+
+  /**
+   * 关闭当前引擎关联的弹窗视图。
+   * 路由触发的弹窗会先 navigation.back() 清理 URL，再 destroy() 移除元素；
+   * 非路由弹窗直接 destroy()。
+   * embed 视图不注册回调，调用时返回 false 自动跳过。
+   * @returns 是否成功执行
+   */
+  public destroyView(): boolean {
+    if (this._destroyView) {
+      this._destroyView();
+      return true;
+    }
+    return false;
+  }
+
   // （已移除）getModelGlobal/forEachModelGlobal/getAllModelsGlobal：不再维护冗余全局遍历 API
 
   /**
@@ -959,6 +988,7 @@ export class FlowEngine {
   async loadOrCreateModel<T extends FlowModel = FlowModel>(
     options,
     extra?: {
+      skipSave?: boolean;
       delegateToParent?: boolean;
       delegate?: FlowContext;
     },
@@ -984,7 +1014,9 @@ export class FlowEngine {
       model = this.createModel<T>(data as any, extra);
     } else {
       model = this.createModel<T>(options, extra);
-      await model.save();
+      if (!extra?.skipSave) {
+        await model.save();
+      }
     }
     if (model.parent) {
       const subModel = model.parent.findSubModel(model.subKey, (m) => {

package/src/utils/__tests__/parsePathnameToViewParams.test.ts

@@ -109,6 +109,13 @@ describe('parsePathnameToViewParams', () => {
     expect(result).toEqual([{ viewUid: 'xxx', filterByTk: { id: '1', tenant: 'ac' } }]);
   });
 
+  test('should parse filterByTk from single key-value encoded segment into object', () => {
+    const kv = encodeURIComponent('id=1');
+    const path = `/admin/xxx/filterbytk/${kv}`;
+    const result = parsePathnameToViewParams(path);
+    expect(result).toEqual([{ viewUid: 'xxx', filterByTk: { id: '1' } }]);
+  });
+
   test('should parse filterByTk from JSON object segment', () => {
     const json = encodeURIComponent('{"id":"1","tenant":"ac"}');
     const path = `/admin/xxx/filterbytk/${json}`;

package/src/utils/parsePathnameToViewParams.ts

@@ -116,8 +116,8 @@ export const parsePathnameToViewParams = (pathname: string): ViewParam[] => {
               // 解析失败，按字符串保留
               parsed = decoded;
             }
-          } else if (decoded && decoded.includes('=') && decoded.includes('&')) {
-            // 形如 a=b&c=d 的整体段
+          } else if (decoded && /^[^=&]+=[^=&]*(?:&[^=&]+=[^=&]*)*$/.test(decoded)) {
+            // 形如 a=b 或 a=b&c=d 的整体段
             parsed = parseKeyValuePairs(decoded);
           }
           currentView.filterByTk = parsed;

package/src/views/__tests__/useDialog.closeDestroy.test.tsx

@@ -26,6 +26,7 @@ vi.mock('../../ViewScopedFlowEngine', () => ({
   createViewScopedEngine: (engine) => ({
     context: new FlowContext(),
     unlinkFromStack: vi.fn(),
+    setDestroyView: vi.fn(),
     // mimic real view stack linkage: previousEngine points to the last engine in chain
     previousEngine: (engine as any)?.nextEngine || engine,
   }),

package/src/views/useDialog.tsx

@@ -89,12 +89,17 @@ export function useDialog() {
       ctx.addDelegate(flowContext.engine.context);
     }
 
+    // 幂等保护：防止 FlowPage 路由清理时二次调用 destroy
+    let destroyed = false;
+
     // 构造 currentDialog 实例
     const currentDialog = {
       type: 'dialog' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: (result?: any) => {
+        if (destroyed) return;
+        destroyed = true;
         config.onClose?.();
         dialogRef.current?.destroy();
         closeFunc?.();
@@ -140,6 +145,15 @@ export function useDialog() {
       get: () => currentDialog,
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
+    // 注册视图销毁回调，供外部（如 afterSuccess）通过引擎栈遍历来关闭多层弹窗。
+    // 对路由触发的弹窗：先 navigation.back() 清理 URL（replace 方式），再 destroy() 立即移除元素；
+    // 对非路由弹窗：直接 destroy()。destroy() 已做幂等保护，FlowPage 后续清理不会重复执行。
+    scopedEngine.setDestroyView(() => {
+      if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
+        config.inputArgs.navigation.back();
+      }
+      currentDialog.destroy();
+    });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentDialog);
     // 内部组件，在 Provider 内部计算 content

package/src/views/useDrawer.tsx

@@ -118,12 +118,17 @@ export function useDrawer() {
       ctx.addDelegate(flowContext.engine.context);
     }
 
+    // 幂等保护：防止 FlowPage 路由清理时二次调用 destroy
+    let destroyed = false;
+
     // 构造 currentDrawer 实例
     const currentDrawer = {
       type: 'drawer' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: (result?: any) => {
+        if (destroyed) return;
+        destroyed = true;
         config.onClose?.();
         drawerRef.current?.destroy();
         closeFunc?.();
@@ -169,6 +174,15 @@ export function useDrawer() {
       get: () => currentDrawer,
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
+    // 注册视图销毁回调，供外部（如 afterSuccess）通过引擎栈遍历来关闭多层弹窗。
+    // 对路由触发的弹窗：先 navigation.back() 清理 URL（replace 方式），再 destroy() 立即移除元素；
+    // 对非路由弹窗：直接 destroy()。destroy() 已做幂等保护，FlowPage 后续清理不会重复执行。
+    scopedEngine.setDestroyView(() => {
+      if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
+        config.inputArgs.navigation.back();
+      }
+      currentDrawer.destroy();
+    });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentDrawer);
 

package/src/views/usePage.tsx

@@ -178,6 +178,7 @@ export function usePage() {
       // 仅当访问关联字段或前端无本地记录数据时，才交给服务端解析
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
+    // embed 视图不注册 destroyView，afterSuccess 关闭弹窗时自然跳过
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentPage);