@nocobase/client-v2 2.1.0-beta.29 → 2.1.0-beta.30

package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.ts

@@ -8,15 +8,21 @@
  */
 
 import type { BaseApplication } from '../../../BaseApplication';
-import { convertV2AdminPathToLegacy } from '../../../authRedirect';
 import { NocoBaseDesktopRouteType, type NocoBaseDesktopRoute } from '../../../flow-compat';
 
 export type AdminRouteNavigationMode = 'spa' | 'document';
+export type AdminRouteRuntimeTargetReason =
+  | 'ok'
+  | 'missingSchemaUid'
+  | 'unsupportedV2Runtime'
+  | 'emptyGroup'
+  | 'unsupportedRouteType';
 
 export type AdminRouteRuntimeTarget = {
   runtimePath: string | null;
   navigationMode: AdminRouteNavigationMode;
   isLegacy: boolean;
+  reason: AdminRouteRuntimeTargetReason;
 };
 
 const V2_PUBLIC_PATH_SUFFIX = '/v2/';
@@ -45,6 +51,7 @@ const EMPTY_TARGET: AdminRouteRuntimeTarget = {
   runtimePath: null,
   navigationMode: 'spa',
   isLegacy: false,
+  reason: 'unsupportedRouteType',
 };
 
 function normalizeRootRelativePath(pathname: string) {
@@ -60,14 +67,8 @@ function normalizePublicPath(value = '/') {
   return normalized.endsWith('/') ? normalized : `${normalized}/`;
 }
 
-/**
- * 判断当前应用是否运行在需要兼容跳回 v1 的 `/v2/` 路径下。
- *
- * @param {ResolveAdminRouteRuntimeTargetOptions['app']} app 当前应用实例
- * @returns {boolean} 是否启用 v2 到 v1 的经典页跳转
- */
-function shouldUseLegacyDocumentNavigation(app: ResolveAdminRouteRuntimeTargetOptions['app']) {
-  return normalizePublicPath(app.getPublicPath()).endsWith(V2_PUBLIC_PATH_SUFFIX);
+export function isV2AdminRuntime(app?: ResolveAdminRouteRuntimeTargetOptions['app']) {
+  return !!app?.getPublicPath && normalizePublicPath(app.getPublicPath()).endsWith(V2_PUBLIC_PATH_SUFFIX);
 }
 
 export function toRouterNavigationPath(pathname: string, basename?: string) {
@@ -114,12 +115,6 @@ function appendLocationState(pathname: string, location?: LocationLike) {
   return `${pathname}${search}${hash}`;
 }
 
-function isSameOrDescendantPath(pathname: string, basePath: string) {
-  const normalizedPathname = normalizeRootRelativePath(pathname);
-  const normalizedBasePath = normalizeRootRelativePath(basePath);
-  return normalizedPathname === normalizedBasePath || normalizedPathname.startsWith(`${normalizedBasePath}/`);
-}
-
 function logInvalidTarget(
   logger: ResolveAdminRouteRuntimeTargetOptions['log'],
   reason: string,
@@ -134,6 +129,47 @@ function isSkippableRoute(route: NocoBaseDesktopRoute | undefined) {
   );
 }
 
+export function isV2MenuRoute(route: NocoBaseDesktopRoute | undefined): boolean {
+  if (!route || route.hidden === true || route.hideInMenu === true) {
+    return false;
+  }
+
+  if (route.type === NocoBaseDesktopRouteType.flowPage || route.type === NocoBaseDesktopRouteType.link) {
+    return true;
+  }
+
+  if (route.type === NocoBaseDesktopRouteType.group) {
+    return Array.isArray(route.children) && route.children.some((child) => isV2MenuRoute(child));
+  }
+
+  return false;
+}
+
+export function findFirstV2LandingRoute(routes: NocoBaseDesktopRoute[] | undefined): NocoBaseDesktopRoute | undefined {
+  if (!Array.isArray(routes)) {
+    return undefined;
+  }
+
+  for (const route of routes) {
+    if (!route || route.hidden === true || route.hideInMenu === true || route.type === NocoBaseDesktopRouteType.tabs) {
+      continue;
+    }
+
+    if (route.type === NocoBaseDesktopRouteType.flowPage) {
+      return route;
+    }
+
+    if (route.type === NocoBaseDesktopRouteType.group) {
+      const nested = findFirstV2LandingRoute(route.children);
+      if (nested) {
+        return nested;
+      }
+    }
+  }
+
+  return undefined;
+}
+
 export function findFirstAccessiblePageRoute(
   routes: NocoBaseDesktopRoute[] | undefined,
 ): NocoBaseDesktopRoute | undefined {
@@ -161,64 +197,44 @@ export function findFirstAccessiblePageRoute(
   return undefined;
 }
 
-function resolvePageRuntimeTarget(options: ResolveAdminRouteRuntimeTargetOptions, route: NocoBaseDesktopRoute) {
+function resolvePageRuntimeTarget(
+  options: ResolveAdminRouteRuntimeTargetOptions,
+  route: NocoBaseDesktopRoute,
+): AdminRouteRuntimeTarget {
   const { app, preserveLocationState, location, log = console.warn } = options;
 
   if (!route.schemaUid) {
     logInvalidTarget(log, 'Missing schemaUid.', route);
-    return EMPTY_TARGET;
-  }
-
-  if (route.type === NocoBaseDesktopRouteType.flowPage) {
     return {
-      runtimePath: getV2AdminPath(app, route.schemaUid),
-      navigationMode: 'spa' as const,
-      isLegacy: false,
+      ...EMPTY_TARGET,
+      reason: 'missingSchemaUid',
     };
   }
 
-  if (!shouldUseLegacyDocumentNavigation(app)) {
+  if (route.type === NocoBaseDesktopRouteType.flowPage) {
     return {
-      runtimePath:
-        preserveLocationState && location
-          ? appendLocationState(getV2AdminPath(app, route.schemaUid), location)
-          : getV2AdminPath(app, route.schemaUid),
+      runtimePath: getV2AdminPath(app, route.schemaUid),
       navigationMode: 'spa' as const,
       isLegacy: false,
+      reason: 'ok' as const,
     };
   }
 
-  const v2RuntimePath = getV2AdminPath(app, route.schemaUid);
-  const legacyPath = convertV2AdminPathToLegacy(app, v2RuntimePath);
-
-  if (!legacyPath) {
-    logInvalidTarget(log, 'Failed to resolve legacy runtimePath.', route);
-    return EMPTY_TARGET;
-  }
-
-  if (preserveLocationState && location) {
-    if (isSameOrDescendantPath(location.pathname, v2RuntimePath)) {
-      const correctedCurrentPath = convertV2AdminPathToLegacy(app, location);
-      if (correctedCurrentPath) {
-        return {
-          runtimePath: correctedCurrentPath,
-          navigationMode: 'document' as const,
-          isLegacy: true,
-        };
-      }
-    }
-
+  if (isV2AdminRuntime(app)) {
     return {
-      runtimePath: appendLocationState(legacyPath, location),
-      navigationMode: 'document' as const,
-      isLegacy: true,
+      ...EMPTY_TARGET,
+      reason: 'unsupportedV2Runtime',
     };
   }
 
   return {
-    runtimePath: legacyPath,
-    navigationMode: 'document' as const,
-    isLegacy: true,
+    runtimePath:
+      preserveLocationState && location
+        ? appendLocationState(getV2AdminPath(app, route.schemaUid), location)
+        : getV2AdminPath(app, route.schemaUid),
+    navigationMode: 'spa' as const,
+    isLegacy: false,
+    reason: 'ok' as const,
   };
 }
 
@@ -242,9 +258,14 @@ export function resolveAdminRouteRuntimeTarget(
   }
 
   if (route.type === NocoBaseDesktopRouteType.group) {
-    const firstAccessibleRoute = findFirstAccessiblePageRoute(route.children);
+    const firstAccessibleRoute = isV2AdminRuntime(options.app)
+      ? findFirstV2LandingRoute(route.children)
+      : findFirstAccessiblePageRoute(route.children);
     if (!firstAccessibleRoute) {
-      return EMPTY_TARGET;
+      return {
+        ...EMPTY_TARGET,
+        reason: 'emptyGroup',
+      };
     }
     return resolveAdminRouteRuntimeTarget({
       ...options,

package/src/flow/components/AdminLayout.tsx

@@ -14,7 +14,7 @@ import { useApp } from '../../hooks/useApp';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { NocoBaseDesktopRouteType } from '../../flow-compat';
 import {
-  findFirstAccessiblePageRoute,
+  findFirstV2LandingRoute,
   resolveAdminRouteRuntimeTarget,
   toRouterNavigationPath,
 } from '../admin-shell/admin-layout/resolveAdminRouteRuntimeTarget';
@@ -92,7 +92,7 @@ const AdminLayoutEntryGuard: FC<{ children: React.ReactNode }> = ({ children })
         return;
       }
 
-      const firstAccessibleRoute = findFirstAccessiblePageRoute(routeRepository?.listAccessible?.() || []);
+      const firstAccessibleRoute = findFirstV2LandingRoute(routeRepository?.listAccessible?.() || []);
       if (!firstAccessibleRoute) {
         if (active) {
           setReady(true);

package/src/flow/components/FlowRoute.tsx

@@ -15,10 +15,12 @@ import { useParams } from 'react-router-dom';
 import { useApp } from '../../hooks/useApp';
 import { NocoBaseDesktopRouteType } from '../../flow-compat';
 import { resolveAdminRouteRuntimeTarget } from '../admin-shell/admin-layout/resolveAdminRouteRuntimeTarget';
+import { AppNotFound } from '../../components';
 
 type FlowRouteGuardState = {
   pending: boolean;
   allowBridge: boolean;
+  notFound: boolean;
 };
 
 const BridgeFlowRoute = ({ pageUid }: { pageUid: string }) => {
@@ -91,6 +93,7 @@ const FlowRoute = () => {
   const [guardState, setGuardState] = useState<FlowRouteGuardState>({
     pending: true,
     allowBridge: false,
+    notFound: false,
   });
   const replaceTriggeredRef = useRef(false);
   const requestIdRef = useRef(0);
@@ -104,14 +107,14 @@ const FlowRoute = () => {
     const requestId = ++requestIdRef.current;
 
     const run = async () => {
-      setGuardState({ pending: true, allowBridge: false });
+      setGuardState({ pending: true, allowBridge: false, notFound: false });
 
       if (!routeRepository?.isAccessibleLoaded?.()) {
         try {
           await routeRepository?.ensureAccessibleLoaded?.();
         } catch (_error) {
           if (active && requestId === requestIdRef.current) {
-            setGuardState({ pending: false, allowBridge: true });
+            setGuardState({ pending: false, allowBridge: true, notFound: false });
           }
           return;
         }
@@ -139,10 +142,17 @@ const FlowRoute = () => {
           window.location.replace(target.runtimePath);
           return;
         }
+
+        if (target.reason === 'unsupportedV2Runtime') {
+          if (active && requestId === requestIdRef.current) {
+            setGuardState({ pending: false, allowBridge: false, notFound: true });
+          }
+          return;
+        }
       }
 
       if (active && requestId === requestIdRef.current) {
-        setGuardState({ pending: false, allowBridge: true });
+        setGuardState({ pending: false, allowBridge: true, notFound: false });
       }
     };
 
@@ -159,11 +169,14 @@ const FlowRoute = () => {
     }
 
     if (!guardState.allowBridge) {
+      if (guardState.notFound) {
+        return <AppNotFound />;
+      }
       return null;
     }
 
     return <BridgeFlowRoute pageUid={pageUid} />;
-  }, [guardState.allowBridge, guardState.pending, pageUid]);
+  }, [guardState.allowBridge, guardState.notFound, guardState.pending, pageUid]);
 
   return content;
 };

package/src/flow/models/fields/AssociationFieldModel/PopupSubTableFieldModel/PopupSubTableFieldModel.tsx

@@ -30,6 +30,7 @@ import { useTranslation } from 'react-i18next';
 import { buildRecordPickerPopupContextInputArgs, RecordPickerContent } from '../RecordPickerFieldModel';
 import { AssociationFieldModel } from '../AssociationFieldModel';
 import { adjustColumnOrder } from '../../../blocks/table/utils';
+import { isSubTableColumnFieldComponentContext } from '../SubTableFieldModel/SubTableColumnModel';
 import { EditFormContent } from './actions/PopupSubTableEditActionModel';
 import { QuickEditFormModel } from '../../../blocks/form/QuickEditFormModel';
 import { ActionWithoutPermission } from '../../../base/ActionModel';
@@ -901,6 +902,9 @@ PopupSubTableFieldModel.define({
 EditableItemModel.bindModelToInterface('PopupSubTableFieldModel', ['m2m', 'o2m', 'mbm'], {
   order: 300,
   when: (ctx, field) => {
+    if (isSubTableColumnFieldComponentContext(ctx)) {
+      return false;
+    }
     if (field.targetCollection) {
       return field.targetCollection.template !== 'file';
     }

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableColumnModel.tsx

@@ -36,6 +36,12 @@ import { FieldDeletePlaceholder, CustomWidth } from '../../../blocks/table/Table
 import { buildDynamicNamePath } from '../../../blocks/form/dynamicNamePath';
 import { getSubTableRowIdentity } from './rowIdentity';
 
+export const SUB_TABLE_COLUMN_FIELD_COMPONENT_CONTEXT = 'subTableColumn';
+
+export function isSubTableColumnFieldComponentContext(ctx) {
+  return (ctx?.model?.constructor as any)?.fieldComponentContext === SUB_TABLE_COLUMN_FIELD_COMPONENT_CONTEXT;
+}
+
 const SubTableRowRuleBinder: React.FC<{ model: any }> = ({ model }) => {
   React.useEffect(() => {
     const emitter = model?.flowEngine?.emitter;
@@ -401,6 +407,7 @@ export class SubTableColumnModel<
   T extends SubTableColumnModelStructure = SubTableColumnModelStructure,
 > extends EditableItemModel<T> {
   static renderMode = ModelRenderMode.RenderFunction;
+  static fieldComponentContext = SUB_TABLE_COLUMN_FIELD_COMPONENT_CONTEXT;
 
   renderHiddenInConfig() {
     return <FieldWithoutPermissionPlaceholder targetModel={this} />;

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/index.tsx

@@ -21,7 +21,7 @@ import { uid } from '@formily/shared';
 import { FormItemModel } from '../../../blocks/form';
 import { AssociationFieldModel } from '../AssociationFieldModel';
 import { buildRecordPickerPopupContextInputArgs, RecordPickerContent } from '../RecordPickerFieldModel';
-import { SubTableColumnModel } from './SubTableColumnModel';
+import { isSubTableColumnFieldComponentContext, SubTableColumnModel } from './SubTableColumnModel';
 import { SubTableField } from './SubTableField';
 import { adjustColumnOrder } from '../../../blocks/table/utils';
 
@@ -389,6 +389,9 @@ export { SubTableColumnModel };
 FormItemModel.bindModelToInterface('SubTableFieldModel', ['m2m', 'o2m', 'mbm'], {
   order: 200,
   when: (ctx, field) => {
+    if (isSubTableColumnFieldComponentContext(ctx)) {
+      return false;
+    }
     if (field.targetCollection) {
       return field.targetCollection.template !== 'file';
     }

package/src/flow/system-settings/useSystemSettings.tsx

@@ -7,8 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+import { useFlowEngine } from '@nocobase/flow-engine';
 import { useApp } from '../../flow-compat';
-import { useEffect, useState } from 'react';
+import languageCodes from '../../locale/languageCodes';
+import { useEffect, useMemo, useState } from 'react';
 
 /**
  * 读取系统设置并兼容旧 hook 的返回结构。
@@ -25,7 +27,19 @@ import { useEffect, useState } from 'react';
 export const useSystemSettings = () => {
   const app = useApp();
   const source = app.systemSettings;
+  const flowEngine = useFlowEngine({ throwError: false });
   const [, forceUpdate] = useState(0);
+  const enabledLanguages = source.data?.data?.enabledLanguages;
+  const languageOptions = useMemo(
+    () =>
+      (Array.isArray(enabledLanguages) ? enabledLanguages : [])
+        .filter((code) => languageCodes[code])
+        .map((code) => ({
+          label: languageCodes[code].label,
+          value: code,
+        })),
+    [enabledLanguages],
+  );
 
   useEffect(() => {
     void source.load();
@@ -34,6 +48,27 @@ export const useSystemSettings = () => {
     });
   }, [source]);
 
+  useEffect(() => {
+    if (!flowEngine) {
+      return;
+    }
+
+    flowEngine.context.defineProperty('locale', {
+      get: (ctx) => ctx.api?.auth?.locale || ctx.i18n?.language,
+      cache: false,
+      meta: {
+        type: 'string',
+        title: '{{t("Current language")}}',
+        sort: 970,
+        interface: 'select',
+        uiSchema: {
+          enum: languageOptions,
+          'x-component': 'Select',
+        },
+      },
+    });
+  }, [flowEngine, languageOptions]);
+
   return {
     loading: source.loading,
     data: source.data,