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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (121) hide show
  1. package/es/PluginSettingsManager.d.ts +33 -0
  2. package/es/RouteRepository.d.ts +21 -6
  3. package/es/components/form/JsonTextArea.d.ts +2 -1
  4. package/es/components/form/VariableJsonTextArea.d.ts +19 -0
  5. package/es/components/form/index.d.ts +1 -0
  6. package/es/components/index.d.ts +1 -0
  7. package/es/flow/admin-shell/admin-layout/AdminLayoutEntryGuard.d.ts +2 -0
  8. package/es/flow/admin-shell/admin-layout/AdminLayoutMenuFlowUtils.d.ts +2 -1
  9. package/es/flow/admin-shell/admin-layout/AdminLayoutMenuModels.d.ts +2 -0
  10. package/es/flow/admin-shell/admin-layout/AdminLayoutMenuUtils.d.ts +3 -2
  11. package/es/flow/admin-shell/admin-layout/AdminLayoutSlotModels.d.ts +4 -0
  12. package/es/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.d.ts +6 -0
  13. package/es/flow/components/FieldAssignRulesEditor.d.ts +3 -1
  14. package/es/flow/models/base/GridModel.d.ts +1 -1
  15. package/es/flow/models/blocks/filter-form/FilterFormBlockModel.d.ts +5 -0
  16. package/es/flow/models/blocks/form/FormBlockModel.d.ts +4 -0
  17. package/es/flow/models/blocks/form/value-runtime/rules.d.ts +21 -0
  18. package/es/flow/models/blocks/form/value-runtime/runtime.d.ts +21 -0
  19. package/es/flow/models/blocks/form/value-runtime/types.d.ts +2 -2
  20. package/es/flow-compat/FieldValidation.d.ts +2 -1
  21. package/es/index.d.ts +2 -1
  22. package/es/index.mjs +145 -119
  23. package/lib/index.js +148 -122
  24. package/package.json +7 -7
  25. package/src/PluginSettingsManager.ts +53 -0
  26. package/src/RouteRepository.ts +126 -24
  27. package/src/__tests__/PluginSettingsManager.test.ts +13 -0
  28. package/src/__tests__/RouteRepository.test.ts +216 -0
  29. package/src/__tests__/exports.test.ts +16 -0
  30. package/src/__tests__/plugin-manager.test.tsx +44 -2
  31. package/src/__tests__/settings-center.test.tsx +40 -1
  32. package/src/components/form/JsonTextArea.tsx +21 -11
  33. package/src/components/form/VariableJsonTextArea.tsx +175 -0
  34. package/src/components/form/__tests__/JsonTextArea.test.tsx +43 -0
  35. package/src/components/form/__tests__/VariableJsonTextArea.test.tsx +86 -0
  36. package/src/components/form/index.tsx +1 -0
  37. package/src/components/index.ts +1 -0
  38. package/src/flow/__tests__/FlowRoute.test.tsx +443 -5
  39. package/src/flow/actions/__tests__/dataScopeFilter.test.ts +58 -0
  40. package/src/flow/actions/__tests__/fieldLinkageRules.scopeDepth.test.ts +150 -1
  41. package/src/flow/actions/__tests__/linkageAssignField.legacy.test.ts +135 -0
  42. package/src/flow/actions/__tests__/linkageRules.hiddenSync.restore.test.ts +19 -5
  43. package/src/flow/actions/__tests__/linkageRules.subFormSetFieldProps.test.ts +92 -0
  44. package/src/flow/actions/customVariable.tsx +1 -2
  45. package/src/flow/actions/dataScopeFilter.ts +10 -0
  46. package/src/flow/actions/linkageRules.tsx +122 -34
  47. package/src/flow/actions/runjs.tsx +2 -14
  48. package/src/flow/actions/validation.tsx +62 -30
  49. package/src/flow/admin-shell/admin-layout/AdminLayoutComponent.tsx +33 -10
  50. package/src/flow/admin-shell/admin-layout/AdminLayoutEntryGuard.test.tsx +310 -0
  51. package/src/flow/admin-shell/admin-layout/AdminLayoutEntryGuard.tsx +44 -8
  52. package/src/flow/admin-shell/admin-layout/AdminLayoutMenuFlowUtils.ts +5 -3
  53. package/src/flow/admin-shell/admin-layout/AdminLayoutMenuModels.tsx +61 -9
  54. package/src/flow/admin-shell/admin-layout/AdminLayoutMenuUtils.tsx +71 -8
  55. package/src/flow/admin-shell/admin-layout/AdminLayoutModel.tsx +1 -1
  56. package/src/flow/admin-shell/admin-layout/AdminLayoutSlotModels.tsx +21 -8
  57. package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutComponent.test.tsx +188 -0
  58. package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutMenuModels.test.ts +99 -0
  59. package/src/flow/admin-shell/admin-layout/__tests__/TopbarActionsBar.test.tsx +166 -2
  60. package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.test.ts +20 -0
  61. package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.ts +33 -5
  62. package/src/flow/components/DefaultValue.tsx +1 -2
  63. package/src/flow/components/FieldAssignRulesEditor.tsx +128 -21
  64. package/src/flow/components/FlowRoute.tsx +56 -11
  65. package/src/flow/components/__tests__/FieldAssignRulesEditor.test.tsx +508 -4
  66. package/src/flow/components/__tests__/fieldAssignOptions.test.ts +151 -3
  67. package/src/flow/components/code-editor/__tests__/useCodeRunner.test.tsx +2 -17
  68. package/src/flow/components/code-editor/hooks/useCodeRunner.ts +2 -14
  69. package/src/flow/components/code-editor/runjsDiagnostics.ts +8 -45
  70. package/src/flow/components/fieldAssignOptions.ts +155 -27
  71. package/src/flow/models/actions/JSActionModel.tsx +2 -7
  72. package/src/flow/models/actions/JSCollectionActionModel.tsx +2 -7
  73. package/src/flow/models/actions/JSItemActionModel.tsx +2 -7
  74. package/src/flow/models/actions/JSRecordActionModel.tsx +2 -7
  75. package/src/flow/models/base/ActionModel.tsx +12 -1
  76. package/src/flow/models/base/GridModel.tsx +38 -7
  77. package/src/flow/models/base/PageModel/PageModel.tsx +4 -1
  78. package/src/flow/models/base/PageModel/__tests__/PageModel.test.ts +28 -4
  79. package/src/flow/models/base/__tests__/ActionModel.test.ts +83 -0
  80. package/src/flow/models/base/__tests__/GridModel.dragSnapshotContainer.test.ts +239 -1
  81. package/src/flow/models/base/__tests__/transformRowsToSingleColumn.test.ts +48 -0
  82. package/src/flow/models/blocks/filter-form/FilterFormBlockModel.tsx +31 -3
  83. package/src/flow/models/blocks/filter-form/FilterFormJSActionModel.tsx +2 -7
  84. package/src/flow/models/blocks/filter-form/__tests__/defaultValues.wiring.test.ts +77 -0
  85. package/src/flow/models/blocks/form/EditFormModel.tsx +1 -0
  86. package/src/flow/models/blocks/form/FormBlockModel.tsx +7 -0
  87. package/src/flow/models/blocks/form/JSFormActionModel.tsx +2 -7
  88. package/src/flow/models/blocks/form/__tests__/FormBlockModel.test.tsx +17 -0
  89. package/src/flow/models/blocks/form/value-runtime/__tests__/runtime.test.ts +880 -102
  90. package/src/flow/models/blocks/form/value-runtime/rules.ts +445 -13
  91. package/src/flow/models/blocks/form/value-runtime/runtime.ts +257 -13
  92. package/src/flow/models/blocks/form/value-runtime/types.ts +2 -2
  93. package/src/flow/models/blocks/js-block/JSBlock.tsx +2 -7
  94. package/src/flow/models/blocks/table/JSColumnModel.tsx +1 -9
  95. package/src/flow/models/blocks/table/TableActionsColumnModel.tsx +1 -1
  96. package/src/flow/models/blocks/table/TableBlockModel.tsx +13 -3
  97. package/src/flow/models/blocks/table/__tests__/TableActionsColumnModel.test.tsx +54 -0
  98. package/src/flow/models/blocks/table/__tests__/TableBlockModel.mobileSettingsButtons.test.tsx +78 -0
  99. package/src/flow/models/fields/AssociationFieldModel/AssociationFieldModel.tsx +1 -1
  100. package/src/flow/models/fields/AssociationFieldModel/PopupSubTableFieldModel/PopupSubTableFieldModel.tsx +29 -6
  101. package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableField.tsx +13 -1
  102. package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/__tests__/SubTableFieldModel.reset.test.ts +180 -0
  103. package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/index.tsx +6 -4
  104. package/src/flow/models/fields/AssociationFieldModel/__tests__/AssociationFieldModel.updateAssociation.test.ts +72 -0
  105. package/src/flow/models/fields/InputFieldModel.tsx +14 -22
  106. package/src/flow/models/fields/JSEditableFieldModel.tsx +2 -11
  107. package/src/flow/models/fields/JSFieldModel.tsx +2 -7
  108. package/src/flow/models/fields/JSItemModel.tsx +2 -14
  109. package/src/flow/models/fields/__tests__/InputFieldModel.test.tsx +17 -0
  110. package/src/flow/models/topbar/TopbarActionModel.tsx +93 -10
  111. package/src/flow-compat/FieldValidation.tsx +122 -60
  112. package/src/flow-compat/Popover.tsx +43 -4
  113. package/src/flow-compat/__tests__/Popover.test.tsx +34 -0
  114. package/src/index.ts +8 -1
  115. package/src/layout-manager/__tests__/LayoutRoute.test.tsx +41 -1
  116. package/src/nocobase-buildin-plugin/index.tsx +0 -2
  117. package/src/settings-center/AdminSettingsLayout.tsx +3 -0
  118. package/src/settings-center/SystemSettingsPage.tsx +0 -1
  119. package/src/settings-center/plugin-manager/PluginCard.tsx +2 -2
  120. package/src/settings-center/plugin-manager/index.tsx +3 -0
  121. package/src/settings-center/utils.tsx +0 -6
