@nocobase/flow-engine 2.0.0-alpha.9 → 2.0.0-beta.2

package/src/views/useDialog.tsx

@@ -17,6 +17,7 @@ import DialogComponent from './DialogComponent';
 import usePatchElement from './usePatchElement';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
+import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
 
 let uuid = 0;
 
@@ -73,20 +74,43 @@ export function useDialog() {
       return null; // Header 组件本身不渲染内容
     };
 
+    const ctx = new FlowContext();
+    // 为当前视图创建作用域引擎（隔离实例与缓存）
+    const scopedEngine = createViewScopedEngine(flowContext.engine);
+    ctx.defineProperty('engine', { value: scopedEngine });
+    ctx.addDelegate(scopedEngine.context);
+    if (config.inheritContext !== false) {
+      ctx.addDelegate(flowContext);
+    } else {
+      ctx.addDelegate(flowContext.engine.context);
+    }
+
     // 构造 currentDialog 实例
     const currentDialog = {
       type: 'dialog' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
-      destroy: () => dialogRef.current?.destroy(),
+      destroy: (result?: any) => {
+        config.onClose?.();
+        dialogRef.current?.destroy();
+        closeFunc?.();
+        resolvePromise?.(result);
+        // 关闭时修正 previous/next 指针
+        scopedEngine.unlinkFromStack();
+      },
       update: (newConfig) => dialogRef.current?.update(newConfig),
       close: (result?: any, force?: boolean) => {
         if (config.preventClose && !force) {
           return;
         }
-        dialogRef.current?.destroy();
-        closeFunc?.();
-        resolvePromise?.(result);
+
+        if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
+          // 交由路由系统来销毁当前视图
+          config.inputArgs.navigation.back();
+          return;
+        }
+
+        currentDialog.destroy(result);
       },
       Footer: FooterComponent,
       Header: HeaderComponent,
@@ -99,23 +123,15 @@ export function useDialog() {
         dialogRef.current?.setHeader(header);
       },
       navigation: config.inputArgs?.navigation,
+      get record() {
+        return getViewRecordFromParent(flowContext, ctx);
+      },
     };
 
