@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
@@ -8,12 +8,20 @@
8
8
  */
9
9
 
10
10
  import React from 'react';
11
- import { render, screen } from '@testing-library/react';
11
+ import { fireEvent, render, screen } from '@testing-library/react';
12
+ import { MemoryRouter } from 'react-router-dom';
12
13
  import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
13
14
 
14
- const { allowMock, flowModelRendererSpy } = vi.hoisted(() => {
15
+ const { allowMock, appMock, flowModelRendererSpy } = vi.hoisted(() => {
15
16
  return {
16
17
  allowMock: vi.fn(),
18
+ appMock: {
19
+ current: {
20
+ router: {
21
+ getBasename: () => '/nocobase/v',
22
+ },
23
+ },
24
+ },
17
25
  flowModelRendererSpy: vi.fn(),
18
26
  };
19
27
  });
@@ -32,6 +40,12 @@ vi.mock('../HelpLite', () => {
32
40
  };
33
41
  });
34
42
 
43
+ vi.mock('../../../../hooks/useApp', () => {
44
+ return {
45
+ useApp: () => appMock.current,
46
+ };
47
+ });
48
+
35
49
  vi.mock('@nocobase/flow-engine', async (importOriginal) => {
36
50
  const actual = await importOriginal<typeof import('@nocobase/flow-engine')>();
37
51
  return {
@@ -63,10 +77,19 @@ const createAction = (options: Record<string, any>) => {
63
77
  } as any;
64
78
  };
65
79
 
80
+ const renderSettingsLabel = (label: React.ReactNode, pathname: string) => {
81
+ return render(<MemoryRouter initialEntries={[pathname]}>{label}</MemoryRouter>);
82
+ };
83
+
66
84
  describe('TopbarActionsBar helpers', () => {
67
85
  beforeEach(() => {
68
86
  allowMock.mockReset();
69
87
  flowModelRendererSpy.mockClear();
88
+ appMock.current = {
89
+ router: {
90
+ getBasename: () => '/nocobase/v',
91
+ },
92
+ };
70
93
  });
71
94
 
72
95
  afterEach(() => {
@@ -149,6 +172,147 @@ describe('TopbarActionsBar helpers', () => {
149
172
  });
150
173
  });
151
174
 
175
+ it('should open regular admin settings in a new tab outside admin runtime', () => {
176
+ const items = getTopbarPluginSettingsItems({
177
+ canManagePlugins: false,
178
+ t: (key) => key,
179
+ settings: [
180
+ {
181
+ key: 'system-settings',
182
+ name: 'system-settings',
183
+ title: 'System settings',
184
+ path: '/admin/settings/system-settings',
185
+ icon: null,
186
+ componentLoader: async () => null,
187
+ },
188
+ ] as any,
189
+ });
190
+
191
+ renderSettingsLabel((items as any[])[0].label, '/sales/p1');
192
+
193
+ const link = screen.getByRole('link', { name: 'System settings' });
194
+ expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
195
+ expect(link).toHaveAttribute('target', '_blank');
196
+ expect(link).toHaveAttribute('rel', expect.stringContaining('noopener'));
197
+ expect(link).toHaveAttribute('rel', expect.stringContaining('noreferrer'));
198
+ });
199
+
200
+ it('should open plugin manager in a new tab outside admin runtime', () => {
201
+ const items = getTopbarPluginSettingsItems({
202
+ canManagePlugins: true,
203
+ t: (key) => key,
204
+ settings: [
205
+ {
206
+ key: 'plugin-manager',
207
+ name: 'plugin-manager',
208
+ title: 'Plugin manager',
209
+ path: '/admin/settings/plugin-manager',
210
+ icon: null,
211
+ componentLoader: async () => null,
212
+ },
213
+ ] as any,
214
+ });
215
+
216
+ renderSettingsLabel((items as any[])[0].label, '/sales/p1');
217
+
218
+ const link = screen.getByRole('link', { name: 'Plugin manager' });
219
+ expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/plugin-manager');
220
+ expect(link).toHaveAttribute('target', '_blank');
221
+ expect(link).toHaveAttribute('rel', expect.stringContaining('noopener'));
222
+ expect(link).toHaveAttribute('rel', expect.stringContaining('noreferrer'));
223
+ });
224
+
225
+ it('should keep regular admin settings as SPA links inside admin runtime', () => {
226
+ const items = getTopbarPluginSettingsItems({
227
+ canManagePlugins: false,
228
+ t: (key) => key,
229
+ settings: [
230
+ {
231
+ key: 'routes',
232
+ name: 'routes',
233
+ title: 'Routes',
234
+ path: '/admin/settings/routes',
235
+ icon: null,
236
+ componentLoader: async () => null,
237
+ },
238
+ ] as any,
239
+ });
240
+
241
+ renderSettingsLabel((items as any[])[0].label, '/admin/settings/routes');
242
+
243
+ const link = screen.getByRole('link', { name: 'Routes' });
244
+ expect(link).toHaveAttribute('href', '/admin/settings/routes');
245
+ expect(link).not.toHaveAttribute('target', '_blank');
246
+ });
247
+
248
+ it('should not treat admin-like paths as admin runtime', () => {
249
+ const items = getTopbarPluginSettingsItems({
250
+ canManagePlugins: false,
251
+ t: (key) => key,
252
+ settings: [
253
+ {
254
+ key: 'system-settings',
255
+ name: 'system-settings',
256
+ title: 'System settings',
257
+ path: '/admin/settings/system-settings',
258
+ icon: null,
259
+ componentLoader: async () => null,
260
+ },
261
+ ] as any,
262
+ });
263
+
264
+ renderSettingsLabel((items as any[])[0].label, '/admin2/foo');
265
+
266
+ const link = screen.getByRole('link', { name: 'System settings' });
267
+ expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
268
+ expect(link).toHaveAttribute('target', '_blank');
269
+ });
270
+
271
+ it('should not duplicate the basename when building new-tab settings hrefs', () => {
272
+ const items = getTopbarPluginSettingsItems({
273
+ canManagePlugins: false,
274
+ t: (key) => key,
275
+ settings: [
276
+ {
277
+ key: 'system-settings',
278
+ name: 'system-settings',
279
+ title: 'System settings',
280
+ path: '/nocobase/v/admin/settings/system-settings',
281
+ icon: null,
282
+ componentLoader: async () => null,
283
+ },
284
+ ] as any,
285
+ });
286
+
287
+ renderSettingsLabel((items as any[])[0].label, '/sales/p1');
288
+
289
+ const link = screen.getByRole('link', { name: 'System settings' });
290
+ expect(link).toHaveAttribute('href', '/nocobase/v/admin/settings/system-settings');
291
+ });
292
+
293
+ it('should keep external settings opening in a new tab', () => {
294
+ const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
295
+ const items = getTopbarPluginSettingsItems({
296
+ canManagePlugins: false,
297
+ t: (key) => key,
298
+ settings: [
299
+ {
300
+ key: 'docs',
301
+ name: 'docs',
302
+ title: 'Docs',
303
+ link: 'https://www.nocobase.com/docs',
304
+ icon: null,
305
+ componentLoader: async () => null,
306
+ },
307
+ ] as any,
308
+ });
309
+
310
+ renderSettingsLabel((items as any[])[0].label, '/sales/p1');
311
+ fireEvent.click(screen.getByText('Docs'));
312
+
313
+ expect(openSpy).toHaveBeenCalledWith('https://www.nocobase.com/docs', '_blank', 'noopener,noreferrer');
314
+ });
315
+
152
316
  it('should return empty dropdown items when plugin manager and settings are both unavailable', () => {
153
317
  const items = getTopbarPluginSettingsItems({
154
318
  canManagePlugins: false,
@@ -52,6 +52,26 @@ describe('resolveAdminRouteRuntimeTarget', () => {
52
52
  });
53
53
  });
54
54
 
55
+ it('should resolve flowPage under a custom admin layout route path', () => {
56
+ expect(
57
+ resolveAdminRouteRuntimeTarget({
58
+ app,
59
+ layout: {
60
+ routePath: '/admin2',
61
+ },
62
+ route: {
63
+ type: NocoBaseDesktopRouteType.flowPage,
64
+ schemaUid: 'flow-page-1',
65
+ },
66
+ }),
67
+ ).toEqual({
68
+ runtimePath: '/nocobase/v2/admin2/flow-page-1',
69
+ navigationMode: 'spa',
70
+ isLegacy: false,
71
+ reason: 'ok',
72
+ });
73
+ });
74
+
55
75
  it('should mark page unsupported in v2 admin runtime', () => {
56
76
  expect(
57
77
  resolveAdminRouteRuntimeTarget({
@@ -10,6 +10,7 @@
10
10
  import { getModernClientPrefix, getV2EffectiveBasePath } from '../../../authRedirect';
11
11
  import type { BaseApplication } from '../../../BaseApplication';
12
12
  import { NocoBaseDesktopRouteType, type NocoBaseDesktopRoute } from '../../../flow-compat';
13
+ import type { LayoutDefinition } from '../../../layout-manager/types';
13
14
 
14
15
  export type AdminRouteNavigationMode = 'spa' | 'document';
15
16
  export type AdminRouteRuntimeTargetReason =
@@ -32,6 +33,8 @@ type LocationLike = {
32
33
  hash?: string;
33
34
  };
34
35
 
36
+ export type AdminLayoutRoutePathLike = Pick<LayoutDefinition, 'routePath'>;
37
+
35
38
  type ResolveAdminRouteRuntimeTargetOptions = {
36
39
  app: Pick<BaseApplication<any>, 'getPublicPath'> & {
37
40
  router?: {
@@ -39,12 +42,14 @@ type ResolveAdminRouteRuntimeTargetOptions = {
39
42
  };
40
43
  };
41
44
  route?: NocoBaseDesktopRoute;
45
+ layout?: AdminLayoutRoutePathLike;
42
46
  location?: LocationLike;
43
47
  preserveLocationState?: boolean;
44
48
  log?: (message?: any, ...optionalParams: any[]) => void;
45
49
  };
46
50
 
47
51
  const LOG_PREFIX = '[NocoBase] Admin route runtime target:';
52
+ export const DEFAULT_ADMIN_LAYOUT_ROUTE_PATH = '/admin';
48
53
 
49
54
  const EMPTY_TARGET: AdminRouteRuntimeTarget = {
50
55
  runtimePath: null,
@@ -61,6 +66,25 @@ function normalizeRootRelativePath(pathname: string) {
61
66
  return normalized;
62
67
  }
63
68
 
69
+ export function getAdminLayoutRoutePath(layout?: AdminLayoutRoutePathLike | null) {
70
+ const routePath = typeof layout?.routePath === 'string' ? layout.routePath.trim() : '';
71
+ return routePath.startsWith('/') ? normalizeRootRelativePath(routePath) : DEFAULT_ADMIN_LAYOUT_ROUTE_PATH;
72
+ }
73
+
74
+ export function joinAdminLayoutRoutePath(
75
+ layout: AdminLayoutRoutePathLike | null | undefined,
76
+ pathname?: string | number | null,
77
+ ) {
78
+ const layoutRoutePath = getAdminLayoutRoutePath(layout);
79
+ const routePath = pathname == null ? '' : String(pathname).replace(/^\/+/, '');
80
+
81
+ if (!routePath) {
82
+ return layoutRoutePath;
83
+ }
84
+
85
+ return normalizeRootRelativePath(`${layoutRoutePath}/${routePath}`);
86
+ }
87
+
64
88
  function normalizePublicPath(value = '/') {
65
89
  const normalized = normalizeRootRelativePath(value || '/');
66
90
  return normalized.endsWith('/') ? normalized : `${normalized}/`;
@@ -104,8 +128,12 @@ function joinRootRelativePath(basePath: string, pathname: string) {
104
128
  return normalizeRootRelativePath(`${normalizedBasePath}${normalizedPathname.slice(1)}`);
105
129
  }
106
130
 
107
- function getV2AdminPath(app: ResolveAdminRouteRuntimeTargetOptions['app'], schemaUid: string) {
108
- return joinRootRelativePath(getV2EffectiveBasePath(app), `/admin/${schemaUid}`);
131
+ function getV2AdminPath(
132
+ app: ResolveAdminRouteRuntimeTargetOptions['app'],
133
+ schemaUid: string,
134
+ layout?: AdminLayoutRoutePathLike,
135
+ ) {
136
+ return joinRootRelativePath(getV2EffectiveBasePath(app), joinAdminLayoutRoutePath(layout, schemaUid));
109
137
  }
110
138
 
111
139
  function appendLocationState(pathname: string, location?: LocationLike) {
@@ -212,7 +240,7 @@ function resolvePageRuntimeTarget(
212
240
 
213
241
  if (route.type === NocoBaseDesktopRouteType.flowPage) {
214
242
  return {
215
- runtimePath: getV2AdminPath(app, route.schemaUid),
243
+ runtimePath: getV2AdminPath(app, route.schemaUid, options.layout),
216
244
  navigationMode: 'spa' as const,
217
245
  isLegacy: false,
218
246
  reason: 'ok' as const,
@@ -229,8 +257,8 @@ function resolvePageRuntimeTarget(
229
257
  return {
230
258
  runtimePath:
231
259
  preserveLocationState && location
232
- ? appendLocationState(getV2AdminPath(app, route.schemaUid), location)
233
- : getV2AdminPath(app, route.schemaUid),
260
+ ? appendLocationState(getV2AdminPath(app, route.schemaUid, options.layout), location)
261
+ : getV2AdminPath(app, route.schemaUid, options.layout),
234
262
  navigationMode: 'spa' as const,
235
263
  isLegacy: false,
236
264
  reason: 'ok' as const,
@@ -18,7 +18,6 @@ import {
18
18
  parseValueToPath,
19
19
  isRunJSValue,
20
20
  normalizeRunJSValue,
21
- runjsWithSafeGlobals,
22
21
  useFlowContext,
23
22
  extractPropertyPath,
24
23
  FlowModel,
@@ -240,7 +239,7 @@ export const DefaultValue = connect((props: Props) => {
240
239
  if (isRunJSValue(out)) {
241
240
  try {
242
241
  const { code, version } = normalizeRunJSValue(out);
243
- const ret = await runjsWithSafeGlobals(model?.context, code, { version });
242
+ const ret = await model?.context?.runjs(code, undefined, { version });
244
243
  out = ret?.success ? ret.value : undefined;
245
244
  } catch {
246
245
  out = undefined;
@@ -28,7 +28,7 @@ import { buildFieldAssignCascaderOptionsFromCollection, type FieldAssignCascader
28
28
  import { isRunJSValue, isVariableExpression, type MetaTreeNode } from '@nocobase/flow-engine';
29
29
  import { isToManyAssociationField } from '../internal/utils/modelUtils';
30
30
 
31
- export type AssignMode = 'default' | 'assign';
31
+ export type AssignMode = 'default' | 'assign' | 'override';
32
32
 
33
33
  type CollectionFieldLike = {
34
34
  name?: unknown;
@@ -89,6 +89,8 @@ export interface FieldAssignRulesEditorProps {
89
89
  defaultMode?: AssignMode;
90
90
  /** 固定 mode:用于“仅默认值/仅赋值”的场景 */
91
91
  fixedMode?: AssignMode;
92
+ /** 可选 mode 列表;fixedMode 优先级更高 */
93
+ allowedModes?: AssignMode[];
92
94
  /** 是否显示 condition */
93
95
  showCondition?: boolean;
94
96
  /** 是否显示 enable 开关 */
@@ -109,6 +111,65 @@ export interface FieldAssignRulesEditorProps {
109
111
  maxAssociationFieldDepth?: number;
110
112
  }
111
113
 
114
+ const ALL_ASSIGN_MODES: AssignMode[] = ['default', 'override', 'assign'];
115
+
116
+ function cloneCascaderOption(option: FieldAssignCascaderOption): FieldAssignCascaderOption {
117
+ return {
118
+ ...option,
119
+ children: option.children?.map((child) => cloneCascaderOption(child)),
120
+ };
121
+ }
122
+
123
+ function mergeCascaderOptionInto(options: FieldAssignCascaderOption[], source: FieldAssignCascaderOption) {
124
+ const value = source?.value ? String(source.value) : '';
125
+ if (!value) return;
126
+
127
+ const existing = options.find((item) => String(item?.value || '') === value);
128
+ if (!existing) {
129
+ options.push(cloneCascaderOption(source));
130
+ return;
131
+ }
132
+
133
+ if (!existing.label && source.label) {
134
+ existing.label = source.label;
135
+ }
136
+ if (source.isLeaf === false || existing.children?.length || source.children?.length) {
137
+ existing.isLeaf = false;
138
+ }
139
+ if (source.loading) {
140
+ existing.loading = source.loading;
141
+ }
142
+ if (source.children?.length) {
143
+ existing.children = mergeCascaderOptions(existing.children || [], source.children);
144
+ }
145
+ }
146
+
147
+ function mergeCascaderOptions(
148
+ configured: FieldAssignCascaderOption[],
149
+ allFields: FieldAssignCascaderOption[],
150
+ ): FieldAssignCascaderOption[] {
151
+ const result = (Array.isArray(configured) ? configured : []).map((item) => cloneCascaderOption(item));
152
+ for (const item of Array.isArray(allFields) ? allFields : []) {
153
+ mergeCascaderOptionInto(result, item);
154
+ }
155
+ return result;
156
+ }
157
+
158
+ function isAssignMode(mode: unknown): mode is AssignMode {
159
+ return mode === 'default' || mode === 'override' || mode === 'assign';
160
+ }
161
+
162
+ function normalizeAssignModes(modes?: AssignMode[]): AssignMode[] {
163
+ const source = Array.isArray(modes) && modes.length ? modes : ALL_ASSIGN_MODES;
164
+ const out: AssignMode[] = [];
165
+ for (const mode of source) {
166
+ if (!isAssignMode(mode)) continue;
167
+ if (out.includes(mode)) continue;
168
+ out.push(mode);
169
+ }
170
+ return out.length ? out : ALL_ASSIGN_MODES;
171
+ }
172
+
112
173
  export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (props) => {
113
174
  const {
114
175
  t,
@@ -118,6 +179,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
118
179
  onChange,
119
180
  defaultMode = 'assign',
120
181
  fixedMode,
182
+ allowedModes: rawAllowedModes,
121
183
  showCondition = true,
122
184
  showEnable = true,
123
185
  showValueEditorWhenNoField = false,
@@ -129,13 +191,43 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
129
191
  } = props;
130
192
 
131
193
  const value = React.useMemo(() => (Array.isArray(rawValue) ? rawValue : []), [rawValue]);
194
+ const allowedModes = React.useMemo(
195
+ () => normalizeAssignModes(fixedMode ? [fixedMode] : rawAllowedModes),
196
+ [fixedMode, rawAllowedModes],
197
+ );
198
+ const getDefaultMode = React.useCallback((): AssignMode => {
199
+ if (fixedMode) return fixedMode;
200
+ if (isAssignMode(defaultMode) && allowedModes.includes(defaultMode)) return defaultMode;
201
+ return allowedModes[0] || 'assign';
202
+ }, [allowedModes, defaultMode, fixedMode]);
203
+ const normalizeItemMode = React.useCallback(
204
+ (item: FieldAssignRuleItem): FieldAssignRuleItem => {
205
+ const mode = isAssignMode(item?.mode) && allowedModes.includes(item.mode) ? item.mode : getDefaultMode();
206
+ return item?.mode === mode ? item : { ...item, mode };
207
+ },
208
+ [allowedModes, getDefaultMode],
209
+ );
210
+ const emitChange = React.useCallback(
211
+ (next: FieldAssignRuleItem[]) => {
212
+ onChange?.(next.map((item) => normalizeItemMode(item)));
213
+ },
214
+ [normalizeItemMode, onChange],
215
+ );
216
+
217
+ const normalizeFieldOptions = React.useCallback((options: FieldAssignRulesEditorProps['fieldOptions']) => {
218
+ return Array.isArray(options)
219
+ ? (options as FieldAssignCascaderOption[]).map((option) => cloneCascaderOption(option))
220
+ : [];
221
+ }, []);
132
222
  const [cascaderOptions, setCascaderOptions] = React.useState<FieldAssignCascaderOption[]>(() =>
133
- Array.isArray(fieldOptions) ? (fieldOptions as FieldAssignCascaderOption[]) : [],
223
+ normalizeFieldOptions(fieldOptions),
134
224
  );
225
+ const loadedCascaderOptionsRef = React.useRef<WeakSet<FieldAssignCascaderOption>>(new WeakSet());
135
226
 
136
227
  React.useEffect(() => {
137
- setCascaderOptions(Array.isArray(fieldOptions) ? (fieldOptions as FieldAssignCascaderOption[]) : []);
138
- }, [fieldOptions]);
228
+ loadedCascaderOptionsRef.current = new WeakSet();
229
+ setCascaderOptions(normalizeFieldOptions(fieldOptions));
230
+ }, [fieldOptions, normalizeFieldOptions, rootCollection, maxAssociationFieldDepth]);
139
231
 
140
232
  const getRuleKey = React.useCallback((item: FieldAssignRuleItem, index: number) => item?.key || String(index), []);
141
233
  const [titleFieldDraftMap, setTitleFieldDraftMap] = React.useState<Record<string, string | undefined>>({});
@@ -312,7 +404,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
312
404
 
313
405
  const patchItem = (index: number, patch: Partial<FieldAssignRuleItem>) => {
314
406
  const next = value.map((it, i) => (i === index ? { ...it, ...patch } : it));
315
- onChange?.(next);
407
+ emitChange(next);
316
408
  };
317
409
 
318
410
  const removeItem = (index: number) => {
@@ -334,7 +426,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
334
426
  setSyncingRuleKey(null);
335
427
  }
336
428
  const next = value.filter((_, i) => i !== index);
337
- onChange?.(next);
429
+ emitChange(next);
338
430
  };
339
431
 
340
432
  const moveItem = (index: number, direction: 'up' | 'down') => {
@@ -343,7 +435,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
343
435
  if (targetIndex < 0 || targetIndex >= next.length) return;
344
436
  const [item] = next.splice(index, 1);
345
437
  next.splice(targetIndex, 0, item);
346
- onChange?.(next);
438
+ emitChange(next);
347
439
  };
348
440
 
349
441
  const addItem = () => {
@@ -352,29 +444,33 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
352
444
  {
353
445
  key: uid(),
354
446
  enable: true,
355
- mode: fixedMode || defaultMode,
447
+ mode: getDefaultMode(),
356
448
  condition: { logic: '$and', items: [] },
357
449
  targetPath: undefined,
358
450
  value: undefined,
359
451
  },
360
452
  ];
361
- onChange?.(next);
453
+ emitChange(next);
362
454
  };
363
455
 
364
456
  const getEffectiveMode = (item: FieldAssignRuleItem): AssignMode => {
365
457
  if (fixedMode) return fixedMode;
366
- return item?.mode === 'default' ? 'default' : 'assign';
458
+ if (isAssignMode(item?.mode) && allowedModes.includes(item.mode)) return item.mode;
459
+ return getDefaultMode();
367
460
  };
368
461
 
369
462
  const renderAssignModeLabel = React.useCallback(
370
463
  (mode: AssignMode) => {
371
- const modeText = mode === 'default' ? t('Default value') : t('Fixed value');
464
+ const modeText =
465
+ mode === 'default' ? t('Default value') : mode === 'override' ? t('Override value') : t('Fixed value');
372
466
  const modeHelpText =
373
467
  mode === 'default'
374
468
  ? t(
375
469
  'A pre-filled value. Editable, for new entries only, and won’t affect existing data (including empty values).',
376
470
  )
377
- : t('A system-set value. Read-only.');
471
+ : mode === 'override'
472
+ ? t('Overrides existing values until the user edits it.')
473
+ : t('A system-set value. Read-only.');
378
474
 
379
475
  const preventModeToggle = (e: React.MouseEvent<HTMLElement>) => {
380
476
  e.preventDefault();
@@ -551,23 +647,26 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
551
647
  const opts = selectedOptions || [];
552
648
  const target = opts[opts.length - 1];
553
649
  if (!target) return;
554
- if (target.children && Array.isArray(target.children) && target.children.length) return;
555
650
  if (target.isLeaf) return;
651
+ if (loadedCascaderOptionsRef.current.has(target)) return;
556
652
 
557
653
  const segments = opts.map((o) => String(o?.value)).filter(Boolean);
558
654
  const targetCollection = resolveTargetCollectionBySegments(segments);
559
655
  if (!targetCollection) {
560
- target.isLeaf = true;
656
+ target.isLeaf = !(target.children && target.children.length);
657
+ loadedCascaderOptionsRef.current.add(target);
561
658
  setCascaderOptions((prev) => [...prev]);
562
659
  return;
563
660
  }
564
661
 
565
662
  const children = buildChildrenFromCollection(targetCollection, segments.length);
566
663
  if (!children.length) {
567
- target.isLeaf = true;
664
+ target.isLeaf = !(target.children && target.children.length);
568
665
  } else {
569
- target.children = children;
666
+ target.children = mergeCascaderOptions(target.children || [], children);
667
+ target.isLeaf = false;
570
668
  }
669
+ loadedCascaderOptionsRef.current.add(target);
571
670
  setCascaderOptions((prev) => [...prev]);
572
671
  },
573
672
  [buildChildrenFromCollection, resolveTargetCollectionBySegments],
@@ -583,12 +682,14 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
583
682
  const hit = options.find((o) => String(o?.value) === seg);
584
683
  if (!hit) return;
585
684
  selected.push(hit);
685
+ if (!hit.isLeaf && !loadedCascaderOptionsRef.current.has(hit)) {
686
+ await loadCascaderData(selected);
687
+ }
586
688
  if (hit.children?.length) {
587
689
  options = hit.children;
588
690
  continue;
589
691
  }
590
692
  if (hit.isLeaf) return;
591
- await loadCascaderData(selected);
592
693
  options = hit.children || [];
593
694
  }
594
695
  },
@@ -619,7 +720,9 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
619
720
  await preloadCascaderPath(segs);
620
721
  }
621
722
  };
622
- void run();
723
+ run().catch((error) => {
724
+ console.warn('[FieldAssignRulesEditor] Failed to preload cascader path', error);
725
+ });
623
726
  return () => {
624
727
  cancelled = true;
625
728
  };
@@ -627,7 +730,8 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
627
730
 
628
731
  const renderPanelHeader = (item: FieldAssignRuleItem, index: number) => {
629
732
  const mode = getEffectiveMode(item);
630
- const modeText = mode === 'default' ? t('Default value') : t('Fixed value');
733
+ const modeText =
734
+ mode === 'default' ? t('Default value') : mode === 'override' ? t('Override value') : t('Fixed value');
631
735
  const fieldLabel = getFieldLabel(item.targetPath);
632
736
  const title = fieldLabel ? String(fieldLabel) : t('Please select field');
633
737
 
@@ -935,8 +1039,11 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
935
1039
  onChange={(event) => patchItem(index, { mode: event.target.value as AssignMode })}
936
1040
  >
937
1041
  <Space size={16}>
938
- <Radio value="default">{renderAssignModeLabel('default')}</Radio>
939
- <Radio value="assign">{renderAssignModeLabel('assign')}</Radio>
1042
+ {allowedModes.map((allowedMode) => (
1043
+ <Radio key={allowedMode} value={allowedMode}>
1044
+ {renderAssignModeLabel(allowedMode)}
1045
+ </Radio>
1046
+ ))}
940
1047
  </Space>
941
1048
  </Radio.Group>
942
1049
  </div>