@nocobase/client-v2 2.2.0-beta.5 → 2.2.0-beta.6

package/src/flow/components/FlowRoute.tsx

@@ -28,6 +28,13 @@ type FlowRouteGuardState = {
 
 export type LegacyPageBehavior = 'redirect' | 'notFound' | 'bridge';
 
+type FlowRouteLayoutContext = {
+  authCheck?: boolean;
+  routePath?: string;
+  routeName?: string;
+  uid?: string;
+};
+
 export type FlowRouteProps = {
   pageUid?: string;
   active?: boolean;
@@ -38,7 +45,7 @@ export type FlowRouteProps = {
 const getDefaultAdminLayoutModel = (flowEngine: FlowEngine) =>
   getAdminLayoutModel<AdminLayoutModel>(flowEngine, { required: true });
 
-const getDefaultLayoutModel = (flowEngine: FlowEngine, contextLayout?: any) => {
+const getDefaultLayoutModel = (flowEngine: FlowEngine, contextLayout?: FlowRouteLayoutContext) => {
   const layout = contextLayout || flowEngine.context.layout;
 
   if (layout?.uid) {
@@ -48,7 +55,10 @@ const getDefaultLayoutModel = (flowEngine: FlowEngine, contextLayout?: any) => {
   return getDefaultAdminLayoutModel(flowEngine);
 };
 
-const getDefaultLegacyPageBehavior = (flowEngine: FlowEngine, contextLayout?: any): LegacyPageBehavior => {
+const getDefaultLegacyPageBehavior = (
+  flowEngine: FlowEngine,
+  contextLayout?: FlowRouteLayoutContext,
+): LegacyPageBehavior => {
   const layout = contextLayout || flowEngine.context.layout;
 
   if (layout?.routeName && layout.routeName !== 'admin') {
@@ -58,6 +68,8 @@ const getDefaultLegacyPageBehavior = (flowEngine: FlowEngine, contextLayout?: an
   return 'redirect';
 };
 
+const shouldRequireAccessibleRoute = (contextLayout?: FlowRouteLayoutContext) => contextLayout?.authCheck !== false;
+
 const hasFlowModel = async (flowEngine: FlowEngine, pageUid: string) => {
   if (flowEngine.getModel(pageUid)) {
     return true;
@@ -148,18 +160,46 @@ const BridgeFlowRoute = ({
  * @throws {Error} 当缺少 `route.params.name` 时抛出异常
  */
 const FlowRoute = (props: FlowRouteProps = {}) => {
+  const {
+    active,
+    getLayoutModel: getLayoutModelProp,
+    legacyPageBehavior: legacyPageBehaviorProp,
+    pageUid: pageUidProp,
+  } = props;
   const flowEngine = useFlowEngine();
-  const flowContext = useFlowContext<any>();
+  const flowContext = useFlowContext<{ layout?: FlowRouteLayoutContext }>();
   const contextLayout = flowContext?.layout;
+  const propsLayoutModel = useMemo(() => getLayoutModelProp?.(flowEngine), [flowEngine, getLayoutModelProp]);
+  const rawRouteLayout = contextLayout || propsLayoutModel?.layout;
+  const routeLayoutUid = rawRouteLayout?.uid;
+  const routeLayoutRouteName = rawRouteLayout?.routeName;
+  const routeLayoutRoutePath = rawRouteLayout?.routePath;
+  const routeLayoutAuthCheck = rawRouteLayout?.authCheck;
+  const routeLayout = useMemo(() => {
+    if (
+      !routeLayoutUid &&
+      !routeLayoutRouteName &&
+      !routeLayoutRoutePath &&
+      typeof routeLayoutAuthCheck === 'undefined'
+    ) {
+      return undefined;
+    }
+    return {
+      authCheck: routeLayoutAuthCheck,
+      routeName: routeLayoutRouteName,
+      routePath: routeLayoutRoutePath,
+      uid: routeLayoutUid,
+    };
+  }, [routeLayoutAuthCheck, routeLayoutRouteName, routeLayoutRoutePath, routeLayoutUid]);
   const getLayoutModel = useMemo(
-    () => props.getLayoutModel || ((engine: FlowEngine) => getDefaultLayoutModel(engine, contextLayout)),
-    [contextLayout, props.getLayoutModel],
+    () => getLayoutModelProp || ((engine: FlowEngine) => getDefaultLayoutModel(engine, routeLayout)),
+    [getLayoutModelProp, routeLayout],
   );
-  const legacyPageBehavior = props.legacyPageBehavior || getDefaultLegacyPageBehavior(flowEngine, contextLayout);
+  const legacyPageBehavior = legacyPageBehaviorProp || getDefaultLegacyPageBehavior(flowEngine, routeLayout);
   const app = useApp();
   const routeRepository = flowEngine.context.routeRepository;
   const params = useParams();
-  const pageUid = props.pageUid || params?.name;
+  const pageUid = pageUidProp || params?.name;
   const skipRouteRepositoryCheck = !routeRepository;
   const [guardState, setGuardState] = useState<FlowRouteGuardState>({
     pending: true,
@@ -196,6 +236,11 @@ const FlowRoute = (props: FlowRouteProps = {}) => {
       }
 
       const route = skipRouteRepositoryCheck ? undefined : routeRepository?.getRouteBySchemaUid?.(pageUid);
+      if (!route && !skipRouteRepositoryCheck && shouldRequireAccessibleRoute(routeLayout)) {
+        setGuardState({ pending: false, allowBridge: false, notFound: true });
+        return;
+      }
+
       if (!route && legacyPageBehavior === 'notFound') {
         const flowModelExists = await hasFlowModel(flowEngine, pageUid);
         if (active && requestId === requestIdRef.current) {
@@ -245,12 +290,12 @@ const FlowRoute = (props: FlowRouteProps = {}) => {
       }
     };
 
-    void run();
+    run();
 
     return () => {
       active = false;
     };
-  }, [app, flowEngine, legacyPageBehavior, pageUid, routeRepository, skipRouteRepositoryCheck]);
+  }, [app, flowEngine, legacyPageBehavior, pageUid, routeLayout, routeRepository, skipRouteRepositoryCheck]);
 
   const content = useMemo(() => {
     if (guardState.pending) {
@@ -265,8 +310,8 @@ const FlowRoute = (props: FlowRouteProps = {}) => {
       return null;
     }
 
-    return <BridgeFlowRoute pageUid={pageUid} active={props.active} getLayoutModel={getLayoutModel} />;
-  }, [getLayoutModel, guardState.allowBridge, guardState.notFound, guardState.pending, pageUid, props.active]);
+    return <BridgeFlowRoute pageUid={pageUid} active={active} getLayoutModel={getLayoutModel} />;
+  }, [active, getLayoutModel, guardState.allowBridge, guardState.notFound, guardState.pending, pageUid]);
 
   return content;
 };

package/src/flow/components/__tests__/FieldAssignRulesEditor.test.tsx

@@ -795,15 +795,23 @@ describe('FieldAssignRulesEditor', () => {
     );
 
     expect(screen.getByLabelText('Default value')).toBeInTheDocument();
+    expect(screen.getByLabelText('Override value')).toBeInTheDocument();
     expect(screen.getByLabelText('Fixed value')).toBeInTheDocument();
     expect(screen.getByLabelText('Fixed value')).toBeChecked();
     await userEvent.click(screen.getByLabelText('Default value'));
     await waitFor(() => {
       expect(onChange).toHaveBeenCalled();
     });
-
-    const lastCall = onChange.mock.calls[onChange.mock.calls.length - 1]?.[0] as FieldAssignRuleItem[];
+    let lastCall = onChange.mock.calls[onChange.mock.calls.length - 1]?.[0] as FieldAssignRuleItem[];
     expect(lastCall?.[0]?.mode).toBe('default');
+
+    onChange.mockClear();
+    await userEvent.click(screen.getByLabelText('Override value'));
+    await waitFor(() => {
+      expect(onChange).toHaveBeenCalled();
+    });
+    lastCall = onChange.mock.calls[onChange.mock.calls.length - 1]?.[0] as FieldAssignRuleItem[];
+    expect(lastCall?.[0]?.mode).toBe('override');
   });
 
   it('shows assignment mode tooltips for each option', async () => {
@@ -821,7 +829,7 @@ describe('FieldAssignRulesEditor', () => {
     );
 
     const questionIcons = Array.from(container.querySelectorAll('.anticon-question-circle'));
-    expect(questionIcons).toHaveLength(2);
+    expect(questionIcons).toHaveLength(3);
 
     await userEvent.hover(questionIcons[0] as Element);
     await waitFor(() => {
@@ -835,11 +843,80 @@ describe('FieldAssignRulesEditor', () => {
     await userEvent.unhover(questionIcons[0] as Element);
 
     await userEvent.hover(questionIcons[1] as Element);
+    await waitFor(() => {
+      expect(screen.getByText('Overrides existing values until the user edits it.')).toBeInTheDocument();
+    });
+
+    await userEvent.unhover(questionIcons[1] as Element);
+
+    await userEvent.hover(questionIcons[2] as Element);
     await waitFor(() => {
       expect(screen.getByText('A system-set value. Read-only.')).toBeInTheDocument();
     });
   });
 
+  it('honors allowed assignment modes', () => {
+    const value: FieldAssignRuleItem[] = [
+      {
+        key: '1',
+        enable: true,
+        targetPath: 'title',
+        mode: 'override',
+      },
+    ];
+
+    render(
+      wrap(
+        <FieldAssignRulesEditor
+          t={t}
+          fieldOptions={[]}
+          value={value}
+          allowedModes={['default', 'assign']}
+          showCondition={false}
+          showEnable={false}
+        />,
+      ),
+    );
+
+    expect(screen.getByLabelText('Default value')).toBeInTheDocument();
+    expect(screen.getByLabelText('Fixed value')).toBeInTheDocument();
+    expect(screen.queryByLabelText('Override value')).toBeNull();
+    expect(screen.getByLabelText('Fixed value')).toBeChecked();
+  });
+
+  it('normalizes disallowed assignment mode before emitting changes', async () => {
+    const onChange = vi.fn();
+    const value: FieldAssignRuleItem[] = [
+      {
+        key: '1',
+        enable: true,
+        targetPath: 'title',
+        mode: 'override',
+      },
+    ];
+
+    render(
+      wrap(
+        <FieldAssignRulesEditor
+          t={t}
+          fieldOptions={[]}
+          value={value}
+          onChange={onChange}
+          allowedModes={['default', 'assign']}
+          showCondition={false}
+        />,
+      ),
+    );
+
+    await userEvent.click(screen.getByRole('switch'));
+
+    await waitFor(() => {
+      expect(onChange).toHaveBeenCalled();
+    });
+    const lastCall = onChange.mock.calls[onChange.mock.calls.length - 1]?.[0] as FieldAssignRuleItem[];
+    expect(lastCall?.[0]?.mode).toBe('assign');
+  });
+
   it('merges extra item tree into base item while keeping order', () => {
     const base: MetaTreeNode[] = [
       { name: 'formValues', title: 'Current form', type: 'object', paths: ['formValues'] },
@@ -897,7 +974,7 @@ describe('FieldAssignRulesEditor', () => {
 
     const itemNode = merged.find((node) => node.name === 'item');
     expect(itemNode).toBeTruthy();
-    const parent = (itemNode.children as MetaTreeNode[]).find((node) => node.name === 'parentItem');
+    const parent = ((itemNode?.children as MetaTreeNode[]) || []).find((node) => node.name === 'parentItem');
     expect(parent).toBeTruthy();
 
     const nestedParent = ((parent?.children as MetaTreeNode[]) || []).find((node) => node.name === 'parentItem');

package/src/flow/components/code-editor/__tests__/useCodeRunner.test.tsx

@@ -20,8 +20,6 @@ import {
   FlowEngineProvider,
   FlowModelRenderer,
   ElementProxy,
-  createSafeWindow,
-  createSafeDocument,
   createViewScopedEngine,
 } from '@nocobase/flow-engine';
 import { JSEditableFieldModel } from '../../../models/fields/JSEditableFieldModel';
@@ -167,11 +165,7 @@ describe('useCodeRunner (beforeRender)', () => {
             const code = ctx?.inputArgs?.preview?.code || '';
             ctx.onRefReady(ctx.ref, async (el) => {
               ctx.defineProperty('element', { get: () => new ElementProxy(el as any) });
-              await ctx.runjs(
-                code,
-                { window: createSafeWindow(), document: createSafeDocument() },
-                { preprocessTemplates: true },
-              );
+              await ctx.runjs(code, undefined, { preprocessTemplates: true });
             });
           },
         },
@@ -286,16 +280,7 @@ return currentUsername;
             const code = ctx?.inputArgs?.preview?.code || '';
             ctx.onRefReady(ctx.ref, async (el) => {
               ctx.defineProperty('element', { get: () => new ElementProxy(el as any) });
-              const navigator = { userAgent: 'test' } as any;
-              await ctx.runjs(
-                code,
-                {
-                  window: createSafeWindow({ navigator }),
-                  document: createSafeDocument(),
-                  navigator,
-                },
-                { preprocessTemplates: true },
-              );
+              await ctx.runjs(code, undefined, { preprocessTemplates: true });
             });
           },
         },

package/src/flow/components/code-editor/hooks/useCodeRunner.ts

@@ -9,14 +9,7 @@
 
 import { useCallback, useRef, useState } from 'react';
 import { parseErrorLineColumn, WRAPPER_PRELUDE_LINES } from '../errorHelpers';
-import {
-  FlowModelContext,
-  JSRunner,
-  createSafeWindow,
-  createSafeDocument,
-  createSafeNavigator,
-  prepareRunJsCode,
-} from '@nocobase/flow-engine';
+import { FlowModelContext, JSRunner, prepareRunJsCode } from '@nocobase/flow-engine';
 
 export type RunLog = { level: 'log' | 'info' | 'warn' | 'error'; msg: string; line?: number; column?: number };
 type RunResult = Awaited<ReturnType<JSRunner['run']>>;
@@ -286,12 +279,7 @@ export function useCodeRunner(hostCtx: FlowModelContext, version = 'v1') {
           const eventName = typeof onDef === 'string' ? onDef : onDef?.eventName;
           if (!flow) {
             // 无可用流程（典型场景：联动规则里的 RunJS 预览），直接在当前上下文执行代码
-            const navigator = createSafeNavigator();
-            await directRunCtx.runjs(
-              code,
-              { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-              { version },
-            );
+            await directRunCtx.runjs(code, undefined, { version });
           } else if (typeof eventName === 'string') {
             await m.dispatchEvent(eventName, { preview: { code } }, { sequential: true, useCache: false });
           } else if (isManual) {

package/src/flow/components/code-editor/runjsDiagnostics.ts

@@ -20,10 +20,8 @@ import * as acornWalk from 'acorn-walk';
 import {
   JSRunner,
   FlowContext,
-  createSafeDocument,
-  createSafeNavigator,
-  createSafeWindow,
   prepareRunJsCode,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates,
 } from '@nocobase/flow-engine';
 
@@ -604,41 +602,7 @@ function collectHeuristicIssues(code: string): RunJSIssue[] {
     return issues;
   }
 
-  const declared = new Set<string>([
-    // Common globals / allowed runtime context roots
-    'ctx',
-    'console',
-    'window',
-    'document',
-    'navigator',
-    'Math',
-    'Date',
-    'Array',
-    'Object',
-    'Number',
-    'String',
-    'Boolean',
-    'Promise',
-    'RegExp',
-    'Set',
-    'Map',
-    'WeakSet',
-    'WeakMap',
-    'JSON',
-    'Intl',
-    'URL',
-    'Error',
-    'TypeError',
-    'encodeURIComponent',
-    'decodeURIComponent',
-    'parseInt',
-    'parseFloat',
-    'isNaN',
-    'isFinite',
-    'undefined',
-    'NaN',
-    'Infinity',
-  ]);
+  const declared = new Set<string>(RUNJS_ALLOWED_BARE_GLOBAL_NAMES);
 
   const addId = (id: any) => {
     if (id && typeof id.name === 'string') declared.add(id.name);
@@ -1036,15 +1000,14 @@ export async function diagnoseRunJS(
     const { consoleCapture, loggerCapture } = createLogCollectors(logs);
 
     const baseGlobals: Record<string, any> = { console: consoleCapture };
-    try {
-      if (typeof window !== 'undefined') {
-        const navigator = createSafeNavigator();
+    if (typeof window !== 'undefined') {
+      baseGlobals.window = window;
+      if (typeof navigator !== 'undefined') {
         baseGlobals.navigator = navigator;
-        baseGlobals.window = createSafeWindow({ navigator });
-        baseGlobals.document = createSafeDocument();
       }
-    } catch (_) {
-      // ignore safe globals failures
+    }
+    if (typeof document !== 'undefined') {
+      baseGlobals.document = document;
     }
 
     let prepared = src;

package/src/flow/models/actions/JSActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel } from '../base';
@@ -72,12 +72,7 @@ ctx.message.info('Hello JS action.');
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },

package/src/flow/models/actions/JSCollectionActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel, ActionSceneEnum } from '../base';
@@ -78,12 +78,7 @@ if (!rows.length) {
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },

package/src/flow/models/actions/JSItemActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ElementProxy, createSafeDocument, createSafeNavigator, createSafeWindow, tExpr } from '@nocobase/flow-engine';
+import { ElementProxy, tExpr } from '@nocobase/flow-engine';
 import React from 'react';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionModel, ActionSceneEnum, CollectionActionGroupModel, RecordActionGroupModel } from '../base';
@@ -137,12 +137,7 @@ JSItemActionModel.registerFlow({
           ctx.defineProperty('element', {
             get: () => new ElementProxy(element),
           });
-          const navigator = createSafeNavigator();
-          await ctx.runjs(
-            code,
-            { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-            { version },
-          );
+          await ctx.runjs(code, undefined, { version });
         });
       },
     },

package/src/flow/models/actions/JSRecordActionModel.tsx

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { createSafeDocument, createSafeWindow, createSafeNavigator, tExpr } from '@nocobase/flow-engine';
+import { tExpr } from '@nocobase/flow-engine';
 import type { ButtonProps } from 'antd/es/button';
 import { CodeEditor } from '../../components/code-editor';
 import { ActionSceneEnum, RecordActionModel } from '../base';
@@ -78,12 +78,7 @@ if (!ctx.record) {
       },
       async handler(ctx, params) {
         const { code, version } = resolveRunJsParams(ctx, params);
-        const navigator = createSafeNavigator();
-        await ctx.runjs(
-          code,
-          { window: createSafeWindow({ navigator }), document: createSafeDocument(), navigator },
-          { version },
-        );
+        await ctx.runjs(code, undefined, { version });
       },
     },
   },

package/src/flow/models/base/ActionModel.tsx

@@ -18,6 +18,17 @@ import { commonConditionHandler, ConditionBuilder } from '../../components/Condi
 export { ActionModel, ActionSceneEnum, ActionWithoutPermission, type ActionSceneType } from './ActionModelCore';
 import { ActionModel } from './ActionModelCore';
 
+function getMobileDefaultProps(ctx) {
+  const defaultProps = ctx.model.defaultProps || {};
+  if (ctx.isMobileLayout && defaultProps.icon) {
+    return {
+      ...defaultProps,
+      iconOnly: true,
+    };
+  }
+  return defaultProps;
+}
+
 ActionModel.registerFlow({
   key: 'buttonSettings',
   title: tExpr('Button settings'),
@@ -80,7 +91,7 @@ ActionModel.registerFlow({
         };
       },
       defaultParams(ctx) {
-        const defaultProps = ctx.model.defaultProps || {};
+        const defaultProps = getMobileDefaultProps(ctx);
         if (!ctx.model.enableEditColor) {
           return defaultProps;
         }

package/src/flow/models/base/GridModel.tsx

@@ -75,6 +75,12 @@ interface DragState {
   generatedIds: Map<string, string>;
 }
 
+const MOBILE_GRID_DISABLED_DROP_SLOT_TYPES = new Set<LayoutSlot['type']>(['column-edge', 'item-edge', 'empty-column']);
+
+const filterMobileGridDragSlots = (slots: LayoutSlot[]) => {
+  return slots.filter((slot) => !MOBILE_GRID_DISABLED_DROP_SLOT_TYPES.has(slot.type));
+};
+
 const getClientPoint = (event: any): { x: number; y: number } | null => {
   if (!event) {
     return null;
@@ -625,7 +631,7 @@ export class GridModel<T extends { subModels: { items: FlowModel[] } } = Default
       return;
     }
     const snapshot = buildLayoutSnapshot({ container: this.getDragContainer() });
-    this.dragState.slots = snapshot.slots;
+    this.dragState.slots = this.context.isMobileLayout ? filterMobileGridDragSlots(snapshot.slots) : snapshot.slots;
     this.dragState.containerRect = snapshot.containerRect;
   }
 
@@ -1135,7 +1141,7 @@ GridModel.registerFlow({
 /**
  * 将多列栅格 rows 转换为移动端单列 rows。
  * 遍历原 rows 的行与列顺序，把每个原列（过滤空白列后）变成一个新行（仅一列）。
- * 行 key 使用 uid() 生成，保持插入顺序即可。
+ * 行 key 使用原 rowId 与 columnIndex 生成，避免每次渲染产生随机 key 导致移动端滚动位置丢失。
  * @param rows 原始多列 rows
  * @returns 单列 rows
  */
@@ -1145,13 +1151,38 @@ export function transformRowsToSingleColumn(
 ): Record<string, string[][]> {
   const emptyColumnUid = options?.emptyColumnUid ?? EMPTY_COLUMN_UID;
   const singleColumnRows: Record<string, string[][]> = {};
+
+  const getAvailableRowId = (baseRowId: string) => {
+    if (!singleColumnRows[baseRowId]) {
+      return baseRowId;
+    }
+
+    let duplicateIndex = 1;
+    let rowId = `${baseRowId}:duplicate:${duplicateIndex}`;
+    while (singleColumnRows[rowId]) {
+      duplicateIndex += 1;
+      rowId = `${baseRowId}:duplicate:${duplicateIndex}`;
+    }
+    return rowId;
+  };
+
   Object.keys(rows).forEach((rowId) => {
     const columns = rows[rowId];
-    columns.forEach((column) => {
-      const filtered = column.filter((id) => id !== emptyColumnUid);
-      if (filtered.length > 0) {
-        singleColumnRows[uid()] = [filtered];
-      }
+    const effectiveColumns = columns
+      .map((column, columnIndex) => ({
+        columnIndex,
+        items: column.filter((id) => id !== emptyColumnUid),
+      }))
+      .filter((column) => column.items.length > 0);
+
+    if (effectiveColumns.length === 1 && effectiveColumns[0].columnIndex === 0) {
+      singleColumnRows[getAvailableRowId(rowId)] = [effectiveColumns[0].items];
+      return;
+    }
+
+    effectiveColumns.forEach((column) => {
+      const generatedRowId = `mobile:${encodeURIComponent(rowId)}:${column.columnIndex}`;
+      singleColumnRows[getAvailableRowId(generatedRowId)] = [column.items];
     });
   });
   return singleColumnRows;

package/src/flow/models/base/PageModel/PageModel.tsx

@@ -375,12 +375,15 @@ export class PageModel extends FlowModel<PageModelStructure> {
           tabBarStyle={this.props.tabBarStyle}
           items={this.mapTabs()}
           onChange={(activeKey) => {
+            const previousActiveKey = this.props.tabActiveKey || this.getActiveTabKey();
             this.context.view.navigation?.changeTo?.({
               tabUid: activeKey,
             });
 
             this.invokeTabModelLifecycleMethod(activeKey, 'onActive');
-            this.invokeTabModelLifecycleMethod(this.props.tabActiveKey, 'onInactive');
+            if (previousActiveKey && previousActiveKey !== activeKey) {
+              this.invokeTabModelLifecycleMethod(previousActiveKey, 'onInactive');
+            }
             this.setProps('tabActiveKey', activeKey);
           }}
           // destroyInactiveTabPane

package/src/flow/models/base/PageModel/__tests__/PageModel.test.ts

@@ -140,13 +140,9 @@ vi.mock('@nocobase/flow-engine', () => {
     jioToJoiSchema: () => ({
       validate: (value: any) => ({ value }),
     }),
-    createSafeWindow: () => window,
-    createSafeDocument: () => document,
-    createSafeNavigator: () => navigator,
     isRunJSValue: () => false,
     isVariableExpression: () => false,
     normalizeRunJSValue: (value: any) => value,
-    runjsWithSafeGlobals: async (handler: any, ...args: any[]) => handler?.(...args),
     parseCtxDateExpression: (value: any) => value,
     setupRunJSContexts: () => undefined,
     getRunJSScenesForContext: () => [],
@@ -452,6 +448,34 @@ describe('PageModel', () => {
         marginInlineEnd: 24,
       });
     });
+
+    it('should deactivate the previous tab when navigation updates active tab synchronously', () => {
+      pageModel.props = { tabActiveKey: 'tab-old' } as any;
+      const invokeSpy = vi.spyOn(pageModel as any, 'invokeTabModelLifecycleMethod').mockImplementation(() => undefined);
+      const changeTo = vi.fn((params: { tabUid: string }) => {
+        pageModel.props.tabActiveKey = params.tabUid;
+      });
+
+      pageModel.context.view = {
+        navigation: {
+          viewParams: {
+            tabUid: 'tab-old',
+          },
+          changeTo,
+        },
+      } as any;
+
+      const result = pageModel.renderTabs() as any;
+      const tabsElement = result.props.children;
+
+      tabsElement.props.onChange('tab-new');
+
+      expect(changeTo).toHaveBeenCalledWith({ tabUid: 'tab-new' });
+      expect(invokeSpy).toHaveBeenNthCalledWith(1, 'tab-new', 'onActive');
+      expect(invokeSpy).toHaveBeenNthCalledWith(2, 'tab-old', 'onInactive');
+      expect(invokeSpy).not.toHaveBeenCalledWith('tab-new', 'onInactive');
+      expect(pageModel.props.tabActiveKey).toBe('tab-new');
+    });
   });
 
   describe('render header spacing with tabs', () => {