-    const ctx = new FlowContext();
-    // 为当前视图创建作用域引擎（隔离实例与缓存）
-    const scopedEngine = createViewScopedEngine(flowContext.engine);
-    ctx.defineProperty('engine', { value: scopedEngine });
-    ctx.addDelegate(scopedEngine.context);
-    if (config.inheritContext !== false) {
-      ctx.addDelegate(flowContext);
-    } else {
-      ctx.addDelegate(flowContext.engine.context);
-    }
-
     ctx.defineProperty('view', {
       get: () => currentDialog,
       // meta: createViewMeta(ctx),
-      resolveOnServer: (p: string) => p === 'record' || p.startsWith('record.'),
+      resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentDialog);
@@ -146,18 +162,13 @@ export function useDialog() {
         return (
           <DialogComponent
             className="nb-dialog-overflow-hidden"
-            key={`dialog-${uuid}`}
             ref={dialogRef}
             hidden={config.inputArgs?.hidden?.value}
             {...config}
             footer={currentFooter}
             header={currentHeader}
-            afterClose={() => {
-              closeFunc?.();
-              config.onClose?.();
-              resolvePromise?.(config.result);
-              // 关闭时修正 previous/next 指针
-              scopedEngine.unlinkFromStack();
+            onCancel={() => {
+              currentDialog.close(config.result);
             }}
           >
             {content}
@@ -169,8 +180,9 @@ export function useDialog() {
       },
     );
 
+    const key = config?.inputArgs?.viewUid || `page-${uuid}`;
     const dialog = (
-      <FlowEngineProvider engine={scopedEngine}>
+      <FlowEngineProvider key={key} engine={scopedEngine}>
         <FlowViewContextProvider context={ctx}>
           <DialogWithContext />
         </FlowViewContextProvider>

package/src/views/useDrawer.tsx

@@ -17,6 +17,7 @@ import DrawerComponent from './DrawerComponent';
 import usePatchElement from './usePatchElement';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
+import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
 
 export function useDrawer() {
   const holderRef = React.useRef(null);
@@ -101,20 +102,44 @@ export function useDrawer() {
       return null; // Header 组件本身不渲染内容
     };
 
+    const ctx = new FlowContext();
+    // 为当前视图创建作用域引擎（隔离实例与缓存）
+    const scopedEngine = createViewScopedEngine(flowContext.engine);
+    // 先将引擎暴露给视图上下文，再按需继承父上下文
+    ctx.defineProperty('engine', { value: scopedEngine });
+    ctx.addDelegate(scopedEngine.context);
+    if (config.inheritContext !== false) {
+      ctx.addDelegate(flowContext);
+    } else {
+      ctx.addDelegate(flowContext.engine.context);
+    }
+
     // 构造 currentDrawer 实例
     const currentDrawer = {
       type: 'drawer' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
-      destroy: () => drawerRef.current?.destroy(),
+      destroy: (result?: any) => {
+        config.onClose?.();
+        drawerRef.current?.destroy();
+        closeFunc?.();
+        resolvePromise?.(result);
+        // 关闭时修正 previous/next 指针
+        scopedEngine.unlinkFromStack();
+      },
       update: (newConfig) => drawerRef.current?.update(newConfig),
       close: (result?: any, force?: boolean) => {
         if (config.preventClose && !force) {
           return;
         }
-        drawerRef.current?.destroy();
-        closeFunc?.();
-        resolvePromise?.(result);
+
+        if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
+          // 交由路由系统来销毁当前视图
+          config.inputArgs.navigation.back();
+          return;
+        }
+
+        currentDrawer.destroy(result);
       },
       Footer: FooterComponent,
       Header: HeaderComponent,
@@ -127,24 +152,15 @@ export function useDrawer() {
         drawerRef.current?.setHeader(header);
       },
       navigation: config.inputArgs?.navigation,
+      get record() {
+        return getViewRecordFromParent(flowContext, ctx);
+      },
     };
 
-    const ctx = new FlowContext();
-    // 为当前视图创建作用域引擎（隔离实例与缓存）
-    const scopedEngine = createViewScopedEngine(flowContext.engine);
-    // 先将引擎暴露给视图上下文，再按需继承父上下文
-    ctx.defineProperty('engine', { value: scopedEngine });
-    ctx.addDelegate(scopedEngine.context);
-    if (config.inheritContext !== false) {
-      ctx.addDelegate(flowContext);
-    } else {
-      ctx.addDelegate(flowContext.engine.context);
-    }
-
     ctx.defineProperty('view', {
       get: () => currentDrawer,
       // meta: createViewMeta(ctx),
-      resolveOnServer: (p: string) => p === 'record' || p.startsWith('record.'),
+      resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentDrawer);
@@ -178,15 +194,12 @@ export function useDrawer() {
             ref={drawerRef}
             {...config}
             footer={currentFooter}
-            header={currentHeader}
+            header={config.header || currentHeader}
             hidden={config.inputArgs?.hidden?.value}
-            afterClose={() => {
-              closeFunc?.();
-              config.onClose?.();
-              resolvePromise?.(config.result);
-              // 关闭时修正 previous/next 指针
-              scopedEngine.unlinkFromStack();
+            onClose={() => {
+              currentDrawer.close(config.result);
             }}
+            isMobile={ctx.isMobileLayout}
           >
             {content}
             {props.children}

package/src/views/usePage.tsx

@@ -17,6 +17,7 @@ import { PageComponent } from './PageComponent';
 import usePatchElement from './usePatchElement';
 import { FlowEngineProvider } from '../provider';
 import { createViewScopedEngine } from '../ViewScopedFlowEngine';
+import { createViewRecordResolveOnServer, getViewRecordFromParent } from '../utils/variablesParams';
 
 let uuid = 0;
 
@@ -25,6 +26,7 @@ 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}</>;
   }),
 );
@@ -73,22 +75,45 @@ export function usePage() {
       return null; // Header 组件本身不渲染内容
     };
 
-    const { target, content, preventClose, inheritContext = true, ...restConfig } = config;
+    const { target, content, preventClose, inheritContext = true, inputArgs, ...restConfig } = config;
+
+    const ctx = new FlowContext();
+    // 为当前视图创建作用域引擎（隔离实例与缓存）
+    const scopedEngine = createViewScopedEngine(flowContext.engine);
+    ctx.defineProperty('engine', { value: scopedEngine });
+    ctx.addDelegate(scopedEngine.context);
+    if (inheritContext) {
+      ctx.addDelegate(flowContext);
+    } else {
+      ctx.addDelegate(flowContext.engine.context);
+    }
 
     // 构造 currentPage 实例
     const currentPage = {
       type: 'embed' as const,
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
-      destroy: () => pageRef.current?.destroy(),
+      destroy: (result?: any) => {
+        config.onClose?.();
+        resolvePromise?.(result);
+        pageRef.current?.destroy();
+        closeFunc?.();
+        // 关闭时修正 previous/next 指针
+        scopedEngine.unlinkFromStack();
+      },
       update: (newConfig) => pageRef.current?.update(newConfig),
       close: (result?: any, force?: boolean) => {
         if (preventClose && !force) {
           return;
         }
-        resolvePromise?.(result);
-        pageRef.current?.destroy();
-        closeFunc?.();
+
+        if (config.triggerByRouter && config.inputArgs?.navigation?.back) {
+          // 交由路由系统来销毁当前视图
+          config.inputArgs.navigation.back();
+          return;
+        }
+
+        currentPage.destroy(result);
       },
       Header: HeaderComponent,
       Footer: FooterComponent,
@@ -99,23 +124,17 @@ export function usePage() {
         pageRef.current?.setHeader(header);
       },
       navigation: config.inputArgs?.navigation,
+      get record() {
+        // 当视图正在查看与父 record 同一条记录时，复用父记录深拷贝；否则走服务端解析
+        return getViewRecordFromParent(flowContext, ctx);
+      },
     };
 
-    const ctx = new FlowContext();
-    // 为当前视图创建作用域引擎（隔离实例与缓存）
-    const scopedEngine = createViewScopedEngine(flowContext.engine);
-    ctx.defineProperty('engine', { value: scopedEngine });
-    ctx.addDelegate(scopedEngine.context);
-    if (inheritContext) {
-      ctx.addDelegate(flowContext);
-    } else {
-      ctx.addDelegate(flowContext.engine.context);
-    }
-
     ctx.defineProperty('view', {
       get: () => currentPage,
       // meta: createViewMeta(ctx),
-      resolveOnServer: (p: string) => p === 'record' || p.startsWith('record.'),
+      // 仅当访问关联字段或前端无本地记录数据时，才交给服务端解析
+      resolveOnServer: createViewRecordResolveOnServer(ctx, () => getViewRecordFromParent(flowContext, ctx)),
     });
     // 顶层 popup 变量：弹窗记录/数据源/上级弹窗链（去重封装）
     registerPopupVariable(ctx, currentPage);
@@ -125,7 +144,11 @@ export function usePage() {
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const mountedRef = React.useRef(false);
         // 支持 content 为函数，传递 currentPage
-        const pageContent = typeof content === 'function' ? content(currentPage, ctx) : content;
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const pageContent = React.useMemo(
+          () => (typeof content === 'function' ? content(currentPage, ctx) : content),
+          [],
+        );
         // 响应themeToken的响应式更新
         void ctx.themeToken;
         // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -141,16 +164,11 @@ export function usePage() {
 
         return (
           <PageComponent
-            key={`page-${uuid}`}
             ref={pageRef}
             hidden={config.inputArgs?.hidden?.value}
             {...restConfig}
-            afterClose={() => {
-              closeFunc?.();
-              config.onClose?.();
-              resolvePromise?.(config.result);
-              // 关闭时修正 previous/next 指针
-              scopedEngine.unlinkFromStack();
+            onClose={() => {
+              currentPage.close(config.result);
             }}
           >
             {pageContent}
@@ -162,8 +180,9 @@ export function usePage() {
       },
     );
 
+    const key = inputArgs?.viewUid || `page-${uuid}`;
     const page = (
-      <FlowEngineProvider engine={scopedEngine}>
+      <FlowEngineProvider key={key} engine={scopedEngine}>
         <FlowViewContextProvider context={ctx}>
           <PageWithContext />
         </FlowViewContextProvider>
@@ -171,7 +190,7 @@ export function usePage() {
     );
 
     if (target && target instanceof HTMLElement) {
-      closeFunc = holderRef.current?.patchElement(ReactDOM.createPortal(page, target));
+      closeFunc = holderRef.current?.patchElement(ReactDOM.createPortal(page, target, key));
     } else {
       closeFunc = holderRef.current?.patchElement(page);
     }