@nocobase/flow-engine 2.1.0-beta.6 → 2.1.0-beta.8

package/lib/JSRunner.d.ts

@@ -13,11 +13,20 @@ export interface JSRunnerOptions {
     version?: string;
     /**
      * Enable RunJS template compatibility preprocessing for `{{ ... }}`.
-     * When enabled via `ctx.runjs(code, vars, { preprocessTemplates: true })` (default),
+     * When enabled (or falling back to version default),
      * the code will be rewritten to call `ctx.resolveJsonTemplate(...)` at runtime.
      */
     preprocessTemplates?: boolean;
 }
+/**
+ * Decide whether RunJS `{{ ... }}` compatibility preprocessing should run.
+ *
+ * Priority:
+ * 1. Explicit `preprocessTemplates` option always wins.
+ * 2. Otherwise, `version === 'v2'` disables preprocessing.
+ * 3. Fallback keeps v1-compatible behavior (enabled).
+ */
+export declare function shouldPreprocessRunJSTemplates(options?: Pick<JSRunnerOptions, 'preprocessTemplates' | 'version'>): boolean;
 export declare class JSRunner {
     private globals;
     private timeoutMs;

package/lib/JSRunner.js

@@ -27,11 +27,53 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var JSRunner_exports = {};
 __export(JSRunner_exports, {
-  JSRunner: () => JSRunner
+  JSRunner: () => JSRunner,
+  shouldPreprocessRunJSTemplates: () => shouldPreprocessRunJSTemplates
 });
 module.exports = __toCommonJS(JSRunner_exports);
 var import_ses = require("ses");
 var import_exceptions = require("./utils/exceptions");
+function shouldPreprocessRunJSTemplates(options) {
+  if (typeof (options == null ? void 0 : options.preprocessTemplates) === "boolean") {
+    return options.preprocessTemplates;
+  }
+  return (options == null ? void 0 : options.version) !== "v2";
+}
+__name(shouldPreprocessRunJSTemplates, "shouldPreprocessRunJSTemplates");
+const BARE_CTX_TEMPLATE_RE = /(^|[=(:,[\s)])(\{\{\s*(ctx(?:\.|\[|\?\.)[^}]*)\s*\}\})/m;
+function extractDeprecatedCtxTemplateUsage(code) {
+  const src = String(code || "");
+  const m = src.match(BARE_CTX_TEMPLATE_RE);
+  if (!m) return null;
+  const placeholder = String(m[2] || "").trim();
+  const expression = String(m[3] || "").trim();
+  if (!placeholder || !expression) return null;
+  return { placeholder, expression };
+}
+__name(extractDeprecatedCtxTemplateUsage, "extractDeprecatedCtxTemplateUsage");
+function shouldHintCtxTemplateSyntax(err, usage) {
+  const isSyntaxError = err instanceof SyntaxError || String((err == null ? void 0 : err.name) || "") === "SyntaxError";
+  if (!isSyntaxError) return false;
+  if (!usage) return false;
+  const msg = String((err == null ? void 0 : err.message) || err || "");
+  return /unexpected token/i.test(msg);
+}
+__name(shouldHintCtxTemplateSyntax, "shouldHintCtxTemplateSyntax");
+function toCtxTemplateSyntaxHintError(err, usage) {
+  const hint = `"${usage.placeholder}" has been deprecated and cannot be used as executable RunJS syntax. Use await ctx.getVar("${usage.expression}") instead, or keep "${usage.placeholder}" as a plain string.`;
+  const out = new SyntaxError(hint);
+  try {
+    out.cause = err;
+  } catch (_) {
+  }
+  try {
+    out.__runjsHideLocation = true;
+    out.stack = `${out.name}: ${out.message}`;
+  } catch (_) {
+  }
+  return out;
+}
+__name(toCtxTemplateSyntaxHintError, "toCtxTemplateSyntaxHintError");
 const _JSRunner = class _JSRunner {
   globals;
   timeoutMs;
@@ -111,11 +153,13 @@ const _JSRunner = class _JSRunner {
       if (err instanceof import_exceptions.FlowExitAllException) {
         throw err;
       }
-      console.error(err);
+      const usage = extractDeprecatedCtxTemplateUsage(code);
+      const outErr = shouldHintCtxTemplateSyntax(err, usage) && usage ? toCtxTemplateSyntaxHintError(err, usage) : err;
+      console.error(outErr);
       return {
         success: false,
-        error: err,
-        timeout: err.message === "Execution timed out"
+        error: outErr,
+        timeout: (outErr == null ? void 0 : outErr.message) === "Execution timed out"
       };
     }
   }
@@ -124,5 +168,6 @@ __name(_JSRunner, "JSRunner");
 let JSRunner = _JSRunner;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  JSRunner
+  JSRunner,
+  shouldPreprocessRunJSTemplates
 });

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/dnd/gridDragPlanner.js

