@nocobase/client 2.1.0-beta.21 → 2.1.0-beta.23

package/es/modules/actions/link/useURLAndHTMLSchema.d.ts

@@ -8,6 +8,7 @@
  */
 import React from 'react';
 export declare const getVariableComponentWithScope: (Com: any, data?: any[]) => (props: any) => React.JSX.Element;
+export declare const FlowSettingsVariableTextArea: (props: any) => React.JSX.Element;
 export declare const useURLAndHTMLSchema: () => {
     urlSchema: {
         title: string;

package/es/modules/blocks/BlockSchemaToolbar.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-import { Collection } from '../../data-source';
+import { Collection } from '../../data-source/collection/Collection';
 export declare const BlockSchemaToolbar: (props: any) => React.JSX.Element;
 export declare function getCollectionTitle(arg: {
     collectionTitle: string;

package/es/plugin-manager/PinnedPluginListProvider.d.ts

@@ -7,8 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
+import { type PinnedPluginListItems } from './context';
 export declare const PinnedPluginListProvider: React.FC<{
-    items: any;
+    items: PinnedPluginListItems;
 }>;
 export declare const PinnedPluginList: React.MemoExoticComponent<(props: {
     onClick?: () => void;

package/es/plugin-manager/context.d.ts

@@ -6,7 +6,4 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-/// <reference types="react" />
-export declare const PinnedPluginListContext: import("react").Context<{
-    items: {};
-}>;
+export { getPinnedPluginListKeys, PinnedPluginListContext, type PinnedPluginListContextValue, type PinnedPluginListItem, type PinnedPluginListItems, } from '@nocobase/client-v2';

package/es/pm/AdminSettingsLayoutModel.d.ts

@@ -6,8 +6,6 @@
  * 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 { FlowModel } from '@nocobase/flow-engine';
-import React from 'react';
-export declare class AdminSettingsLayoutModel extends FlowModel {
-    render(): React.JSX.Element;
+import { AdminSettingsLayoutModel as BaseAdminSettingsLayoutModel } from '@nocobase/client-v2';
+export declare class AdminSettingsLayoutModel extends BaseAdminSettingsLayoutModel {
 }

package/es/{flow/components/placeholders/FieldPlaceholder.d.ts → route-switch/antd/admin-layout/AdminDynamicPage.d.ts}

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
-export declare function FieldPlaceholder(): React.JSX.Element;
+export declare const AdminDynamicPage: () => React.JSX.Element;

package/es/route-switch/antd/admin-layout/AdminLayoutCompat.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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 type { NavigateFunction } from 'react-router-dom';
+import { useNavigateNoUpdate, useRouterBasename } from '../../../application/CustomRouterContextProvider';
+import { appendQueryStringToUrl, reduceValueSize } from '../../../block-provider/hooks';
+import { withTooltipComponent } from '../../../hoc/withTooltipComponent';
+import { getFlowPageMenuSchema } from '../../../modules/menu/FlowPageMenuItem';
+import { getPageMenuSchema } from '../../../modules/menu/PageMenuItem';
+import { VariableScope } from '../../../variables/VariableScope';
+import { isVariable } from '../../../variables/utils/isVariable';
+import { ParentRouteContext } from '../../../schema-component/antd/menu/Menu';
+import { NocoBaseRouteContext } from './route-runtime';
+import { findFirstPageRoute } from './route-utils';
+export { appendQueryStringToUrl, getFlowPageMenuSchema, getPageMenuSchema, isVariable, NocoBaseRouteContext, ParentRouteContext, reduceValueSize, useNavigateNoUpdate, useRouterBasename, VariableScope, withTooltipComponent, findFirstPageRoute, };
+/**
+ * 兼容 v2 菜单副本里保留的两参调用签名。
+ */
+export declare const useEvaluatedExpression: (expression: string, _context?: unknown) => string | number;
+/**
+ * 补全站内 URL。
+ */
+export declare function completeURL(url: string, origin?: string): string;
+/**
+ * 在当前窗口内跳转链接。
+ */
+export declare function navigateWithinSelf(link: string, navigate: NavigateFunction, basePath?: string): void;

package/es/route-switch/antd/admin-layout/AdminLayoutComponentV1.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 React from 'react';
+import { AdminLayoutMenuItemModel } from './AdminLayoutMenuModels';
+/**
+ * @internal 供单测覆盖当前激活分支的 legacy 恢复递归逻辑。
+ */
+export declare const hydrateLegacyActiveMenuPersistedStateForTest: (items: AdminLayoutMenuItemModel[] | undefined, pathname: string, basename?: string) => Promise<boolean>;
+export declare const AdminLayoutComponent: React.MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;

package/es/route-switch/antd/admin-layout/AdminLayoutMenuFlowUtils.d.ts

@@ -0,0 +1,107 @@
+/**
+ * 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 type { FlowSettingsContext } from '@nocobase/flow-engine';
+import { AdminLayoutMenuCreationMeta, AdminLayoutMenuCreationParams, AdminLayoutMenuCreationType, AdminLayoutMenuInsertPosition, getAdminLayoutMenuMovePositionOptions } from './AdminLayoutMenuUtils';
+import { type NocoBaseDesktopRoute } from './route-types';
+declare const buildLinkSettingSchema: (t: (title: any) => any) => {
+    href: {
+        title: any;
+        type: string;
+        'x-decorator': string;
+        'x-component': string;
+        'x-component-props': {
+            rows: number;
+            maxRows: number;
+        };
+        description: any;
+    };
+    params: {
+        type: string;
+        title: any;
+        'x-component': string;
+        'x-decorator': string;
+        items: {
+            type: string;
+            properties: {
+                space: {
+                    type: string;
+                    'x-component': string;
+                    properties: {
+                        name: {
+                            type: string;
+                            'x-decorator': string;
+                            'x-component': string;
+                            'x-component-props': {
+                                placeholder: any;
+                            };
+                        };
+                        value: {
+                            type: string;
+                            'x-decorator': string;
+                            'x-component': string;
+                            'x-component-props': {
+                                placeholder: any;
+                                rows: number;
+                                maxRows: number;
+                                useTypedConstant: boolean;
+                                changeOnSelect: boolean;
+                            };
+                        };
+                        remove: {
+                            type: string;
+                            'x-decorator': string;
+                            'x-component': string;
+                        };
+                    };
+                };
+            };
+        };
+        properties: {
+            add: {
+                type: string;
+                title: any;
+                'x-component': string;
+            };
+        };
+    };
+    openInNewWindow: {
+        type: string;
+        'x-content': any;
+        'x-decorator': string;
+        'x-component': string;
+    };
+};
+export declare const insertRouteSchema: (api: {
+    request: (options: any) => Promise<any>;
+}, schema: Record<string, any>) => Promise<void>;
+export declare const getMenuCreationDefaultParams: (meta: AdminLayoutMenuCreationMeta | undefined) => AdminLayoutMenuCreationParams;
+declare const MENU_TYPE_OPTIONS: Array<{
+    label: string;
+    value: AdminLayoutMenuCreationType;
+}>;
+export declare const buildMenuBasicSchema: (t: (title: any) => any) => Record<string, any>;
+export declare const getMenuEditDefaultParams: (route: NocoBaseDesktopRoute | undefined) => AdminLayoutMenuCreationParams;
+export declare const getMenuCreationUiSchema: (t: (title: any) => any, meta: AdminLayoutMenuCreationMeta | undefined) => Record<string, any>;
+export declare const createInsertMenuStep: (options: {
+    title: string;
+    insertPosition: AdminLayoutMenuInsertPosition;
+    hideInSettings?: (ctx: FlowSettingsContext<any>) => Promise<boolean>;
+    canCreate?: (route: NocoBaseDesktopRoute) => boolean;
+    resolveParentRoute: (ctx: FlowSettingsContext<any>, route: NocoBaseDesktopRoute) => NocoBaseDesktopRoute | undefined;
+}) => Record<string, any>;
+export declare const toTreeSelectItems: (routes: NocoBaseDesktopRoute[], ctx: Pick<FlowSettingsContext<any>, 'resolveJsonTemplate' | 't'>) => any;
+export declare const findPrevSiblingRoute: (routes: NocoBaseDesktopRoute[], currentRoute: NocoBaseDesktopRoute | undefined) => any;
+export declare const findNextSiblingRoute: (routes: NocoBaseDesktopRoute[], currentRoute: NocoBaseDesktopRoute | undefined) => any;
+export declare const matchesRoutePath: (route: NocoBaseDesktopRoute | undefined, pathname: string, basename?: string) => boolean;
+export declare const buildInsertRouteSchema: (menuType: AdminLayoutMenuCreationType, pageSchemaUid: string, tabSchemaUid: string, tabSchemaName: string) => {
+    type: string;
+    'x-component': string;
+    'x-uid': any;
+};
+export { getAdminLayoutMenuMovePositionOptions, MENU_TYPE_OPTIONS, buildLinkSettingSchema };

package/es/route-switch/antd/admin-layout/AdminLayoutMenuModels.d.ts

@@ -0,0 +1,64 @@
+/**
+ * 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 React from 'react';
+import { FlowModel } from '@nocobase/flow-engine';
+import { AdminLayoutMenuCreationMeta, AdminLayoutMenuCreationParams, AdminLayoutMenuInsertPosition, AdminLayoutMenuItemStructure, AdminLayoutMenuNode, AdminLayoutMenuRouteOptions } from './AdminLayoutMenuUtils';
+import { type NocoBaseDesktopRoute } from './route-types';
+export * from './AdminLayoutMenuUtils';
+export { insertRouteSchema } from './AdminLayoutMenuFlowUtils';
+export declare class AdminLayoutMenuItemModel extends FlowModel<AdminLayoutMenuItemStructure> {
+    private creationPersisted;
+    private persistedStateHydrated;
+    private persistedStateHydrating?;
+    onInit(options: any): void;
+    syncFromRoute(route: NocoBaseDesktopRoute, parentRoute?: NocoBaseDesktopRoute): void;
+    getRoute(): NocoBaseDesktopRoute;
+    getParentRoute(): NocoBaseDesktopRoute;
+    getCreationMeta(): AdminLayoutMenuCreationMeta;
+    isCreationSession(): boolean;
+    shouldHydratePersistedState(): boolean;
+    hydrateLegacyPersistedStateIfCurrentPath(pathname: string, basename?: string): Promise<boolean>;
+    openFlowSettings(options?: Parameters<FlowModel['openFlowSettings']>[0]): Promise<boolean>;
+    getRouteRepository(): any;
+    hasPersistedMenuInstanceFlowFlag(route?: NocoBaseDesktopRoute): boolean;
+    getCurrentPersistedInstanceFlowCount(): number;
+    buildRouteOptionsWithPersistedFlowFlag(hasPersistedMenuInstanceFlow: boolean): {
+        [x: string]: any;
+        hasPersistedMenuInstanceFlow?: boolean;
+    };
+    syncPersistedFlowRouteFlag(): Promise<void>;
+    destroyPersistedState(): Promise<void>;
+    /**
+     * 按固定 uid 从 flowModels 仓库恢复实例级事件流与步骤参数。
+     *
+     * @returns {Promise<void>} 恢复完成
+     */
+    hydratePersistedState(): Promise<void>;
+    /**
+     * 判断当前菜单模型是否存在需要通过 flowModels 持久化的实例事件流。
+     *
+     * @returns {boolean} 是否需要走 FlowModel 默认保存链路
+     */
+    hasPersistableInstanceFlows(): boolean;
+    insertRouteSchema(schema: Record<string, any>): Promise<void>;
+    createMenuRoute(route: NocoBaseDesktopRoute, options?: {
+        parentId?: string | number;
+        refreshAfterMutation?: boolean;
+    }): Promise<any>;
+    createRouteForInsert(route: NocoBaseDesktopRoute, insertPosition: AdminLayoutMenuInsertPosition, targetRoute?: NocoBaseDesktopRoute): Promise<any>;
+    createMenuFromMeta(meta: AdminLayoutMenuCreationMeta, values: AdminLayoutMenuCreationParams): Promise<void>;
+    persistMenuCreation(values: AdminLayoutMenuCreationParams): Promise<void>;
+    updateMenuRoute(values: Partial<NocoBaseDesktopRoute>): Promise<void>;
+    moveMenuRoute(target: string, position: 'beforeBegin' | 'afterEnd' | 'beforeEnd'): Promise<void>;
+    saveStepParams(): Promise<boolean>;
+    save(): Promise<boolean>;
+    destroy(): Promise<boolean>;
+    toProLayoutRoute(options: AdminLayoutMenuRouteOptions): AdminLayoutMenuNode | null;
+    render(): React.JSX.Element;
+}

package/es/route-switch/antd/admin-layout/AdminLayoutMenuUtils.d.ts

@@ -0,0 +1,164 @@
+/**
+ * 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 { FlowModel } from '@nocobase/flow-engine';
+import React, { FC } from 'react';
+import { type NavigateFunction } from 'react-router-dom';
+import type { AdminLayoutMenuItemModel } from './AdminLayoutMenuModels';
+import { type NocoBaseDesktopRoute } from './route-types';
+export type AdminLayoutMenuRenderType = 'item' | 'group';
+export type AdminLayoutMenuRenderOptions = {
+    isMobile?: boolean;
+    collapsed?: boolean;
+    menuRenderType?: string;
+};
+export type AdminLayoutMenuNode = {
+    key?: string;
+    name: React.ReactNode;
+    icon?: React.ReactNode;
+    path: string;
+    redirect?: string;
+    hideInMenu?: boolean;
+    disabled?: boolean;
+    _route: any;
+    _parentRoute?: NocoBaseDesktopRoute;
+    _depth?: number;
+    _model?: AdminLayoutMenuItemModel;
+    _launcherModel?: FlowModel;
+    routes?: AdminLayoutMenuNode[];
+};
+export type AdminLayoutMenuRouteOptions = {
+    designable: boolean;
+    isMobile: boolean;
+    t: (title: any) => any;
+    depth?: number;
+};
+export type AdminLayoutMenuMovePositionOption = {
+    label: any;
+    value: 'beforeBegin' | 'afterEnd' | 'beforeEnd';
+    disabled?: boolean;
+};
+export type AdminLayoutMenuInsertPosition = 'beforeBegin' | 'afterEnd' | 'beforeEnd';
+export type AdminLayoutMenuCreationType = 'group' | 'page' | 'flowPage' | 'link';
+export type AdminLayoutMenuCreationSource = 'header' | 'sider' | 'insert';
+export type AdminLayoutMenuCreationMeta = {
+    menuType: AdminLayoutMenuCreationType;
+    source: AdminLayoutMenuCreationSource;
+    insertPosition?: AdminLayoutMenuInsertPosition;
+    targetRoute?: NocoBaseDesktopRoute;
+    parentRoute?: NocoBaseDesktopRoute;
+};
+export type AdminLayoutMenuCreationParams = {
+    menuType?: AdminLayoutMenuCreationType;
+    title?: string;
+    icon?: string;
+    href?: string;
+    params?: any[];
+    openInNewWindow?: boolean;
+};
+export type AdminLayoutMenuItemStructure = {
+    subModels: {
+        menuItems?: AdminLayoutMenuItemModel[];
+    };
+};
+type AdminLayoutMenuItemsParent = FlowModel & {
+    subModels: {
+        menuItems?: AdminLayoutMenuItemModel[];
+    };
+};
+/**
+ * 为不会直接参与站内路由跳转的菜单节点生成稳定且唯一的占位路径。
+ * 这些节点仍会被 ProLayout/rc-menu 当成菜单 key 使用，因此不能复用 '/'。
+ * @param type 占位路径类型
+ * @param identity 节点身份
+ * @returns 唯一占位路径
+ */
+export declare const getAdminLayoutMenuVirtualPath: (type: 'link' | 'designer', identity: string | number) => string;
+/**
+ * 仅在模板表达式内部兼容历史菜单变量写法，避免误改普通文本。
+ * @param template 原始模板字符串
+ * @returns 归一化后的模板字符串
+ */
+export declare const normalizeAdminLayoutMenuLegacyVariables: (template: string) => string;
+/**
+ * 使用 FlowContext 解析 admin-layout link 菜单的 URL 和查询参数。
+ * @param options 解析所需参数
+ * @returns 最终可跳转的 URL
+ */
+export declare const resolveAdminLayoutMenuLink: (options: {
+    context: FlowModel['context'];
+    href: string;
+    params?: Array<{
+        name: string;
+        value: any;
+    }>;
+}) => Promise<string>;
+export declare const openAdminLayoutMenuLink: (options: {
+    context: FlowModel['context'];
+    href: string;
+    params?: any[];
+    openInNewWindow?: boolean;
+    isMobile?: boolean;
+    closeMobileMenu: () => void;
+    navigate: NavigateFunction;
+    basenameOfCurrentRouter: string;
+}) => Promise<void>;
+export declare const MobileMenuControlContext: React.Context<{
+    closeMobileMenu: () => void;
+}>;
+export declare const HeaderContext: React.Context<{
+    inHeader: boolean;
+}>;
+/**
+ * 根据当前选中的目标菜单，生成可用的 Move to 位置选项。
+ */
+export declare const getAdminLayoutMenuMovePositionOptions: (target: string | undefined, currentRouteId: string | number | undefined, t: (title: any) => any) => AdminLayoutMenuMovePositionOption[];
+export declare function reconcileAdminLayoutMenuItems(parent: AdminLayoutMenuItemsParent, routes: NocoBaseDesktopRoute[], parentRoute?: NocoBaseDesktopRoute): void;
+type AdminLayoutMenuDragMoveOptions = {
+    sourceId: string | number;
+    targetId?: string | number;
+    targetScope?: {
+        parentId: string | number;
+    };
+    sortField: 'sort';
+    method?: 'insertAfter' | 'prepend';
+};
+export declare function resolveAdminLayoutMenuDragMoveOptions(activeModel?: FlowModel, overModel?: FlowModel): AdminLayoutMenuDragMoveOptions | undefined;
+export declare function resolveAdminLayoutMenuDragMoveOptionsFromEvent(flowEngine: {
+    getModel: (uid: string) => FlowModel | undefined;
+}, event: {
+    active?: {
+        id?: string | number;
+    };
+    over?: {
+        id?: string | number;
+    } | null;
+}): AdminLayoutMenuDragMoveOptions | undefined;
+export declare const AdminLayoutMenuItemRenderer: FC<{
+    item: AdminLayoutMenuNode;
+    dom: React.ReactNode;
+    options?: AdminLayoutMenuRenderOptions;
+    renderType: AdminLayoutMenuRenderType;
+}>;
+export declare const shouldRenderIconInTitle: ({ depth, isMobile }: {
+    depth: number;
+    isMobile: boolean;
+}) => boolean;
+export declare const AdminLayoutMenuModelRenderer: FC<{
+    model: FlowModel;
+    item: AdminLayoutMenuNode;
+    dom: React.ReactNode;
+    renderType: AdminLayoutMenuRenderType;
+    options?: AdminLayoutMenuRenderOptions;
+}>;
+export declare function getAdminLayoutMenuInitializerButton(testId: string, launcherModel: FlowModel, parentRoute?: NocoBaseDesktopRoute): AdminLayoutMenuNode;
+export declare const buildMenuTitleWithIcon: (route: NocoBaseDesktopRoute, t: (title: any) => any, showIconInTitle: boolean) => {
+    name: any;
+    icon: React.JSX.Element;
+};
+export {};

package/es/route-switch/antd/admin-layout/AdminLayoutModel.d.ts

@@ -6,22 +6,28 @@
  * 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 { FlowModel } from '@nocobase/flow-engine';
 import React from 'react';
-import { type RoutePageMeta } from './AdminLayoutRouteCoordinator';
-export declare class AdminLayoutModel extends FlowModel {
-    private routeCoordinator?;
-    private routeDisposer?;
-    private activePageUid;
-    private layoutContentElement;
-    private routePageMetaMap;
-    private getCoordinator;
-    private getCurrentRouteByActivePage;
-    registerRoutePage(pageUid: string, meta: RoutePageMeta): FlowModel<import("@nocobase/flow-engine").DefaultStructure>;
-    updateRoutePage(pageUid: string, meta: Partial<RoutePageMeta>): void;
-    unregisterRoutePage(pageUid: string): void;
-    setLayoutContentElement(element: HTMLElement | null): void;
-    protected onMount(): void;
-    protected onUnmount(): void;
+import { AdminLayoutModel, getAdminLayoutModel } from '@nocobase/client-v2';
+import { type NocoBaseDesktopRoute } from './route-types';
+import { type AdminLayoutMenuRouteOptions } from './AdminLayoutMenuUtils';
+/**
+ * 兼容旧 route-switch 入口的 Admin Layout 渲染包装类。
+ *
+ * 该类仅保留 v1 入口所需的 render 能力，
+ * 运行时状态和生命周期全部复用 flow 侧基类。
+ *
+ * @example
+ * ```typescript
+ * const model = flowEngine.getModel<AdminLayoutModelV1>('admin-layout-model');
+ * return model?.render();
+ * ```
+ */
+export declare class AdminLayoutModelV1 extends AdminLayoutModel {
+    syncMenuRoutes(routes: NocoBaseDesktopRoute[]): void;
+    toProLayoutRoute(options: Omit<AdminLayoutMenuRouteOptions, 'depth'>): {
+        path: string;
+        children: any[];
+    };
     render(): React.JSX.Element;
 }
+export { getAdminLayoutModel };

package/es/{application/components/AppComponent.d.ts → route-switch/antd/admin-layout/AdminShellProvider.d.ts}

@@ -6,9 +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.
  */
-import { FC } from 'react';
-import type { Application } from '../Application';
-export interface AppComponentProps {
-    app: Application;
-}
-export declare const AppComponent: FC<AppComponentProps>;
+import React, { FC } from 'react';
+export declare const NavigateToDefaultPage: FC;
+export declare const LegacyRouteCompat: FC;
+export declare const AdminShellProvider: (props: any) => React.JSX.Element;

package/es/{flow/components/drag-drop/Sortable.d.ts → route-switch/antd/admin-layout/ResetThemeTokenAndKeepAlgorithm.d.ts}

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { FC } from 'react';
-export declare const Sortable: FC<{
-    targetModelKey: string;
-}>;
+/**
+ * 重置主题，避免被 ProLayout 的主题影响，同时保留当前算法配置。
+ */
+export declare const ResetThemeTokenAndKeepAlgorithm: FC<any>;

package/es/route-switch/antd/admin-layout/index.d.ts

@@ -6,37 +6,22 @@
  * 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 React, { FC } from 'react';
+import { LayoutContent, useMobileLayout } from '@nocobase/client-v2';
+import React from 'react';
 import { Plugin } from '../../../application/Plugin';
-import { KeepAlive, useKeepAlive } from './KeepAlive';
-import { NocoBaseDesktopRoute, NocoBaseDesktopRouteType } from './convertRoutesToSchema';
+import { shouldRenderIconInTitle } from './AdminLayoutMenuUtils';
 export * from './useDeleteRouteSchema';
-export { KeepAlive, NocoBaseDesktopRouteType, useKeepAlive };
-export declare const NocoBaseRouteContext: React.Context<NocoBaseDesktopRoute>;
-export declare const CurrentRouteProvider: FC<{
-    uid: string;
-}>;
-export declare const useCurrentRoute: () => NocoBaseDesktopRoute;
-export declare const useAllAccessDesktopRoutes: () => {
-    allAccessRoutes: NocoBaseDesktopRoute[];
-    refresh: () => void;
-};
-export declare const AdminDynamicPage: () => React.JSX.Element;
-export declare const LayoutContent: () => React.JSX.Element;
-export declare const useMobileLayout: () => {
-    isMobileLayout: boolean;
-    setIsMobileLayout: React.Dispatch<React.SetStateAction<boolean>>;
-};
-export declare const InternalAdminLayout: (props: any) => React.JSX.Element;
-export declare const AdminProvider: (props: any) => React.JSX.Element;
+export { AdminDynamicPage } from './AdminDynamicPage';
+export { AdminLayoutMenuItemModel } from './AdminLayoutMenuModels';
+export { KeepAlive, useKeepAlive } from './KeepAlive';
+export { LayoutContent };
+export { NocoBaseDesktopRouteType } from './route-types';
+export { NocoBaseRouteContext, CurrentRouteProvider, useCurrentRoute, useAllAccessDesktopRoutes, } from './route-runtime';
+export { findFirstPageRoute, findRouteBySchemaUid } from './route-utils';
+export { AdminShellProvider as AdminProvider } from './AdminShellProvider';
+export { shouldRenderIconInTitle, useMobileLayout };
 export declare const AdminLayout: (props: any) => React.JSX.Element;
 export declare class AdminLayoutPlugin extends Plugin {
     afterAdd(): Promise<void>;
     load(): Promise<void>;
 }
-export declare function findRouteBySchemaUid(schemaUid: string, treeArray: any[]): any;
-export declare const shouldRenderIconInTitle: ({ depth, isMobile }: {
-    depth: number;
-    isMobile: boolean;
-}) => boolean;
-export declare function findFirstPageRoute(routes: NocoBaseDesktopRoute[]): any;

package/es/route-switch/antd/admin-layout/route-runtime.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 React, { FC } from 'react';
+import { NocoBaseDesktopRoute } from './route-types';
+export declare const NocoBaseRouteContext: React.Context<NocoBaseDesktopRoute>;
+export declare const CurrentRouteProvider: FC<{
+    uid: string;
+}>;
+export declare const useCurrentRoute: () => NocoBaseDesktopRoute;
+export declare const useAllAccessDesktopRoutes: () => {
+    allAccessRoutes: NocoBaseDesktopRoute[];
+    refresh: () => Promise<NocoBaseDesktopRoute[]>;
+};
+export declare const RoutesRequestProvider: FC;

package/es/route-switch/antd/admin-layout/{convertRoutesToSchema.d.ts → route-types.d.ts}

@@ -14,6 +14,10 @@ export declare enum NocoBaseDesktopRouteType {
     tabs = "tabs",
     flowPage = "flowPage"
 }
+export interface NocoBaseDesktopRouteOptions {
+    hasPersistedMenuInstanceFlow?: boolean;
+    [key: string]: any;
+}
 /**
  * 尽量与移动端的结构保持一致
  */
@@ -34,7 +38,7 @@ export interface NocoBaseDesktopRoute {
      */
     pageSchemaUid?: string;
     type?: NocoBaseDesktopRouteType;
-    options?: any;
+    options?: NocoBaseDesktopRouteOptions;
     sort?: number;
     hideInMenu?: boolean;
     enableTabs?: boolean;

package/es/route-switch/antd/admin-layout/route-utils.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { NocoBaseDesktopRoute } from './route-types';
+export declare function findRouteBySchemaUid(schemaUid: string, treeArray: NocoBaseDesktopRoute[]): any;
+export declare function findRouteById(id: string, treeArray: NocoBaseDesktopRoute[]): any;
+export declare function findFirstPageRoute(routes: NocoBaseDesktopRoute[]): any;
+export declare function isGroup(groupId: string, allAccessRoutes: NocoBaseDesktopRoute[]): boolean;

package/es/schema-component/antd/__builtins__/hooks/useToken.d.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { theme } from 'antd';
-import { CustomToken } from '../../../../global-theme';
+import type { CustomToken } from '@nocobase/client-v2';
 interface Result extends ReturnType<typeof theme.useToken> {
     token: CustomToken;
 }

package/es/schema-component/antd/__builtins__/style.d.ts

@@ -9,7 +9,7 @@
 import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
 import { useStyleRegister } from '@ant-design/cssinjs';
 import type { ComponentTokenMap, GlobalToken } from 'antd/es/theme/interface';
-import { CustomToken } from '../../../global-theme';
+import type { CustomToken } from '@nocobase/client-v2';
 export type OverrideComponent = keyof ComponentTokenMap | string;
 export interface StyleInfo {
     hashId: string;