@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

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

@@ -14,30 +14,28 @@ import { useDialog } from '../useDialog';
 import { FlowContext } from '../../flowContext';
 
 // Mock dependencies
-vi.mock('../provider', () => ({
+vi.mock('../../provider', () => ({
   FlowEngineProvider: ({ children }) => children,
 }));
 
-vi.mock('../FlowContextProvider', () => ({
+vi.mock('../../FlowContextProvider', () => ({
   FlowViewContextProvider: ({ children }) => children,
 }));
 
-vi.mock('../ViewScopedFlowEngine', () => ({
+vi.mock('../../ViewScopedFlowEngine', () => ({
   createViewScopedEngine: (engine) => ({
     context: new FlowContext(),
     unlinkFromStack: vi.fn(),
+    // mimic real view stack linkage: previousEngine points to the last engine in chain
+    previousEngine: (engine as any)?.nextEngine || engine,
   }),
 }));
 
-vi.mock('../utils/variablesParams', () => ({
+vi.mock('../../utils/variablesParams', () => ({
   createViewRecordResolveOnServer: vi.fn(),
   getViewRecordFromParent: vi.fn(),
 }));
 
-vi.mock('../createViewMeta', () => ({
-  registerPopupVariable: vi.fn(),
-}));
-
 vi.mock('../DialogComponent', () => ({
   default: ({ children }) => <div>{children}</div>,
 }));
@@ -52,8 +50,12 @@ vi.mock('../usePatchElement', () => ({
 describe('useDialog - close/destroy logic', () => {
   const createMockFlowContext = () => {
     const ctx = new FlowContext();
+    ctx.defineMethod('t', (key: string) => key);
     ctx.engine = {
       context: new FlowContext(),
+      emitter: {
+        emit: vi.fn(),
+      },
     };
     return ctx;
   };
@@ -129,4 +131,29 @@ describe('useDialog - close/destroy logic', () => {
     // Should not call destroy directly, let router handle it
     expect(mockCloseFunc).not.toHaveBeenCalled();
   });
+
+  it('should emit view activated event on opener engine', () => {
+    const api = renderUseDialog();
+    const flowContext = createMockFlowContext();
+    const emitSpy = flowContext.engine.emitter.emit;
+
+    const dialog = api.open({ inputArgs: { viewUid: 'child-view' } }, flowContext);
+
+    dialog.close();
+    expect(emitSpy).toHaveBeenCalledWith('view:activated', expect.anything());
+  });
+
+  it('should emit view events on immediate opener engine (previousEngine) when present', () => {
+    const api = renderUseDialog();
+    const flowContext = createMockFlowContext();
+    const rootEmitSpy = flowContext.engine.emitter.emit;
+    const openerEmitSpy = vi.fn();
+    (flowContext.engine as any).nextEngine = { emitter: { emit: openerEmitSpy }, __NOCOBASE_ENGINE_SCOPE__: 'view' };
+
+    const dialog = api.open({ inputArgs: { viewUid: 'child-view' } }, flowContext);
+
+    dialog.close();
+    expect(openerEmitSpy).toHaveBeenCalledWith('view:activated', expect.anything());
+    expect(rootEmitSpy).not.toHaveBeenCalledWith('view:activated', expect.anything());
+  });
 });

package/src/views/__tests__/viewEvents.resolveOpenerEngine.test.ts

@@ -0,0 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { describe, expect, it } from 'vitest';
+import { FlowEngine } from '../../flowEngine';
+import { createViewScopedEngine } from '../../ViewScopedFlowEngine';
+import { resolveOpenerEngine } from '../viewEvents';
+
+describe('viewEvents.resolveOpenerEngine', () => {
+  it('prefers the parent view engine even when it is not the stack tail (cached page scenario)', () => {
+    const root = new FlowEngine();
+    const pageA = createViewScopedEngine(root);
+    createViewScopedEngine(root); // pageB appended after pageA
+
+    // Open a dialog from pageA while another kept-alive view exists after it.
+    // view scoped engines always link to the tail, so the dialog's previousEngine will be pageB.
+    const dialog = createViewScopedEngine(pageA);
+
+    const opener = resolveOpenerEngine(pageA, dialog);
+    expect(opener).toBe(pageA);
+  });
+});

package/src/views/createViewMeta.ts

@@ -70,66 +70,6 @@ function makeMetaFromValue(value: any, title?: string, seen?: WeakSet<any>): any
   return { type: 'any', title };
 }
 
-/**
- * Create a meta factory for ctx.view that includes:
- * - buildVariablesParams: { record } via inferRecordRef
- * - properties.record: full collection meta via buildRecordMeta
- * - type/preventClose/inputArgs/navigation fields for better variable selection UX
- */
-export function createViewMeta(ctx: FlowContext): PropertyMetaFactory {
-  const viewTitle = ctx.t('当前视图');
-  const factory: PropertyMetaFactory = async () => {
-    const view = ctx.view;
-    return {
-      type: 'object',
-      title: ctx.t('当前视图'),
-      buildVariablesParams: (c) => {
-        const params = inferViewRecordRef(c);
-        if (params) {
-          return {
-            record: params,
-          };
-        }
-        return undefined;
-      },
-      properties: async () => {
-        const props: Record<string, any> = {};
-        // 仅当能推断到当前记录引用时，才暴露“当前视图记录”，避免出现空子菜单
-        const refNow = inferViewRecordRef(ctx);
-        if (refNow && refNow.collection) {
-          const recordFactory: PropertyMetaFactory = async () => {
-            try {
-              const ref = inferViewRecordRef(ctx);
-              if (!ref?.collection) return null;
-              const dsKey = ref.dataSourceKey || 'main';
-              const ds = ctx.dataSourceManager?.getDataSource?.(dsKey);
-              const col = ds?.collectionManager?.getCollection?.(ref.collection);
-              if (!col) return null;
-              return (await buildRecordMeta(
-                () => col,
-                ctx.t('当前视图记录'),
-                (c) => inferViewRecordRef(c),
-              )) as PropertyMeta;
-            } catch (e) {
-              return null;
-            }
-          };
-          recordFactory.title = ctx.t('当前视图记录');
-          recordFactory.hasChildren = true;
-          props.record = recordFactory;
-        }
-        props.type = { type: 'string', title: ctx.t?.('类型') || '类型' };
-        props.preventClose = { type: 'boolean', title: ctx.t?.('是否允许关闭') || '是否允许关闭' };
-        props.inputArgs = makeMetaFromValue(view?.inputArgs, ctx.t?.('输入参数') || '输入参数');
-        return props;
-      },
-    } as PropertyMeta;
-  };
-  // 设置工厂函数的 title，让未加载前的占位标题就是“当前视图”
-  factory.title = viewTitle;
-  return factory;
-}
-
 /**
  * 为 ctx.popup 构建元信息：
  * - popup.record：当前弹窗记录（服务端解析）
@@ -142,14 +82,16 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
   const isPopupView = (view?: FlowView): boolean => {
     if (!view) return false;
     const stack = Array.isArray(view.navigation?.viewStack) ? view.navigation.viewStack : [];
-    return stack.length >= 2;
+    const openerUids = view?.inputArgs?.openerUids;
+    const hasOpener = Array.isArray(openerUids) && openerUids.length > 0;
+    return stack.length >= 2 || hasOpener;
   };
 
   const hasPopupNow = (): boolean => isPopupView(anchorView ?? ctx.view);
 
   // 统一解析锚定视图下的 RecordRef，避免在设置弹窗等二级视图中被误导
   const resolveRecordRef = async (flowCtx: FlowContext): Promise<RecordRef | undefined> => {
-    const view = anchorView ?? (flowCtx.view as any);
+    const view = anchorView ?? flowCtx.view;
     if (!view || !isPopupView(view)) return undefined;
 
     const base = await buildPopupRuntime(flowCtx, view);
@@ -353,19 +295,24 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
         const props: Record<string, any> = {};
         // 当前弹窗 UID（纯前端变量）
         props.uid = { type: 'string', title: t('Popup uid') };
-        // 基于锚定视图计算“当前弹窗记录”的集合与 RecordRef
-        const recordFactory: PropertyMetaFactory = async () => {
-          const col = await getCurrentCollection();
-          if (!col) return null;
-          return await buildRecordMeta(
-            () => col,
-            t('Current popup record'),
-            (c) => resolveRecordRef(c),
-          );
-        };
-        recordFactory.title = t('Current popup record');
-        recordFactory.hasChildren = true;
-        props.record = recordFactory;
+        // 仅当存在 filterByTk（可推断具体记录）时才提供“当前弹窗记录”变量；
+        // 对于新增/选择类弹窗（无 filterByTk），不应展示该变量以避免误导。
+        const recordRef = await resolveRecordRef(ctx);
+        if (recordRef) {
+          // 基于锚定视图计算“当前弹窗记录”的集合与 RecordRef
+          const recordFactory: PropertyMetaFactory = async () => {
+            const col = await getCurrentCollection();
+            if (!col) return null;
+            return await buildRecordMeta(
+              () => col,
+              t('Current popup record'),
+              (c) => resolveRecordRef(c),
+            );
+          };
+          recordFactory.title = t('Current popup record');
+          recordFactory.hasChildren = true;
+          props.record = recordFactory;
+        }
         // 当 view.inputArgs 带有 sourceId + associationName 时，提供“上级记录”变量（基于 sourceId 推断）
         try {
           const inputArgs = ctx.view?.inputArgs;

package/src/views/index.tsx

@@ -9,7 +9,6 @@
 
 export { useDialog } from './useDialog';
 export { useDrawer } from './useDrawer';
-export { usePage } from './usePage';
+export { usePage, GLOBAL_EMBED_CONTAINER_ID, EMBED_REPLACING_DATA_KEY } from './usePage';
 export { usePopover } from './usePopover';
 export { ViewNavigation } from './ViewNavigation';
-export { createViewMeta } from './createViewMeta';

package/src/views/useDialog.tsx

@@ -15,6 +15,7 @@ import { FlowViewContextProvider } from '../FlowContextProvider';
 import { registerPopupVariable } from './createViewMeta';
 import DialogComponent from './DialogComponent';
 import usePatchElement from './usePatchElement';
+import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } from './viewEvents';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
@@ -25,6 +26,7 @@ export function useDialog() {
   const holderRef = React.useRef(null);
 
   const open = (config, flowContext) => {
+    const parentEngine = flowContext?.engine;
     uuid += 1;
     const dialogRef = React.createRef<{
       destroy: () => void;
@@ -77,6 +79,8 @@ export function useDialog() {
     const ctx = new FlowContext();
     // 为当前视图创建作用域引擎（隔离实例与缓存）
     const scopedEngine = createViewScopedEngine(flowContext.engine);
+    const openerEngine = resolveOpenerEngine(parentEngine, scopedEngine);
+
     ctx.defineProperty('engine', { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
     if (config.inheritContext !== false) {
@@ -95,6 +99,10 @@ export function useDialog() {
         dialogRef.current?.destroy();
         closeFunc?.();
         resolvePromise?.(result);
+        // Notify opener view that it becomes active again.
+        const openerEmitter = openerEngine?.emitter;
+        bumpViewActivatedVersion(openerEmitter);
+        openerEmitter?.emit?.(VIEW_ACTIVATED_EVENT, { type: 'dialog', viewUid: currentDialog?.inputArgs?.viewUid });
         // 关闭时修正 previous/next 指针
         scopedEngine.unlinkFromStack();
       },
@@ -130,7 +138,6 @@ export function useDialog() {
 
     ctx.defineProperty('view', {
       get: () => currentDialog,
-      // meta: createViewMeta(ctx),
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）

package/src/views/useDrawer.tsx

@@ -15,6 +15,7 @@ import { FlowViewContextProvider } from '../FlowContextProvider';
 import { registerPopupVariable } from './createViewMeta';
 import DrawerComponent from './DrawerComponent';
 import usePatchElement from './usePatchElement';
+import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } from './viewEvents';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
@@ -54,6 +55,7 @@ export function useDrawer() {
   RenderNestedDrawer.displayName = 'RenderNestedDrawer';
 
   const open = (config, flowContext: FlowEngineContext) => {
+    const parentEngine = flowContext.engine;
     const drawerRef = React.createRef<{
       destroy: () => void;
       update: (config: any) => void;
@@ -105,6 +107,8 @@ export function useDrawer() {
     const ctx = new FlowContext();
     // 为当前视图创建作用域引擎（隔离实例与缓存）
     const scopedEngine = createViewScopedEngine(flowContext.engine);
+    const openerEngine = resolveOpenerEngine(parentEngine, scopedEngine);
+
     // 先将引擎暴露给视图上下文，再按需继承父上下文
     ctx.defineProperty('engine', { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
@@ -124,6 +128,10 @@ export function useDrawer() {
         drawerRef.current?.destroy();
         closeFunc?.();
         resolvePromise?.(result);
+        // Notify opener view that it becomes active again.
+        const openerEmitter = openerEngine?.emitter;
+        bumpViewActivatedVersion(openerEmitter);
+        openerEmitter?.emit?.(VIEW_ACTIVATED_EVENT, { type: 'drawer', viewUid: currentDrawer?.inputArgs?.viewUid });
         // 关闭时修正 previous/next 指针
         scopedEngine.unlinkFromStack();
       },
@@ -159,7 +167,6 @@ export function useDrawer() {
 
     ctx.defineProperty('view', {
       get: () => currentDrawer,
-      // meta: createViewMeta(ctx),
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）

package/src/views/usePage.tsx

@@ -15,26 +15,33 @@ import { FlowViewContextProvider } from '../FlowContextProvider';
 import { registerPopupVariable } from './createViewMeta';
 import { PageComponent } from './PageComponent';
 import usePatchElement from './usePatchElement';
+import { VIEW_ACTIVATED_EVENT, bumpViewActivatedVersion, resolveOpenerEngine } from './viewEvents';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
 import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
 
 let uuid = 0;
 
+/** Global embed container element ID */
+export const GLOBAL_EMBED_CONTAINER_ID = 'nocobase-embed-container';
+/** Dataset key used to signal embed replacement in progress (skip style reset on close) */
+export const EMBED_REPLACING_DATA_KEY = 'nocobaseEmbedReplacing';
+
 // 稳定的 Holder 组件，避免在父组件重渲染时更换组件类型导致卸载， 否则切换主题时会丢失所有页面内容
 const PageElementsHolder = React.memo(
   React.forwardRef((props: any, ref: any) => {
     const [elements, patchElement] = usePatchElement();
     React.useImperativeHandle(ref, () => ({ patchElement }), [patchElement]);
-    console.log('[NocoBase] Rendering PageElementsHolder with elements count:', elements.length);
     return <>{elements}</>;
   }),
 );
 
 export function usePage() {
   const holderRef = React.useRef(null);
+  const globalEmbedActiveRef = React.useRef<null | { destroy: () => void }>(null);
 
   const open = (config, flowContext) => {
+    const parentEngine = flowContext?.engine;
     uuid += 1;
     const pageRef = React.createRef<{
       destroy: () => void;
@@ -75,11 +82,33 @@ export function usePage() {
       return null; // Header 组件本身不渲染内容
     };
 
-    const { target, content, preventClose, inheritContext = true, inputArgs, ...restConfig } = config;
+    const {
+      target,
+      content,
+      preventClose,
+      inheritContext = true,
+      inputArgs: viewInputArgs = {},
+      ...restConfig
+    } = config;
+    const isGlobalEmbedContainer = target instanceof HTMLElement && target.id === GLOBAL_EMBED_CONTAINER_ID;
+
+    // Global embed container uses "replace" behavior: opening a new view destroys the previous one.
+    if (isGlobalEmbedContainer && globalEmbedActiveRef.current) {
+      try {
+        // Avoid style "reset flicker" when replacing: tell embed wrappers to skip resetting container styles.
+        target.dataset[EMBED_REPLACING_DATA_KEY] = '1';
+        globalEmbedActiveRef.current.destroy();
+      } finally {
+        delete target.dataset[EMBED_REPLACING_DATA_KEY];
+        globalEmbedActiveRef.current = null;
+      }
+    }
 
     const ctx = new FlowContext();
     // 为当前视图创建作用域引擎（隔离实例与缓存）
     const scopedEngine = createViewScopedEngine(flowContext.engine);
+    const openerEngine = resolveOpenerEngine(parentEngine, scopedEngine);
+
     ctx.defineProperty('engine', { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
     if (inheritContext) {
@@ -91,13 +120,27 @@ export function usePage() {
     // 构造 currentPage 实例
     const currentPage = {
       type: 'embed' as const,
-      inputArgs: config.inputArgs || {},
+      inputArgs: viewInputArgs,
       preventClose: !!config.preventClose,
       destroy: (result?: any) => {
         config.onClose?.();
         resolvePromise?.(result);
         pageRef.current?.destroy();
         closeFunc?.();
+
+        if (isGlobalEmbedContainer) {
+          globalEmbedActiveRef.current = null;
+        }
+
+        // Notify opener view that it becomes active again.
+        const isReplacing =
+          isGlobalEmbedContainer && target instanceof HTMLElement && target.dataset?.[EMBED_REPLACING_DATA_KEY] === '1';
+        if (!isReplacing) {
+          const openerEmitter = openerEngine?.emitter;
+          bumpViewActivatedVersion(openerEmitter);
+          openerEmitter?.emit?.(VIEW_ACTIVATED_EVENT, { type: 'embed', viewUid: currentPage?.inputArgs?.viewUid });
+        }
+
         // 关闭时修正 previous/next 指针
         scopedEngine.unlinkFromStack();
       },
@@ -132,7 +175,6 @@ export function usePage() {
 
     ctx.defineProperty('view', {
       get: () => currentPage,
-      // meta: createViewMeta(ctx),
       // 仅当访问关联字段或前端无本地记录数据时，才交给服务端解析
       resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
@@ -180,7 +222,7 @@ export function usePage() {
       },
     );
 
-    const key = inputArgs?.viewUid || `page-${uuid}`;
+    const key = viewInputArgs?.viewUid || `page-${uuid}`;
     const page = (
       <FlowEngineProvider key={key} engine={scopedEngine}>
         <FlowViewContextProvider context={ctx}>
@@ -195,6 +237,10 @@ export function usePage() {
       closeFunc = holderRef.current?.patchElement(page);
     }
 
+    if (isGlobalEmbedContainer) {
+      globalEmbedActiveRef.current = { destroy: currentPage.destroy };
+    }
+
     return Object.assign(promise, currentPage);
   };
 

package/src/views/usePopover.tsx

@@ -40,8 +40,11 @@ const PopoverComponent = React.forwardRef<any, any>(({ afterClose, content, plac
       destroyTooltipOnHide
       content={config.content}
       placement={config.placement}
-      getPopupContainer={() => document.body}
+      getPopupContainer={() => document.querySelector('#nocobase-app-container') || document.body}
       onOpenChange={(nextOpen) => {
+        if (!nextOpen && config.preventClose) {
+          return;
+        }
         setVisible(nextOpen);
         if (!nextOpen) {
           afterClose?.();

package/src/views/viewEvents.ts

@@ -0,0 +1,55 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { FlowEngine } from '../flowEngine';
+
+export const VIEW_ACTIVATED_VERSION = Symbol.for('__NOCOBASE_VIEW_ACTIVATED_VERSION__');
+
+export const VIEW_ACTIVATED_EVENT = 'view:activated' as const;
+export const DATA_SOURCE_DIRTY_EVENT = 'dataSource:dirty' as const;
+
+export const ENGINE_SCOPE_KEY = '__NOCOBASE_ENGINE_SCOPE__' as const;
+export const VIEW_ENGINE_SCOPE = 'view' as const;
+
+export function getEmitterViewActivatedVersion(emitter): number {
+  const raw = Reflect.get(emitter, VIEW_ACTIVATED_VERSION);
+  const num = typeof raw === 'number' ? raw : Number(raw);
+  return Number.isFinite(num) && num > 0 ? num : 0;
+}
+
+export function bumpViewActivatedVersion(emitter): number {
+  const current = getEmitterViewActivatedVersion(emitter);
+  if (!Object.isExtensible(emitter)) return current;
+  const next = current + 1;
+  Reflect.set(emitter, VIEW_ACTIVATED_VERSION, next);
+  return next;
+}
+
+function isViewEngine(engine: FlowEngine): boolean {
+  return Reflect.get(engine, ENGINE_SCOPE_KEY) === VIEW_ENGINE_SCOPE;
+}
+
+function findNearestViewEngine(engine: FlowEngine | undefined): FlowEngine | undefined {
+  let cur: FlowEngine | undefined = engine;
+  let guard = 0;
+  while (cur && guard++ < 50) {
+    if (isViewEngine(cur)) return cur;
+    cur = (cur as { previousEngine?: FlowEngine | undefined }).previousEngine;
+  }
+}
+
+export function resolveOpenerEngine(parentEngine: FlowEngine, scopedEngine: FlowEngine): FlowEngine | undefined {
+  if (!parentEngine) return undefined;
+  const parentViewEngine = findNearestViewEngine(parentEngine);
+  if (parentViewEngine) return parentViewEngine;
+
+  // Fallback: resolve from previous engine in the stack (historical behavior).
+  const previousEngine = scopedEngine?.previousEngine;
+  return findNearestViewEngine(previousEngine) || parentEngine;
+}