@@ -86,6 +86,7 @@ interface InternalPageItemRecord extends PluginSettingsPageItemOptions {
86
86
  export declare class PluginSettingsManager<TApp extends BaseApplication<any> = BaseApplication<any>> {
87
87
  protected menus: Record<string, InternalMenuItemRecord>;
88
88
  protected pages: Record<string, InternalPageItemRecord>;
89
+ protected pluginSettingsLinks: Record<string, string>;
89
90
  protected aclSnippets: string[];
90
91
  app: TApp;
91
92
  private cachedList;
@@ -165,6 +166,38 @@ export declare class PluginSettingsManager<TApp extends BaseApplication<any> = B
165
166
  * @returns {boolean} 是否已注册
166
167
  */
167
168
  has(name: string): boolean;
169
+ /**
170
+ * 绑定插件管理列表中的 plugin name 到实际 settings 入口。
171
+ *
172
+ * 插件管理列表使用 applicationPlugins.name 判断是否显示 Settings 入口,
173
+ * 但部分插件会把设置页挂到共享菜单或历史路径下。
174
+ *
175
+ * @param pluginName 插件管理列表中的插件名
176
+ * @param settingsName menu 或 page 名称
177
+ * @returns {void}
178
+ */
179
+ setPluginSettingsLink(pluginName: string, settingsName: string): void;
180
+ /**
181
+ * 获取插件管理列表中的 plugin name 对应的 settings 名称。
182
+ *
183
+ * @param pluginName 插件管理列表中的插件名
184
+ * @returns {string} settings 名称
185
+ */
186
+ getPluginSettingsName(pluginName: string): string;
187
+ /**
188
+ * 判断插件管理列表中的插件是否有可跳转的 settings 入口。
189
+ *
190
+ * @param pluginName 插件管理列表中的插件名
191
+ * @returns {boolean} 是否已注册 settings 入口
192
+ */
193
+ hasPluginSettings(pluginName: string): boolean;
194
+ /**
195
+ * 获取插件管理列表中的插件对应的 settings 路径。
196
+ *
197
+ * @param pluginName 插件管理列表中的插件名
198
+ * @returns {string} settings 绝对路径
199
+ */
200
+ getPluginSettingsRoutePath(pluginName: string): string;
168
201
  /**
169
202
  * 获取单个 menu 或 page 的只读快照。
170
203
  *
@@ -11,6 +11,9 @@ import type { NocoBaseDesktopRoute } from './flow-compat';
11
11
  type RouteSubscriber = () => void;
12
12
  type RouteCreateValues = Partial<NocoBaseDesktopRoute>;
13
13
  type RouteUpdateValues = Partial<NocoBaseDesktopRoute>;
14
+ type RouteLayoutLike = {
15
+ uid?: unknown;
16
+ };
14
17
  type RouteMutationOptions = {
15
18
  refreshAfterMutation?: boolean;
16
19
  };
@@ -28,18 +31,22 @@ export declare class RouteRepository {
28
31
  api?: APIClient;
29
32
  };
30
33
  routes: NocoBaseDesktopRoute[];
31
- protected subscribers: Set<RouteSubscriber>;
32
- protected accessibleLoaded: boolean;
33
- protected accessibleLoadingPromise: Promise<NocoBaseDesktopRoute[]> | null;
34
+ protected subscribers: Map<RouteSubscriber, string>;
35
+ protected accessibleLoadingPromises: Map<string, Promise<NocoBaseDesktopRoute[]>>;
36
+ private layoutActivations;
37
+ private routeCaches;
38
+ private refreshRequestIds;
39
+ private notifiedLayoutUid;
34
40
  constructor(ctx: {
35
41
  api?: APIClient;
36
42
  });
43
+ activateLayout(layout?: RouteLayoutLike): () => void;
37
44
  /**
38
45
  * 同步当前可访问桌面路由,并通知订阅方刷新。
39
46
  *
40
47
  * @param routes 最新的桌面路由树
41
48
  */
42
- setRoutes(routes: NocoBaseDesktopRoute[]): void;
49
+ setRoutes(routes: NocoBaseDesktopRoute[], layoutUid?: string): void;
43
50
  /**
44
51
  * 读取当前缓存的桌面路由树。
45
52
  *
@@ -58,12 +65,13 @@ export declare class RouteRepository {
58
65
  * @returns 最新的路由数组
59
66
  */
60
67
  refreshAccessible(): Promise<any>;
68
+ private refreshAccessibleByLayout;
61
69
  /**
62
70
  * 确保当前用户可访问的桌面路由至少完成一次初始化加载。
63
71
  *
64
72
  * @returns 当前可访问的路由数组
65
73
  */
66
- ensureAccessibleLoaded(): Promise<NocoBaseDesktopRoute[]>;
74
+ ensureAccessibleLoaded(): Promise<any>;
67
75
  /**
68
76
  * 订阅路由缓存变化,用于驱动 React 上下文刷新。
69
77
  *
@@ -118,7 +126,14 @@ export declare class RouteRepository {
118
126
  getRouteBySchemaUid(schemaUid: string): NocoBaseDesktopRoute | undefined;
119
127
  protected getAPIClient(): APIClient;
120
128
  protected getResource(collectionName: string): import("@nocobase/sdk").IResource;
121
- protected emitChange(): void;
129
+ protected emitChange(layoutUid?: string): void;
130
+ private getCurrentLayoutUid;
131
+ private normalizeLayoutUid;
132
+ private getReadableLayoutUid;
133
+ private getRouteCache;
134
+ private syncRoutesProperty;
135
+ private nextRefreshRequestId;
136
+ private getRefreshRequestId;
122
137
  private findRoute;
123
138
  }
124
139
  export {};
@@ -7,6 +7,7 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
  import type { TextAreaProps } from 'antd/es/input';
10
+ import type { TextAreaRef } from 'antd/es/input/TextArea';
10
11
  import React from 'react';
11
12
  export interface JsonTextAreaProps extends Omit<TextAreaProps, 'value' | 'onChange'> {
12
13
  value?: unknown;
@@ -15,4 +16,4 @@ export interface JsonTextAreaProps extends Omit<TextAreaProps, 'value' | 'onChan
15
16
  json5?: boolean;
16
17
  showError?: boolean;
17
18
  }
18
- export declare const JsonTextArea: React.MemoExoticComponent<(props: JsonTextAreaProps) => React.JSX.Element>;
19
+ export declare const JsonTextArea: React.MemoExoticComponent<React.ForwardRefExoticComponent<JsonTextAreaProps & React.RefAttributes<TextAreaRef>>>;
@@ -0,0 +1,19 @@
1
+ /**
2
+ * This file is part of the NocoBase (R) project.
3
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
4
+ * Authors: NocoBase Team.
5
+ *
6
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
7
+ * For more information, please refer to: https://www.nocobase.com/agreement.
8
+ */
9
+ import { type MetaTreeNode } from '@nocobase/flow-engine';
10
+ import React from 'react';
11
+ import { type JsonTextAreaProps } from './JsonTextArea';
12
+ export interface VariableJsonTextAreaProps extends JsonTextAreaProps {
13
+ namespaces?: string[];
14
+ extraNodes?: MetaTreeNode[];
15
+ metaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
16
+ formatPathToValue?: (meta: MetaTreeNode) => string | undefined;
17
+ }
18
+ export declare const VariableJsonTextArea: React.MemoExoticComponent<(props: VariableJsonTextAreaProps) => React.JSX.Element>;
19
+ export declare const VariableJSON: React.MemoExoticComponent<(props: VariableJsonTextAreaProps) => React.JSX.Element>;
@@ -18,3 +18,4 @@ export * from './RemoteSelect';
18
18
  export * from './ScanInput';
19
19
  export * from './TypedVariableInput';
20
20
  export * from './VariableInput';
21
+ export * from './VariableJsonTextArea';
@@ -11,6 +11,7 @@ export * from './BlankComponent';
11
11
  export * from './form/table/dnd';
12
12
  export * from './form';
13
13
  export * from './Icon';
14
+ export * from './KeepAlive';
14
15
  export * from './PoweredBy';
15
16
  export * from './RouterContextCleaner';
16
17
  export * from './SwitchLanguage';
@@ -7,6 +7,8 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
  import React, { type FC } from 'react';
10
+ import type { AdminLayoutModel } from './AdminLayoutModel';
10
11
  export declare const AdminLayoutEntryGuard: FC<{
11
12
  children: React.ReactNode;
13
+ model?: AdminLayoutModel;
12
14
  }>;
@@ -9,6 +9,7 @@
9
9
  import type { FlowSettingsContext } from '@nocobase/flow-engine';
10
10
  import { type NocoBaseDesktopRoute } from '../../../flow-compat';
11
11
  import { AdminLayoutMenuCreationMeta, AdminLayoutMenuCreationParams, AdminLayoutMenuCreationType, AdminLayoutMenuInsertPosition, getAdminLayoutMenuMovePositionOptions } from './AdminLayoutMenuUtils';
12
+ import { type AdminLayoutRoutePathLike } from './resolveAdminRouteRuntimeTarget';
12
13
  declare const buildLinkSettingSchema: (t: (title: any) => any) => {
13
14
  href: {
14
15
  title: any;
@@ -99,7 +100,7 @@ export declare const createInsertMenuStep: (options: {
99
100
  export declare const toTreeSelectItems: (routes: NocoBaseDesktopRoute[], ctx: Pick<FlowSettingsContext<any>, 'resolveJsonTemplate' | 't'>) => any;
100
101
  export declare const findPrevSiblingRoute: (routes: NocoBaseDesktopRoute[], currentRoute: NocoBaseDesktopRoute | undefined) => any;
101
102
  export declare const findNextSiblingRoute: (routes: NocoBaseDesktopRoute[], currentRoute: NocoBaseDesktopRoute | undefined) => any;
102
- export declare const matchesRoutePath: (route: NocoBaseDesktopRoute | undefined, pathname: string, basename?: string) => boolean;
103
+ export declare const matchesRoutePath: (route: NocoBaseDesktopRoute | undefined, pathname: string, basename?: string, layout?: AdminLayoutRoutePathLike | null) => boolean;
103
104
  export declare const buildInsertRouteSchema: (menuType: AdminLayoutMenuCreationType, pageSchemaUid: string, tabSchemaUid: string, tabSchemaName: string) => {
104
105
  type: string;
105
106
  'x-component': string;
@@ -10,6 +10,7 @@ import React from 'react';
10
10
  import { FlowModel } from '@nocobase/flow-engine';
11
11
  import { type NocoBaseDesktopRoute } from '../../../flow-compat';
12
12
  import { AdminLayoutMenuCreationMeta, AdminLayoutMenuCreationParams, AdminLayoutMenuInsertPosition, AdminLayoutMenuItemStructure, AdminLayoutMenuNode, AdminLayoutMenuRouteOptions } from './AdminLayoutMenuUtils';
13
+ import { type AdminLayoutRoutePathLike } from './resolveAdminRouteRuntimeTarget';
13
14
  export * from './AdminLayoutMenuUtils';
14
15
  export declare class AdminLayoutMenuItemModel extends FlowModel<AdminLayoutMenuItemStructure> {
15
16
  private creationPersisted;
@@ -23,6 +24,7 @@ export declare class AdminLayoutMenuItemModel extends FlowModel<AdminLayoutMenuI
23
24
  isCreationSession(): boolean;
24
25
  shouldHydratePersistedState(): boolean;
25
26
  getRouteRepository(): any;
27
+ getLayout(): AdminLayoutRoutePathLike | undefined;
26
28
  hasPersistedMenuInstanceFlowFlag(route?: NocoBaseDesktopRoute): boolean;
27
29
  getCurrentPersistedInstanceFlowCount(): number;
28
30
  hasPersistableMenuLinkageRules(): boolean;
@@ -11,6 +11,7 @@ import React, { FC } from 'react';
11
11
  import { type NavigateFunction } from 'react-router-dom';
12
12
  import { type NocoBaseDesktopRoute } from '../../../flow-compat';
13
13
  import type { AdminLayoutMenuItemModel } from './AdminLayoutMenuModels';
14
+ import { type AdminLayoutRoutePathLike } from './resolveAdminRouteRuntimeTarget';
14
15
  export type AdminLayoutMenuRenderType = 'item' | 'group';
15
16
  export type AdminLayoutMenuRenderOptions = {
16
17
  isMobile?: boolean;
@@ -81,7 +82,7 @@ type AdminLayoutMenuItemsParent = FlowModel & {
81
82
  * @param identity 节点身份
82
83
  * @returns 唯一占位路径
83
84
  */
84
- export declare const getAdminLayoutMenuVirtualPath: (type: 'link' | 'designer', identity: string | number) => string;
85
+ export declare const getAdminLayoutMenuVirtualPath: (type: 'link' | 'designer', identity: string | number, layout?: AdminLayoutRoutePathLike | null) => string;
85
86
  /**
86
87
  * 仅在模板表达式内部兼容历史菜单变量写法,避免误改普通文本。
87
88
  * @param template 原始模板字符串
@@ -159,7 +160,7 @@ export declare const AdminLayoutMenuModelRenderer: FC<{
159
160
  renderType: AdminLayoutMenuRenderType;
160
161
  options?: AdminLayoutMenuRenderOptions;
161
162
  }>;
162
- export declare function getAdminLayoutMenuInitializerButton(testId: string, launcherModel: FlowModel, parentRoute?: NocoBaseDesktopRoute): AdminLayoutMenuNode;
163
+ export declare function getAdminLayoutMenuInitializerButton(testId: string, launcherModel: FlowModel, parentRoute?: NocoBaseDesktopRoute, layout?: AdminLayoutRoutePathLike | null): AdminLayoutMenuNode;
163
164
  export declare const buildMenuTitleWithIcon: (route: NocoBaseDesktopRoute, t: (title: any) => any, showIconInTitle: boolean) => {
164
165
  name: any;
165
166
  icon: React.JSX.Element;
@@ -7,8 +7,12 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
  import { FC } from 'react';
10
+ import { type AdminLayoutRoutePathLike } from './resolveAdminRouteRuntimeTarget';
10
11
  type AdminLayoutContentProps = {
11
12
  onContentElementChange?: (element: HTMLDivElement | null) => void;
13
+ layout?: (AdminLayoutRoutePathLike & {
14
+ routeName?: string;
15
+ }) | null;
12
16
  };
13
17
  /**
14
18
  * AdminLayout 内部使用的内容区容器。
@@ -8,6 +8,7 @@
8
8
  */
9
9
  import type { BaseApplication } from '../../../BaseApplication';
10
10
  import { type NocoBaseDesktopRoute } from '../../../flow-compat';
11
+ import type { LayoutDefinition } from '../../../layout-manager/types';
11
12
  export type AdminRouteNavigationMode = 'spa' | 'document';
12
13
  export type AdminRouteRuntimeTargetReason = 'ok' | 'missingSchemaUid' | 'unsupportedV2Runtime' | 'emptyGroup' | 'unsupportedRouteType';
13
14
  export type AdminRouteRuntimeTarget = {
@@ -21,6 +22,7 @@ type LocationLike = {
21
22
  search?: string;
22
23
  hash?: string;
23
24
  };
25
+ export type AdminLayoutRoutePathLike = Pick<LayoutDefinition, 'routePath'>;
24
26
  type ResolveAdminRouteRuntimeTargetOptions = {
25
27
  app: Pick<BaseApplication<any>, 'getPublicPath'> & {
26
28
  router?: {
@@ -28,10 +30,14 @@ type ResolveAdminRouteRuntimeTargetOptions = {
28
30
  };
29
31
  };
30
32
  route?: NocoBaseDesktopRoute;
33
+ layout?: AdminLayoutRoutePathLike;
31
34
  location?: LocationLike;
32
35
  preserveLocationState?: boolean;
33
36
  log?: (message?: any, ...optionalParams: any[]) => void;
34
37
  };
38
+ export declare const DEFAULT_ADMIN_LAYOUT_ROUTE_PATH = "/admin";
39
+ export declare function getAdminLayoutRoutePath(layout?: AdminLayoutRoutePathLike | null): string;
40
+ export declare function joinAdminLayoutRoutePath(layout: AdminLayoutRoutePathLike | null | undefined, pathname?: string | number | null): string;
35
41
  export declare function isV2AdminRuntime(app?: ResolveAdminRouteRuntimeTargetOptions['app']): boolean;
36
42
  export declare function toRouterNavigationPath(pathname: string, basename?: string): string;
37
43
  export declare function isV2MenuRoute(route: NocoBaseDesktopRoute | undefined): boolean;
@@ -10,7 +10,7 @@ import type { FilterGroupType } from '@nocobase/utils/client';
10
10
  import React from 'react';
11
11
  import { FieldAssignValueInput } from './FieldAssignValueInput';
12
12
  import { type FieldAssignCascaderOption } from './fieldAssignOptions';
13
- export type AssignMode = 'default' | 'assign';
13
+ export type AssignMode = 'default' | 'assign' | 'override';
14
14
  type CollectionFieldLike = {
15
15
  name?: unknown;
16
16
  title?: unknown;
@@ -53,6 +53,8 @@ export interface FieldAssignRulesEditorProps {
53
53
  defaultMode?: AssignMode;
54
54
  /** 固定 mode:用于“仅默认值/仅赋值”的场景 */
55
55
  fixedMode?: AssignMode;
56
+ /** 可选 mode 列表;fixedMode 优先级更高 */
57
+ allowedModes?: AssignMode[];
56
58
  /** 是否显示 condition */
57
59
  showCondition?: boolean;
58
60
  /** 是否显示 enable 开关 */
@@ -91,7 +91,7 @@ export declare class GridModel<T extends {
91
91
  /**
92
92
  * 将多列栅格 rows 转换为移动端单列 rows。
93
93
  * 遍历原 rows 的行与列顺序,把每个原列(过滤空白列后)变成一个新行(仅一列)。
94
- * 行 key 使用 uid() 生成,保持插入顺序即可。
94
+ * 行 key 使用原 rowId 与 columnIndex 生成,避免每次渲染产生随机 key 导致移动端滚动位置丢失。
95
95
  * @param rows 原始多列 rows
96
96
  * @returns 单列 rows
97
97
  */
@@ -24,6 +24,7 @@ export declare class FilterFormBlockModel extends FilterBlockModel<{
24
24
  private initialDefaultsPromise?;
25
25
  private initialRefreshHandledTargetIds;
26
26
  private lastDefaultValueByFieldName;
27
+ private userEditedFieldNames;
27
28
  private defaultValuesRefreshSeq;
28
29
  get form(): any;
29
30
  get title(): string;
@@ -39,6 +40,10 @@ export declare class FilterFormBlockModel extends FilterBlockModel<{
39
40
  markInitialTargetRefreshHandled(targetId: string): void;
40
41
  private ensureFilterItemsBeforeRender;
41
42
  private canApplyFormDefaultValue;
43
+ private canApplyFormOverrideValue;
44
+ private normalizeFieldValueMode;
45
+ private markFilterFormUserEditedFields;
46
+ private resetFilterFormUserEditedFields;
42
47
  private matchDefaultValueCondition;
43
48
  applyFormDefaultValues(options?: {
44
49
  force?: boolean;
@@ -51,6 +51,10 @@ export declare class FormBlockModel<T extends DefaultCollectionBlockModelStructu
51
51
  * @internal
52
52
  */
53
53
  resetUserModifiedFields(): void;
54
+ /**
55
+ * @internal
56
+ */
57
+ resetRuntimeUserEditedState(): void;
54
58
  onDispatchEventStart(eventName: string, options?: any, inputArgs?: Record<string, any>): Promise<void>;
55
59
  getStepParams(flowKey: string, stepKey: string): any | undefined;
56
60
  getStepParams(flowKey: string): Record<string, any> | undefined;
@@ -32,6 +32,7 @@ export type RuleEngineOptions = {
32
32
  getFormValueAtPath: (namePath: NamePath) => any;
33
33
  setFormValues: (callerCtx: any, patch: Patch, options?: SetOptions) => Promise<void>;
34
34
  findExplicitHit: (pathKey: string) => string | null;
35
+ findUserEditedHit: (pathKey: string) => string | null;
35
36
  lastDefaultValueByPathKey: Map<string, any>;
36
37
  lastWriteMetaByPathKey: Map<string, FormValueWriteMeta>;
37
38
  observableBindings: Map<string, ObservableBinding>;
@@ -122,6 +123,18 @@ export declare class RuleEngine {
122
123
  private resolveRunJSValue;
123
124
  private resolveTemplateValue;
124
125
  private commitRuleDeps;
126
+ private isScalarValueTarget;
127
+ private shouldSkipEmptyArrayAggregateForScalarTarget;
128
+ private normalizeUnresolvedToManyAggregateForScalarTarget;
129
+ private isArrayValueCollectionField;
130
+ private stringifyAggregateItem;
131
+ private normalizeAggregateArrayForScalarTarget;
132
+ private shouldSkipMultiValueAggregateForScalarTarget;
133
+ private getClearedAggregateValueForScalarTarget;
134
+ private isUserClearedToManyAggregate;
135
+ private isTextScalarTarget;
136
+ private getLatestWriteMetaForPath;
137
+ private getToManyAggregateSourceInfo;
125
138
  /**
126
139
  * Check if default rule value can be applied.
127
140
  * Default value can overwrite when:
@@ -130,6 +143,14 @@ export declare class RuleEngine {
130
143
  */
131
144
  private checkDefaultRuleCanApply;
132
145
  private createRuleEvaluationContext;
146
+ private getLocalFormValuesSnapshot;
147
+ private resolveLocalFormValuesPath;
148
+ private recordLocalFormValuesDep;
149
+ private extractSingleLocalFormValuesPath;
150
+ private stringifyTemplateReplacement;
151
+ private createLocalTemplateTokenStore;
152
+ private restoreLocalTemplateTokens;
153
+ private resolveLocalFormValuesTemplates;
133
154
  private buildItemChainValue;
134
155
  private getFieldIndexSignature;
135
156
  private updateRuleDeps;
@@ -17,6 +17,7 @@ export declare class FormValueRuntime {
17
17
  private readonly getForm;
18
18
  private readonly valuesMirror;
19
19
  private readonly explicitSet;
20
+ private readonly userEditedSet;
20
21
  private readonly lastDefaultValueByPathKey;
21
22
  private readonly lastWriteMetaByPathKey;
22
23
  private readonly observableBindings;
@@ -29,6 +30,8 @@ export declare class FormValueRuntime {
29
30
  private lastObservedSource;
30
31
  private lastObservedToken;
31
32
  private readonly formValuesProxy;
33
+ private readonly mountedFieldModelsByPathKey;
34
+ private readonly mountedFieldModelPathKeys;
32
35
  private mountedListener?;
33
36
  private unmountedListener?;
34
37
  private readonly formPatcher;
@@ -42,11 +45,14 @@ export declare class FormValueRuntime {
42
45
  *
43
46
  * - mode=default → source=default(遵循 explicit/空值覆盖语义)
44
47
  * - mode=assign → source=system(不受 explicit 影响,依赖变化时持续生效)
48
+ * - mode=override → source=override(首次覆盖已有值,用户修改后停止)
45
49
  */
46
50
  syncAssignRules(items: FormAssignRuleItem[]): void;
47
51
  get formValues(): any;
48
52
  getFormValuesSnapshot(): any;
53
+ private toMirrorSnapshot;
49
54
  canApplyDefaultValuePatch(namePath: NamePath, resolved: any): boolean;
55
+ canApplyOverrideValuePatch(namePath: NamePath): boolean;
50
56
  recordDefaultValuePatch(namePath: NamePath, value?: any): void;
51
57
  private getFormValueAtPath;
52
58
  mount(options?: {
@@ -54,6 +60,7 @@ export declare class FormValueRuntime {
54
60
  }): void;
55
61
  dispose(): void;
56
62
  resetAfterFormReset(): void;
63
+ resetUserEditedState(): void;
57
64
  isSuppressed(): boolean;
58
65
  handleFormFieldsChange(changedFields: Array<{
59
66
  name?: NamePath | string | number;
@@ -83,7 +90,19 @@ export declare class FormValueRuntime {
83
90
  private tryResolveNamePath;
84
91
  private bumpChangeTick;
85
92
  private emitFormValuesChange;
93
+ private syncMountedFieldModelValue;
94
+ private syncMountedFieldModelValueForModel;
95
+ private rebuildMountedFieldModelIndex;
96
+ private indexMountedFieldModelTree;
97
+ private unindexMountedFieldModelTree;
98
+ private visitModelAndForks;
99
+ private indexMountedFieldModel;
100
+ private unindexMountedFieldModel;
101
+ private isMountedModelInThisForm;
102
+ private getMountedModelNamePaths;
103
+ private normalizeNamePathValue;
86
104
  private markExplicit;
105
+ private markUserEdited;
87
106
  private normalizeObservedNamePath;
88
107
  private clearExplicitForDefaultPatch;
89
108
  private shouldPreserveDescendantDefaultsOnExplicit;
@@ -91,5 +110,7 @@ export declare class FormValueRuntime {
91
110
  private shouldKeepDefaultPathValueEnabled;
92
111
  private isExplicit;
93
112
  private findExplicitHit;
113
+ private findUserEditedHit;
114
+ private isDescendantPathKey;
94
115
  }
95
116
  export {};
@@ -7,7 +7,7 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
  export type NamePath = Array<string | number>;
10
- export type ValueSource = 'default' | 'linkage' | 'user' | 'system';
10
+ export type ValueSource = 'default' | 'linkage' | 'user' | 'system' | 'override';
11
11
  export type Patch = Record<string, any> | Array<{
12
12
  path: string | NamePath;
13
13
  value: any;
@@ -48,7 +48,7 @@ export interface FormValuesChangePayload {
48
48
  allValues?: any;
49
49
  allValuesSnapshot?: any;
50
50
  }
51
- export type AssignMode = 'default' | 'assign';
51
+ export type AssignMode = 'default' | 'assign' | 'override';
52
52
  export type FormAssignRuleItem = {
53
53
  key?: string;
54
54
  enable?: boolean;
@@ -8,7 +8,7 @@
8
8
  */
9
9
  import React from 'react';
10
10
  interface ValidationRule {
11
- key: string;
11
+ key?: string;
12
12
  name: string;
13
13
  args?: {
14
14
  [key: string]: any;
@@ -22,6 +22,7 @@ interface ValidationData {
22
22
  interface FieldValidationProps {
23
23
  value?: ValidationData;
24
24
  onChange?: (value: ValidationData) => void;
25
+ inheritedValue?: ValidationData;
25
26
  type?: string;
26
27
  availableValidationOptions?: string[];
27
28
  excludeValidationOptions?: string[];
package/es/index.d.ts CHANGED
@@ -37,5 +37,6 @@ export * from './collection-manager/interfaces';
37
37
  export * from './collection-manager/template-fields';
38
38
  export * from './data-source';
39
39
  export * from './flow';
40
- export { DEFAULT_DATA_SOURCE_KEY, isTitleField, isTitleFieldInterface } from './flow-compat';
40
+ export { DEFAULT_DATA_SOURCE_KEY, IconPicker, isTitleField, isTitleFieldInterface, NocoBaseDesktopRouteType, } from './flow-compat';
41
+ export type { NocoBaseDesktopRoute } from './flow-compat';
41
42
  export { default as AntdAppProvider } from './theme/AntdAppProvider';