@@ -220,7 +220,9 @@ const buildLayoutSnapshot = /* @__PURE__ */ __name(({ container }) => {
     }
     const columnElements = Array.from(
       container.querySelectorAll(`[data-grid-column-row-id="${rowId}"][data-grid-column-index]`)
-    );
+    ).filter((el) => {
+      return el.closest("[data-grid-row-id]") === rowElement;
+    });
     const sortedColumns = columnElements.sort((a, b) => {
       const indexA = Number(a.dataset.gridColumnIndex || 0);
       const indexB = Number(b.dataset.gridColumnIndex || 0);
@@ -245,7 +247,9 @@ const buildLayoutSnapshot = /* @__PURE__ */ __name(({ container }) => {
       });
       const itemElements = Array.from(
         columnElement.querySelectorAll(`[data-grid-item-row-id="${rowId}"][data-grid-column-index="${columnIndex}"]`)
-      );
+      ).filter((el) => {
+        return el.closest("[data-grid-column-row-id][data-grid-column-index]") === columnElement;
+      });
       const sortedItems = itemElements.sort((a, b) => {
         const indexA = Number(a.dataset.gridItemIndex || 0);
         const indexB = Number(b.dataset.gridItemIndex || 0);

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/components/subModel/AddSubModelButton.js

@@ -376,6 +376,21 @@ const AddSubModelButtonCore = /* @__PURE__ */ __name(function AddSubModelButton(
     }),
     [model, subModelKey, subModelType]
   );
+  import_react.default.useEffect(() => {
+    var _a, _b, _c;
+    const handleSubModelChanged = /* @__PURE__ */ __name(() => {
+      setRefreshTick((x) => x + 1);
+    }, "handleSubModelChanged");
+    (_a = model.emitter) == null ? void 0 : _a.on("onSubModelAdded", handleSubModelChanged);
+    (_b = model.emitter) == null ? void 0 : _b.on("onSubModelRemoved", handleSubModelChanged);
+    (_c = model.emitter) == null ? void 0 : _c.on("onSubModelReplaced", handleSubModelChanged);
+    return () => {
+      var _a2, _b2, _c2;
+      (_a2 = model.emitter) == null ? void 0 : _a2.off("onSubModelAdded", handleSubModelChanged);
+      (_b2 = model.emitter) == null ? void 0 : _b2.off("onSubModelRemoved", handleSubModelChanged);
+      (_c2 = model.emitter) == null ? void 0 : _c2.off("onSubModelReplaced", handleSubModelChanged);
+    };
+  }, [model]);
   const onClick = /* @__PURE__ */ __name(async (info) => {
     const clickedItem = info.originalItem || info;
     const item = clickedItem.originalItem || clickedItem;

package/lib/executor/FlowExecutor.js

@@ -213,11 +213,13 @@ const _FlowExecutor = class _FlowExecutor {
           flowContext.logger.info(`[FlowEngine] ${error.message}`);
           await this.emitModelEventIf(eventName, `flow:${flowKey}:step:${stepKey}:end`, {
             ...flowEventBasePayload,
-            stepKey
+            stepKey,
+            aborted: true
           });
           await this.emitModelEventIf(eventName, `flow:${flowKey}:end`, {
             ...flowEventBasePayload,
-            result: error
+            result: error,
+            aborted: true
           });
           return Promise.resolve(error);
         }
@@ -287,6 +289,7 @@ const _FlowExecutor = class _FlowExecutor {
     }) : flows;
     const scheduledCancels = [];
     const execute = /* @__PURE__ */ __name(async () => {
+      let abortedByExitAll = false;
       if (sequential) {
         const flowsWithIndex = flowsToRun.map((f, i) => ({ f, i }));
         const ordered = flowsWithIndex.slice().sort((a, b) => {
@@ -355,9 +358,10 @@ const _FlowExecutor = class _FlowExecutor {
             return;
           }
           if (!whenKey) return;
+          const shouldSkipOnAborted = whenKey === `event:${eventName}:end` || phase === "afterFlow" || phase === "afterStep";
           scheduled.add(flow.key);
           const list = scheduleGroups.get(whenKey) || [];
-          list.push({ flow, order: indexInOrdered });
+          list.push({ flow, order: indexInOrdered, shouldSkipOnAborted });
           scheduleGroups.set(whenKey, list);
         });
         for (const [whenKey, list] of scheduleGroups.entries()) {
@@ -368,6 +372,12 @@ const _FlowExecutor = class _FlowExecutor {
             return a.order - b.order;
           });
           for (const it of sorted) {
+            const when = it.shouldSkipOnAborted ? Object.assign(
+              (event) => event.type === whenKey && event.aborted !== true,
+              {
+                __eventType: whenKey
+              }
+            ) : whenKey;
             const cancel = model.scheduleModelOperation(
               model.uid,
               async (m) => {
@@ -377,7 +387,7 @@ const _FlowExecutor = class _FlowExecutor {
                 }
                 results2.push(res);
               },
-              { when: whenKey }
+              { when }
             );
             scheduledCancels.push(cancel);
           }
@@ -391,12 +401,14 @@ const _FlowExecutor = class _FlowExecutor {
             const result = await this.runFlow(model, flow.key, inputArgs, runId, eventName);
             if (result instanceof import_exceptions.FlowExitAllException) {
               logger.debug(`[FlowEngine.dispatchEvent] ${result.message}`);
+              abortedByExitAll = true;
               break;
             }
             results2.push(result);
           } catch (error) {
             if (error instanceof import_exceptions.FlowExitAllException) {
               logger.debug(`[FlowEngine.dispatchEvent] ${error.message}`);
+              abortedByExitAll = true;
               break;
             }
             logger.error(
@@ -406,7 +418,7 @@ const _FlowExecutor = class _FlowExecutor {
             throw error;
           }
         }
-        return results2;
+        return { result: results2, abortedByExitAll };
       }
       const results = await Promise.all(
         flowsToRun.map(async (flow) => {
@@ -423,7 +435,11 @@ const _FlowExecutor = class _FlowExecutor {
           }
         })
       );
-      return results.filter((x) => x !== void 0);
+      const filteredResults = results.filter((x) => x !== void 0);
+      if (filteredResults.some((x) => x instanceof import_exceptions.FlowExitAllException)) {
+        abortedByExitAll = true;
+      }
+      return { result: filteredResults, abortedByExitAll };
     }, "execute");
     const argsKey = useCache ? JSON.stringify(inputArgs ?? {}) : "";
     const cacheKey = useCache ? import_flowEngine.FlowEngine.generateApplyFlowCacheKey(
@@ -432,7 +448,7 @@ const _FlowExecutor = class _FlowExecutor {
       model.uid
     ) : null;
     try {
-      const result = await this.withApplyFlowCache(cacheKey, execute);
+      const { result, abortedByExitAll } = await this.withApplyFlowCache(cacheKey, execute);
       try {
         await ((_c = model.onDispatchEventEnd) == null ? void 0 : _c.call(model, eventName, options, inputArgs, result));
       } catch (hookErr) {
@@ -440,7 +456,8 @@ const _FlowExecutor = class _FlowExecutor {
       }
       await this.emitModelEventIf(eventName, "end", {
         ...eventBasePayload,
-        result
+        result,
+        ...abortedByExitAll ? { aborted: true } : {}
       });
       return result;
     } catch (error) {

package/lib/flowContext.js

@@ -2222,7 +2222,10 @@ const _BaseFlowEngineContext = class _BaseFlowEngineContext extends FlowContext
           ...runnerOptions || {},
           globals: mergedGlobals
         });
-        const shouldPreprocessTemplates = preprocessTemplates !== false;
+        const shouldPreprocessTemplates = (0, import_JSRunner.shouldPreprocessRunJSTemplates)({
+          version: runnerOptions == null ? void 0 : runnerOptions.version,
+          preprocessTemplates
+        });
         const jsCode = await (0, import_utils.prepareRunJsCode)(String(code ?? ""), { preprocessTemplates: shouldPreprocessTemplates });
         return runner.run(jsCode);
       }

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/runjs-context/registry.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export type RunJSVersion = 'v1' | (string & {});
+export type RunJSVersion = 'v1' | 'v2' | (string & {});
 export type RunJSContextCtor = new (delegate: any) => any;
 export type RunJSContextMeta = {
     scenes?: string[];

package/lib/runjs-context/setup.js

@@ -67,19 +67,26 @@ async function setupRunJSContexts() {
     import("./contexts/JSRecordActionRunJSContext"),
     import("./contexts/JSCollectionActionRunJSContext")
   ]);
-  const v1 = "v1";
-  import_registry.RunJSContextRegistry.register(v1, "*", import_flowContext.FlowRunJSContext);
-  import_registry.RunJSContextRegistry.register(v1, "JSBlockModel", JSBlockRunJSContext, { scenes: ["block"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSFieldModel", JSFieldRunJSContext, { scenes: ["detail"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSEditableFieldModel", JSEditableFieldRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSItemModel", JSItemRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSColumnModel", JSColumnRunJSContext, { scenes: ["table"] });
-  import_registry.RunJSContextRegistry.register(v1, "FormJSFieldItemModel", FormJSFieldItemRunJSContext, { scenes: ["form"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSRecordActionModel", JSRecordActionRunJSContext, { scenes: ["table"] });
-  import_registry.RunJSContextRegistry.register(v1, "JSCollectionActionModel", JSCollectionActionRunJSContext, { scenes: ["table"] });
-  await (0, import_contributions.applyRunJSContextContributions)(v1);
+  const registerBuiltins = /* @__PURE__ */ __name((version) => {
+    import_registry.RunJSContextRegistry.register(version, "*", import_flowContext.FlowRunJSContext);
+    import_registry.RunJSContextRegistry.register(version, "JSBlockModel", JSBlockRunJSContext, { scenes: ["block"] });
+    import_registry.RunJSContextRegistry.register(version, "JSFieldModel", JSFieldRunJSContext, { scenes: ["detail"] });
+    import_registry.RunJSContextRegistry.register(version, "JSEditableFieldModel", JSEditableFieldRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSItemModel", JSItemRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSColumnModel", JSColumnRunJSContext, { scenes: ["table"] });
+    import_registry.RunJSContextRegistry.register(version, "FormJSFieldItemModel", FormJSFieldItemRunJSContext, { scenes: ["form"] });
+    import_registry.RunJSContextRegistry.register(version, "JSRecordActionModel", JSRecordActionRunJSContext, { scenes: ["table"] });
+    import_registry.RunJSContextRegistry.register(version, "JSCollectionActionModel", JSCollectionActionRunJSContext, {
+      scenes: ["table"]
+    });
+  }, "registerBuiltins");
+  const versions = ["v1", "v2"];
+  for (const version of versions) {
+    registerBuiltins(version);
+    await (0, import_contributions.applyRunJSContextContributions)(version);
+    (0, import_contributions.markRunJSContextsSetupDone)(version);
+  }
   done = true;
-  (0, import_contributions.markRunJSContextsSetupDone)(v1);
 }
 __name(setupRunJSContexts, "setupRunJSContexts");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/scheduler/ModelOperationScheduler.d.ts

@@ -9,7 +9,10 @@
 import type { FlowEngine } from '../flowEngine';
 import type { FlowModel } from '../models/flowModel';
 type LifecycleType = 'created' | 'mounted' | 'unmounted' | 'destroyed' | `event:${string}:start` | `event:${string}:end` | `event:${string}:error`;
-export type ScheduleWhen = LifecycleType | ((e: LifecycleEvent) => boolean);
+type EventPredicateWhen = ((e: LifecycleEvent) => boolean) & {
+    __eventType?: string;
+};
+export type ScheduleWhen = LifecycleType | EventPredicateWhen;
 export interface ScheduleOptions {
     when?: ScheduleWhen;
 }
@@ -22,6 +25,7 @@ export interface LifecycleEvent {
     error?: any;
     inputArgs?: Record<string, any>;
     result?: any;
+    aborted?: boolean;
     flowKey?: string;
     stepKey?: string;
 }

package/lib/scheduler/ModelOperationScheduler.js

@@ -171,8 +171,9 @@ const _ModelOperationScheduler = class _ModelOperationScheduler {
     this.unbindHandlers.push(() => emitter.off("model:destroyed", onDestroyed));
   }
   ensureEventSubscriptionIfNeeded(when) {
-    if (!when || typeof when !== "string") return;
-    const parsed = this.parseEventWhen(when);
+    const eventType = typeof when === "string" ? when : typeof when === "function" ? when.__eventType : void 0;
+    if (!eventType) return;
+    const parsed = this.parseEventWhen(eventType);
     if (!parsed) return;
     const { name } = parsed;
     if (this.subscribedEventNames.has(name)) return;

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.1.0-beta.6",
+  "version": "2.1.0-beta.8",
   "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.0-beta.6",
-    "@nocobase/shared": "2.1.0-beta.6",
+    "@nocobase/sdk": "2.1.0-beta.8",
+    "@nocobase/shared": "2.1.0-beta.8",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "439e45f32ee5f34d771e7f4751ef57eb7d4a82a8"
+  "gitHead": "5099d561c5467292414c1e77ad6bad3730d97344"
 }