@nocobase/client-v2 2.2.0-beta.9 → 2.3.0-alpha.1

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 (112) hide show
  1. package/es/APIClient.d.ts +1 -3
  2. package/es/BaseApplication.d.ts +1 -0
  3. package/es/collection-field-interface/CollectionFieldInterface.d.ts +1 -0
  4. package/es/collection-field-interface/CollectionFieldInterfaceManager.d.ts +1 -0
  5. package/es/components/category-tabs/SortableCategoryTabs.d.ts +55 -0
  6. package/es/components/category-tabs/index.d.ts +9 -0
  7. package/es/components/form/ScanInput/useCodeScanner.d.ts +2 -1
  8. package/es/components/form/TypedVariableInput.d.ts +31 -5
  9. package/es/components/form/filter/CollectionFilter.d.ts +2 -0
  10. package/es/components/form/filter/CollectionFilterItem.d.ts +11 -1
  11. package/es/components/form/filter/CollectionFilterPanel.d.ts +2 -0
  12. package/es/components/form/filter/index.d.ts +2 -0
  13. package/es/components/form/filter/useFilterActionProps.d.ts +2 -0
  14. package/es/components/index.d.ts +1 -0
  15. package/es/flow/actions/index.d.ts +1 -1
  16. package/es/flow/actions/linkageRules.d.ts +2 -0
  17. package/es/flow/admin-shell/admin-layout/AdminLayoutMenuModels.d.ts +1 -0
  18. package/es/flow/components/FieldAssignExactDatePicker.d.ts +1 -0
  19. package/es/flow/components/FieldAssignValueInput.d.ts +9 -0
  20. package/es/flow/components/RunJSValueEditor.d.ts +1 -0
  21. package/es/flow/components/filter/FilterGroup.d.ts +1 -0
  22. package/es/flow/components/filter/VariableFilterItem.d.ts +6 -1
  23. package/es/flow/index.d.ts +1 -0
  24. package/es/flow/models/base/PageModel/PageModel.d.ts +12 -0
  25. package/es/flow/models/base/PageModel/PageModelTabBar.d.ts +22 -0
  26. package/es/flow/models/base/PageModel/PageTabModel.d.ts +12 -0
  27. package/es/flow/models/blocks/form/QuickEditFormModel.d.ts +17 -2
  28. package/es/flow-compat/fieldValidationConstants.d.ts +1 -1
  29. package/es/flow-compat/routeTypes.d.ts +1 -0
  30. package/es/index.d.ts +4 -0
  31. package/es/index.mjs +153 -118
  32. package/es/utils/getRouteRuntimeVersion.d.ts +23 -0
  33. package/es/utils/index.d.ts +1 -0
  34. package/lib/index.js +162 -127
  35. package/lib/locale/languageCodes.js +2 -1
  36. package/package.json +8 -7
  37. package/src/APIClient.ts +1 -10
  38. package/src/Application.tsx +4 -0
  39. package/src/BaseApplication.tsx +11 -6
  40. package/src/__tests__/app.test.tsx +73 -0
  41. package/src/__tests__/browserChecker.test.ts +61 -0
  42. package/src/__tests__/getRouteRuntimeVersion.test.ts +68 -0
  43. package/src/__tests__/nocobase-buildin-plugin-auth.test.tsx +28 -0
  44. package/src/collection-field-interface/CollectionFieldInterface.ts +1 -0
  45. package/src/collection-field-interface/CollectionFieldInterfaceManager.ts +1 -0
  46. package/src/collection-manager/field-validation.ts +1 -1
  47. package/src/components/README.md +7 -1
  48. package/src/components/README.zh-CN.md +6 -1
  49. package/src/components/category-tabs/SortableCategoryTabs.tsx +210 -0
  50. package/src/components/category-tabs/index.ts +10 -0
  51. package/src/components/form/JsonTextArea.tsx +4 -0
  52. package/src/components/form/ScanInput/CodeScanner.tsx +23 -6
  53. package/src/components/form/ScanInput/__tests__/useCodeScanner.test.tsx +180 -3
  54. package/src/components/form/ScanInput/useCodeScanner.ts +170 -5
  55. package/src/components/form/TypedVariableInput.tsx +452 -101
  56. package/src/components/form/__tests__/TypedVariableInput.test.tsx +364 -12
  57. package/src/components/form/filter/CollectionFilter.tsx +4 -0
  58. package/src/components/form/filter/CollectionFilterItem.tsx +32 -7
  59. package/src/components/form/filter/CollectionFilterPanel.tsx +4 -0
  60. package/src/components/form/filter/__tests__/CollectionFilterItem.test.tsx +38 -0
  61. package/src/components/form/filter/__tests__/useFilterActionProps.test.tsx +95 -0
  62. package/src/components/form/filter/index.ts +2 -0
  63. package/src/components/form/filter/useFilterActionProps.ts +37 -6
  64. package/src/components/index.ts +1 -0
  65. package/src/flow/FlowPage.tsx +9 -1
  66. package/src/flow/__tests__/FlowPage.test.tsx +50 -3
  67. package/src/flow/__tests__/FlowRoute.test.tsx +2 -2
  68. package/src/flow/actions/__tests__/linkageRules.tab.test.ts +171 -0
  69. package/src/flow/actions/__tests__/linkageRulesRefresh.test.ts +7 -3
  70. package/src/flow/actions/index.ts +2 -0
  71. package/src/flow/actions/linkageRules.tsx +86 -11
  72. package/src/flow/actions/linkageRulesRefresh.tsx +2 -6
  73. package/src/flow/admin-shell/admin-layout/AdminLayoutComponent.tsx +0 -1
  74. package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutComponent.test.tsx +253 -6
  75. package/src/flow/components/FieldAssignExactDatePicker.tsx +25 -11
  76. package/src/flow/components/FieldAssignValueInput.tsx +91 -20
  77. package/src/flow/components/FlowRoute.tsx +7 -3
  78. package/src/flow/components/RunJSValueEditor.tsx +9 -1
  79. package/src/flow/components/__tests__/FieldAssignValueInput.context.test.tsx +216 -0
  80. package/src/flow/components/filter/FilterGroup.tsx +33 -5
  81. package/src/flow/components/filter/VariableFilterItem.tsx +158 -10
  82. package/src/flow/components/filter/__tests__/FilterGroup.test.tsx +45 -0
  83. package/src/flow/components/filter/__tests__/VariableFilterItem.leftMetaTree.test.tsx +9 -0
  84. package/src/flow/components/filter/__tests__/VariableFilterItem.test.tsx +70 -1
  85. package/src/flow/index.ts +1 -0
  86. package/src/flow/models/base/PageModel/PageModel.tsx +387 -53
  87. package/src/flow/models/base/PageModel/PageModelTabBar.tsx +114 -0
  88. package/src/flow/models/base/PageModel/PageTabModel.tsx +184 -3
  89. package/src/flow/models/base/PageModel/__tests__/PageModel.test.ts +790 -10
  90. package/src/flow/models/base/PageModel/__tests__/PageModelTabBar.module-isolation.test.tsx +130 -0
  91. package/src/flow/models/base/PageModel/__tests__/PageModelTabBar.test.tsx +118 -0
  92. package/src/flow/models/base/PageModel/__tests__/PageTabModel.test.ts +572 -1
  93. package/src/flow/models/blocks/filter-form/FilterFormBlockModel.tsx +1 -0
  94. package/src/flow/models/blocks/filter-form/FilterFormItemModel.tsx +27 -12
  95. package/src/flow/models/blocks/filter-form/__tests__/FilterFormItemModel.defineChildren.test.ts +36 -0
  96. package/src/flow/models/blocks/filter-form/__tests__/defaultValues.wiring.test.ts +34 -0
  97. package/src/flow/models/blocks/form/QuickEditFormModel.tsx +189 -36
  98. package/src/flow/models/blocks/form/__tests__/QuickEditFormModel.quickEdit.test.ts +350 -2
  99. package/src/flow/models/blocks/table/TableActionsColumnModel.tsx +2 -1
  100. package/src/flow/models/blocks/table/TableBlockModel.tsx +1 -1
  101. package/src/flow/models/fields/AssociationFieldModel/PopupSubTableFieldModel/PopupSubTableFieldModel.tsx +2 -1
  102. package/src/flow/models/fields/VariableFieldFormModel.tsx +3 -3
  103. package/src/flow/models/fields/__tests__/VariableFieldFormModel.test.tsx +51 -0
  104. package/src/flow/models/fields/mobile-components/MobileLazySelect.tsx +20 -10
  105. package/src/flow/models/fields/mobile-components/MobileSelect.tsx +24 -12
  106. package/src/flow-compat/fieldValidationConstants.ts +1 -1
  107. package/src/flow-compat/routeTypes.ts +1 -0
  108. package/src/index.ts +4 -0
  109. package/src/locale/languageCodes.ts +2 -1
  110. package/src/nocobase-buildin-plugin/index.tsx +12 -0
  111. package/src/utils/getRouteRuntimeVersion.ts +185 -0
  112. package/src/utils/index.tsx +1 -0
@@ -83,7 +83,8 @@ const languageCodes = {
83
83
  "tk-TK": { label: "Turkmen" },
84
84
  "tr-TR": { label: "T\xFCrk\xE7e" },
85
85
  "uk-UA": { label: "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" },
86
- "ur-PK": { label: "O\u02BBzbekcha" },
86
+ "ur-PK": { label: "\u0627\u0631\u062F\u0648" },
87
+ "uz-UZ": { label: "O\u02BBzbekcha" },
87
88
  "vi-VN": { label: "Ti\u1EBFng Vi\u1EC7t" },
88
89
  "zh-CN": { label: "\u7B80\u4F53\u4E2D\u6587" },
89
90
  "zh-HK": { label: "\u7E41\u9AD4\u4E2D\u6587\uFF08\u9999\u6E2F\uFF09" },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/client-v2",
3
- "version": "2.2.0-beta.9",
3
+ "version": "2.3.0-alpha.1",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.mjs",
@@ -27,11 +27,11 @@
27
27
  "@formily/antd-v5": "1.2.3",
28
28
  "@formily/react": "^2.2.27",
29
29
  "@formily/shared": "^2.2.27",
30
- "@nocobase/evaluators": "2.2.0-beta.9",
31
- "@nocobase/flow-engine": "2.2.0-beta.9",
32
- "@nocobase/sdk": "2.2.0-beta.9",
33
- "@nocobase/shared": "2.2.0-beta.9",
34
- "@nocobase/utils": "2.2.0-beta.9",
30
+ "@nocobase/evaluators": "2.3.0-alpha.1",
31
+ "@nocobase/flow-engine": "2.3.0-alpha.1",
32
+ "@nocobase/sdk": "2.3.0-alpha.1",
33
+ "@nocobase/shared": "2.3.0-alpha.1",
34
+ "@nocobase/utils": "2.3.0-alpha.1",
35
35
  "ahooks": "^3.7.2",
36
36
  "antd": "5.24.2",
37
37
  "antd-style": "3.7.1",
@@ -42,9 +42,10 @@
42
42
  "html5-qrcode": "^2.3.8",
43
43
  "i18next": "^22.4.9",
44
44
  "json5": "^2.2.3",
45
+ "jsqr": "^1.4.0",
45
46
  "lodash": "4.17.21",
46
47
  "react-i18next": "^11.15.1",
47
48
  "react-router-dom": "^6.30.1"
48
49
  },
49
- "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
50
+ "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2"
50
51
  }
package/src/APIClient.ts CHANGED
@@ -7,7 +7,7 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
 
10
- import { APIClient as APIClientSDK, type APIClientOptions, hasHeaderValue } from '@nocobase/sdk';
10
+ import { APIClient as APIClientSDK, hasHeaderValue } from '@nocobase/sdk';
11
11
 
12
12
  function offsetToTimeZone(offset: number) {
13
13
  const hours = Math.floor(Math.abs(offset));
@@ -23,15 +23,6 @@ function getCurrentTimezone() {
23
23
  }
24
24
 
25
25
  export class APIClient extends APIClientSDK {
26
- appName?: string;
27
-
28
- constructor(options?: APIClientOptions) {
29
- super(options);
30
- if (options && typeof options !== 'function') {
31
- this.appName = options.appName;
32
- }
33
- }
34
-
35
26
  getHostname() {
36
27
  if (process.env.API_BASE_URL) {
37
28
  try {
@@ -46,6 +46,10 @@ export class Application extends BaseApplication<
46
46
 
47
47
  protected createApiClient(options: ApplicationOptions) {
48
48
  return new APIClient({
49
+ // Cross-origin API deployments rely on cookies for auth (e.g. permanent file
50
+ // URLs); trust is enforced server-side via the CORS origin whitelist and the
51
+ // CSRF middleware, not by omitting credentials.
52
+ withCredentials: true,
49
53
  ...options.apiClient,
50
54
  appName: options.name || getSubAppName(options.publicPath),
51
55
  });
@@ -35,6 +35,7 @@ import { SystemSettingsSource } from './flow/system-settings';
35
35
  import { LayoutManager } from './layout-manager/LayoutManager';
36
36
  import type { PluginClass, PluginManager, PluginType } from './PluginManager';
37
37
  import { RouteRepository } from './RouteRepository';
38
+ import { stripModernClientPrefix } from './authRedirect';
38
39
  import type {
39
40
  ComponentTypeAndString,
40
41
  RenderableComponentType,
@@ -81,6 +82,10 @@ const trimTrailingSlashes = (value: string) => {
81
82
  return match ? value.slice(0, -match[0].length) : value;
82
83
  };
83
84
 
85
+ const ensureTrailingSlash = (value: string) => {
86
+ return `${trimTrailingSlashes(value)}/`;
87
+ };
88
+
84
89
  const isRenderableComponentType = (value: unknown): value is AnyComponent => isValidElementType(value);
85
90
 
86
91
  export type DevDynamicImport = (packageName: string) => Promise<{ default: PluginClass }>;
@@ -398,7 +403,7 @@ export abstract class BaseApplication<
398
403
  this.favicon = favicon || '';
399
404
  }
400
405
 
401
- const iconHref = this.favicon || '/favicon/favicon.ico';
406
+ const iconHref = this.favicon || this.getCdnUrl() + 'favicon/favicon.ico';
402
407
 
403
408
  if (faviconLinkElement) {
404
409
  faviconLinkElement.href = iconHref;
@@ -433,12 +438,12 @@ export abstract class BaseApplication<
433
438
  return getSubAppName(this.getPublicPath()) || null;
434
439
  }
435
440
 
441
+ getCdnUrl() {
442
+ return ensureTrailingSlash(window['__webpack_public_path__'] || stripModernClientPrefix(this.getPublicPath()));
443
+ }
444
+
436
445
  getPublicPath() {
437
- let publicPath = this.options.publicPath || '/';
438
- if (!publicPath.endsWith('/')) {
439
- publicPath += '/';
440
- }
441
- return publicPath;
446
+ return ensureTrailingSlash(this.options.publicPath || '/');
442
447
  }
443
448
 
444
449
  getApiUrl(pathname = '') {
@@ -34,6 +34,8 @@ describe('app', () => {
34
34
  afterEach(() => {
35
35
  document.querySelectorAll('link[rel="shortcut icon"]').forEach((node) => node.remove());
36
36
  document.documentElement.removeAttribute('lang');
37
+ delete window['__webpack_public_path__'];
38
+ delete window['__nocobase_modern_client_prefix__'];
37
39
  vi.restoreAllMocks();
38
40
  });
39
41
 
@@ -50,6 +52,24 @@ describe('app', () => {
50
52
  expect(app.getHref('/test')).toBe('/test');
51
53
  });
52
54
 
55
+ it('should enable credentials for api clients by default', () => {
56
+ const sameOriginApp = new Application({
57
+ router,
58
+ apiClient: {
59
+ baseURL: '/api/',
60
+ },
61
+ });
62
+ const crossOriginApp = new Application({
63
+ router,
64
+ apiClient: {
65
+ baseURL: 'https://api.example.com/api/',
66
+ },
67
+ });
68
+
69
+ expect(sameOriginApp.apiClient.axios.defaults.withCredentials).toBe(true);
70
+ expect(crossOriginApp.apiClient.axios.defaults.withCredentials).toBe(true);
71
+ });
72
+
53
73
  it('should initialize shared jsonLogic operators', () => {
54
74
  const app = new Application({ router });
55
75
 
@@ -58,6 +78,59 @@ describe('app', () => {
58
78
  expect(app.jsonLogic.apply({ $testAlwaysTrue: [] })).toBe(true);
59
79
  });
60
80
 
81
+ it('should normalize publicPath and webpack public path with a single trailing slash', () => {
82
+ const app = new Application({
83
+ router,
84
+ publicPath: '/admin//',
85
+ });
86
+
87
+ expect(app.getPublicPath()).toBe('/admin/');
88
+
89
+ window['__webpack_public_path__'] = '/cdn/assets///';
90
+ expect(app.getCdnUrl()).toBe('/cdn/assets/');
91
+
92
+ delete window['__webpack_public_path__'];
93
+ expect(app.getCdnUrl()).toBe('/admin/');
94
+ });
95
+
96
+ it('should normalize webpack public path without a trailing slash', () => {
97
+ const app = new Application({
98
+ router,
99
+ publicPath: '/admin/',
100
+ });
101
+
102
+ window['__webpack_public_path__'] = '/cdn/assets';
103
+ expect(app.getCdnUrl()).toBe('/cdn/assets/');
104
+ });
105
+
106
+ it('should remove the modern client prefix from the CDN fallback path', () => {
107
+ const app = new Application({
108
+ router,
109
+ publicPath: '/v/',
110
+ });
111
+
112
+ expect(app.getCdnUrl()).toBe('/');
113
+ });
114
+
115
+ it('should preserve APP_PUBLIC_PATH when removing the modern client prefix', () => {
116
+ const app = new Application({
117
+ router,
118
+ publicPath: '/nocobase/v/',
119
+ });
120
+
121
+ expect(app.getCdnUrl()).toBe('/nocobase/');
122
+ });
123
+
124
+ it('should support a custom modern client prefix', () => {
125
+ window['__nocobase_modern_client_prefix__'] = 'modern';
126
+ const app = new Application({
127
+ router,
128
+ publicPath: '/nocobase/modern/',
129
+ });
130
+
131
+ expect(app.getCdnUrl()).toBe('/nocobase/');
132
+ });
133
+
61
134
  it('should apply the provided favicon immediately', () => {
62
135
  const app = new Application({ router });
63
136
 
@@ -15,6 +15,8 @@ import { fileURLToPath } from 'node:url';
15
15
  type BrowserCheckerCase = {
16
16
  pathname: string;
17
17
  publicPath: string;
18
+ modernClientPrefix?: string;
19
+ appClientEntryMode?: string;
18
20
  expectedRedirect?: string;
19
21
  };
20
22
 
@@ -40,6 +42,8 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
40
42
  showLog: false,
41
43
  window: {
42
44
  __nocobase_public_path__: input.publicPath,
45
+ __nocobase_modern_client_prefix__: input.modernClientPrefix,
46
+ __nocobase_app_client_entry_mode__: input.appClientEntryMode,
43
47
  location: {
44
48
  origin: 'http://c.local.nocobase.com',
45
49
  pathname: input.pathname,
@@ -109,4 +113,61 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
109
113
 
110
114
  expect(replace).not.toHaveBeenCalled();
111
115
  });
116
+
117
+ if (scriptPath.includes('/app/client/public/')) {
118
+ it('redirects app root to modern entry for modern-default', () => {
119
+ const replace = executeBrowserChecker(scriptPath, {
120
+ pathname: '/',
121
+ publicPath: '/',
122
+ modernClientPrefix: 'v',
123
+ appClientEntryMode: 'modern-default',
124
+ });
125
+
126
+ expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/');
127
+ });
128
+
129
+ it('does not redirect legacy deep links for modern-default', () => {
130
+ const replace = executeBrowserChecker(scriptPath, {
131
+ pathname: '/admin',
132
+ publicPath: '/',
133
+ modernClientPrefix: 'v',
134
+ appClientEntryMode: 'modern-default',
135
+ });
136
+
137
+ expect(replace).not.toHaveBeenCalled();
138
+ });
139
+
140
+ it('rewrites legacy document paths for modern-only', () => {
141
+ const replace = executeBrowserChecker(scriptPath, {
142
+ pathname: '/admin/settings/workflow',
143
+ publicPath: '/',
144
+ modernClientPrefix: 'v',
145
+ appClientEntryMode: 'modern-only',
146
+ });
147
+
148
+ expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/admin/settings/workflow');
149
+ });
150
+
151
+ it('redirects sub-path site root directly to final modern target', () => {
152
+ const replace = executeBrowserChecker(scriptPath, {
153
+ pathname: '/nocobase/',
154
+ publicPath: '/nocobase/',
155
+ modernClientPrefix: 'v',
156
+ appClientEntryMode: 'modern-default',
157
+ });
158
+
159
+ expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/');
160
+ });
161
+
162
+ it('rewrites sub-app legacy deep links for modern-only without collapsing the sub-app segment', () => {
163
+ const replace = executeBrowserChecker(scriptPath, {
164
+ pathname: '/nocobase/apps/a_31itq60q4kg/admin/',
165
+ publicPath: '/nocobase/',
166
+ modernClientPrefix: 'v',
167
+ appClientEntryMode: 'modern-only',
168
+ });
169
+
170
+ expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/apps/a_31itq60q4kg/admin');
171
+ });
172
+ }
112
173
  });
@@ -0,0 +1,68 @@
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
+
10
+ import { afterEach, describe, expect, it } from 'vitest';
11
+ import { getRouteRuntimeVersion } from '../utils/getRouteRuntimeVersion';
12
+
13
+ function replacePathname(pathname: string) {
14
+ Object.defineProperty(window, 'location', {
15
+ configurable: true,
16
+ value: {
17
+ ...window.location,
18
+ pathname,
19
+ },
20
+ });
21
+ }
22
+
23
+ describe('getRouteRuntimeVersion', () => {
24
+ afterEach(() => {
25
+ delete window.__nocobase_modern_client_prefix__;
26
+ delete window.__nocobase_public_path__;
27
+ replacePathname('/');
28
+ });
29
+
30
+ it('returns modern when the current pathname is inside the modern client prefix', () => {
31
+ window.__nocobase_modern_client_prefix__ = 'v';
32
+ window.__nocobase_public_path__ = '/nocobase/v/';
33
+ replacePathname('/nocobase/v/admin/settings/workflow');
34
+
35
+ expect(getRouteRuntimeVersion()).toBe('modern');
36
+ });
37
+
38
+ it('returns legacy when reused v2 components run under the v1 settings page', () => {
39
+ window.__nocobase_modern_client_prefix__ = 'v';
40
+ window.__nocobase_public_path__ = '/nocobase/';
41
+ replacePathname('/nocobase/admin/settings/workflow/workflows/123');
42
+
43
+ expect(getRouteRuntimeVersion()).toBe('legacy');
44
+ });
45
+
46
+ it('returns legacy when root public path is "/"', () => {
47
+ window.__nocobase_modern_client_prefix__ = 'v';
48
+ window.__nocobase_public_path__ = '/';
49
+ replacePathname('/admin/settings/workflow/workflows/123');
50
+
51
+ expect(getRouteRuntimeVersion()).toBe('legacy');
52
+ });
53
+
54
+ it('returns modern when root public path is "/v/"', () => {
55
+ window.__nocobase_modern_client_prefix__ = 'v';
56
+ window.__nocobase_public_path__ = '/v/';
57
+ replacePathname('/v/admin/workflow/workflows/123');
58
+
59
+ expect(getRouteRuntimeVersion()).toBe('modern');
60
+ });
61
+
62
+ it('falls back to pathname matching when public path is unavailable', () => {
63
+ window.__nocobase_modern_client_prefix__ = 'v';
64
+ replacePathname('/v/admin/workflow/workflows/123');
65
+
66
+ expect(getRouteRuntimeVersion()).toBe('modern');
67
+ });
68
+ });
@@ -55,6 +55,7 @@ describe('nocobase buildin plugin auth redirect', () => {
55
55
  const originalLocation = globalThis.window.location;
56
56
 
57
57
  beforeEach(() => {
58
+ globalThis.window.localStorage.clear();
58
59
  // These fixtures mount the modern client under the `v2` segment; tell the
59
60
  // runtime-prefix helper so v2-runtime detection matches (server injects it
60
61
  // in production).
@@ -75,6 +76,7 @@ describe('nocobase buildin plugin auth redirect', () => {
75
76
  });
76
77
 
77
78
  afterEach(() => {
79
+ globalThis.window.localStorage.clear();
78
80
  delete (globalThis.window as any).__nocobase_modern_client_prefix__;
79
81
  Object.defineProperty(globalThis.window, 'location', {
80
82
  configurable: true,
@@ -116,6 +118,7 @@ describe('nocobase buildin plugin auth redirect', () => {
116
118
  plugins: [NocoBaseBuildInPlugin as any],
117
119
  router: { type: 'memory', initialEntries: ['/v2/admin'] },
118
120
  });
121
+ app.apiClient.auth.setToken('test-token');
119
122
  app.apiMock.onGet('app:getLang').reply(200, {
120
123
  data: { lang: 'en-US', resources: { client: {} }, cron: {} },
121
124
  });
@@ -130,6 +133,7 @@ describe('nocobase buildin plugin auth redirect', () => {
130
133
  await new Promise((resolve) => setTimeout(resolve, 50));
131
134
  expect(app.router.router.state.location.pathname).toBe('/v2/admin');
132
135
  expect(app.router.router.state.location.search).toBe('');
136
+ expect(app.apiMock.history.post.filter((request) => request.url === 'auth:syncCookies')).toHaveLength(0);
133
137
  });
134
138
 
135
139
  it('should redirect unauthenticated v2 root access to v2 signin via <Navigate />', async () => {
@@ -326,6 +330,29 @@ describe('nocobase buildin plugin auth redirect', () => {
326
330
  data: { lang: 'en-US', resources: { client: {} }, cron: {} },
327
331
  });
328
332
  app.apiMock.onGet('/auth:check').reply(200, { data: { id: 1 } });
333
+ app.apiMock.onPost('auth:syncCookies').reply(200, { data: { synced: true } });
334
+ const ensureLoaded = vi.spyOn(app.dataSourceManager, 'ensureLoaded').mockResolvedValue(undefined);
335
+
336
+ const Root = app.getRootComponent();
337
+ render(<Root />);
338
+
339
+ expect(await screen.findByText('secure page')).toBeInTheDocument();
340
+ expect(ensureLoaded).toHaveBeenCalledTimes(1);
341
+ expect(app.apiMock.history.post.filter((request) => request.url === 'auth:syncCookies')).toHaveLength(1);
342
+ });
343
+
344
+ it('should keep authenticated v2 startup working when cookie bootstrap fails', async () => {
345
+ const app = createMockClient({
346
+ publicPath: '/v2/',
347
+ plugins: [NocoBaseBuildInPlugin as any, AuthBootstrapRoutePlugin as any],
348
+ router: { type: 'memory', initialEntries: ['/v2/secure'] },
349
+ });
350
+ app.apiClient.auth.setToken('test-token');
351
+ app.apiMock.onGet('app:getLang').reply(200, {
352
+ data: { lang: 'en-US', resources: { client: {} }, cron: {} },
353
+ });
354
+ app.apiMock.onGet('/auth:check').reply(200, { data: { id: 1 } });
355
+ app.apiMock.onPost('auth:syncCookies').reply(500, { errors: [{ message: 'cookie sync failed' }] });
329
356
  const ensureLoaded = vi.spyOn(app.dataSourceManager, 'ensureLoaded').mockResolvedValue(undefined);
330
357
 
331
358
  const Root = app.getRootComponent();
@@ -333,6 +360,7 @@ describe('nocobase buildin plugin auth redirect', () => {
333
360
 
334
361
  expect(await screen.findByText('secure page')).toBeInTheDocument();
335
362
  expect(ensureLoaded).toHaveBeenCalledTimes(1);
363
+ expect(app.apiMock.history.post.filter((request) => request.url === 'auth:syncCookies')).toHaveLength(1);
336
364
  });
337
365
 
338
366
  it('should not auth-check or bootstrap authCheck false routes', async () => {
@@ -115,6 +115,7 @@ export abstract class CollectionFieldInterface {
115
115
  titleUsable?: boolean;
116
116
  usePathOptions?(field: any): any;
117
117
  hidden?: boolean;
118
+ creatable?: boolean;
118
119
 
119
120
  addComponentOption(componentOption: CollectionFieldInterfaceComponentOption) {
120
121
  if (!this.componentOptions) {
@@ -31,6 +31,7 @@ interface FieldInterfaceLike {
31
31
  title?: ReactNode;
32
32
  group?: string;
33
33
  order?: number;
34
+ creatable?: boolean;
34
35
  isAssociation?: boolean;
35
36
  supportDataSourceType?: string[];
36
37
  notSupportDataSourceType?: string[];
@@ -132,7 +132,7 @@ fieldValidationConfigureRegistry.registerMany([
132
132
  { key: 'uri', label: 'URI', hasValue: false, params: [], paramsType: 'object' },
133
133
  {
134
134
  key: 'multiple',
135
- label: 'Multiple',
135
+ label: 'Multiple of',
136
136
  hasValue: true,
137
137
  params: [{ key: 'base', label: 'Base', componentType: 'inputNumber', required: true }],
138
138
  },
@@ -190,6 +190,10 @@ import { TypedVariableInput } from '@nocobase/client-v2';
190
190
  <Form.Item name={['options', 'secure']} label={t('Secure')} initialValue={true}>
191
191
  <TypedVariableInput types={['boolean']} namespaces={['$env']} />
192
192
  </Form.Item>
193
+
194
+ // Inject a custom variable tree (e.g. a workflow node's upstream outputs,
195
+ // which are not in the global registry)
196
+ <TypedVariableInput types={['string', 'number']} metaTree={workflowMetaTree} />
193
197
  ```
194
198
 
195
199
  Key props:
@@ -197,6 +201,7 @@ Key props:
197
201
  - `types`: allowed constant types. Shape mirrors v1 `useTypedConstant` — pass bare type names (`['number', 'boolean']`) or `[type, editorProps]` tuples (`[['number', { min, max, step }]]`) to forward props to the underlying antd editor. Defaults to `['string', 'number', 'boolean', 'date']`. **Even when only one type is allowed, the `Constant` entry still expands into a typed submenu** (Number / Boolean / Date / String) — matches v1 so users can see what type the constant is
198
202
  - `namespaces`: restrict the variable picker to specific top-level namespaces (e.g. `['$env']`). Omit to expose every namespace registered on `flowEngine.context`
199
203
  - `extraNodes`: static leaves appended after the namespace-filtered nodes
204
+ - `metaTree`: **inject the variable tree directly** instead of reading the global `flowEngine.context` meta tree. When set, `namespaces`/`extraNodes` are ignored and this tree is used verbatim — for context-scoped variable sources that are not in the global registry (typically a workflow node's upstream outputs, `$jobsMapByNodeKey`). Nodes whose `children` is a thunk (`() => Promise<MetaTreeNode[]>`) are **lazy-loaded on expand** (via flow-engine's `loadMetaTreeChildren`)
200
205
  - `nullable`: whether to expose the `Null` switcher entry. Default `true`. Combined with `Form.Item.rules={[{ required: true }]}`, the user can explicitly clear the field but submission is still blocked by validation — mirrors v1's "Null + required" pairing
201
206
  - `delimiters`: variable-token delimiters, default `['{{', '}}']` — same as `VariableInput`
202
207
  - `value` / `onChange` / `placeholder` / `disabled` / `style` / `className`: standard controlled-input props
@@ -212,9 +217,10 @@ When **not** to use it:
212
217
  - **Pure literal fields** (users will never pass a variable) → use the antd primitive directly (`InputNumber` / `Select` / `DatePicker` / `Input`) and skip the Cascader column overhead
213
218
  - **Pure variable fields** (users will never pass a literal) → use `EnvVariableInput` (`$env`-only, with optional password masking) or `VariableInput` (general-purpose)
214
219
 
220
+ Supported constant types: `string` / `number` / `boolean` / `date` / `object`. The `object` (JSON) type renders an inline monospace textarea (2 rows by default, drag-resizable) — it keeps the raw text as a draft while editing and `JSON.parse`s it back into an object on blur. On a parse failure it shows the raw `JSON.parse` message (e.g. `Expected property name or '}' in JSON at position …`, matching v1) on its own row below the input, and does not emit. Mirrors v1 `useTypedConstant`'s object form (default value `{}`).
221
+
215
222
  Capabilities skipped (present in v1, not yet ported to v2):
216
223
 
217
- - `object` constant type (JSON editor) — v2 has no inline "JSON editor + Cascader switcher" yet; add when there's a concrete caller
218
224
  - Async `loadChildren` cascading — most MetaTree namespaces are already eagerly resolved by `useFilteredMetaTree`, so this hasn't been needed
219
225
 
220
226
  #### FileSizeInput
@@ -190,6 +190,9 @@ import { TypedVariableInput } from '@nocobase/client-v2';
190
190
  <Form.Item name={['options', 'secure']} label={t('安全模式')} initialValue={true}>
191
191
  <TypedVariableInput types={['boolean']} namespaces={['$env']} />
192
192
  </Form.Item>
193
+
194
+ // 注入自定义变量树(如工作流节点的上游输出,不在全局注册表里)
195
+ <TypedVariableInput types={['string', 'number']} metaTree={workflowMetaTree} />
193
196
  ```
194
197
 
195
198
  主要属性:
@@ -197,6 +200,7 @@ import { TypedVariableInput } from '@nocobase/client-v2';
197
200
  - `types`:允许的常量类型。形态对齐 v1 `useTypedConstant`,可以传裸类型名 `['number', 'boolean']`,也可以传 `[type, editorProps]` 元组 `[['number', { min, max, step }]]` 把 props 透传给底层 antd 编辑器。默认 `['string', 'number', 'boolean', 'date']`。**即使只允许一种类型,「常量」入口也会展开二级菜单**(数字 / 逻辑值 / 日期 / 字符串)——跟 v1 一致,让用户能直观看到当前常量是什么类型
198
201
  - `namespaces`:限定变量 picker 可选的顶层命名空间(如 `['$env']`)。不传就用 `flowEngine.context` 里所有已注册命名空间
199
202
  - `extraNodes`:在命名空间过滤后追加几条静态变量节点
203
+ - `metaTree`:**直接注入变量树**,取代读取全局 `flowEngine.context` 的 MetaTree。传了它就**忽略** `namespaces`/`extraNodes`,原样使用这棵树——用于不在全局注册表里的、上下文相关的变量源(典型如工作流节点的上游节点输出 `$jobsMapByNodeKey`)。树里 `children` 为函数(`() => Promise<MetaTreeNode[]>`)的节点会在用户展开 Cascader 时**按需懒加载**(复用 flow-engine 的 `loadMetaTreeChildren`)
200
204
  - `nullable`:是否暴露「空值」入口,默认 `true`。配合 `Form.Item.rules={[{ required: true }]}` 可以让用户能手动清空、但提交时会被校验拦截——跟 v1 的「空值 + required」组合一致
201
205
  - `delimiters`:变量 token 开闭分隔符,默认 `['{{', '}}']`,跟 `VariableInput` 一致
202
206
  - `value` / `onChange` / `placeholder` / `disabled` / `style` / `className`:标准受控字段属性
@@ -212,9 +216,10 @@ import { TypedVariableInput } from '@nocobase/client-v2';
212
216
  - **纯字面量字段**(用户不会想填变量)→ 直接用 antd `InputNumber` / `Select` / `DatePicker` / `Input`,省掉 Cascader 那一格的视觉开销
213
217
  - **纯变量字段**(用户不会想填字面量)→ 用 `EnvVariableInput`(`$env` 专用,带 password mask)或 `VariableInput`(更通用)
214
218
 
219
+ 支持的常量类型:`string` / `number` / `boolean` / `date` / `object`。其中 `object`(即 JSON)渲染为一个等宽字体的内联 textarea(默认两行、可拖拽拉伸),编辑时保留原始文本草稿、失焦(blur)时 `JSON.parse` 回写为对象;解析失败则在输入框**下方单独一行**显示原生 `JSON.parse` 的错误信息(如 `Expected property name or '}' in JSON at position …`,对齐 v1)且不回写。对齐 v1 `useTypedConstant` 的 object 形态(默认值 `{}`)。
220
+
215
221
  跳过的能力(v1 有但 v2 还没补):
216
222
 
217
- - `object` 类型(JSON 编辑器)——v2 还没对应的「内联 JSON 编辑器 + Cascader 切换」组件,等真有需求再补
218
223
  - 异步 `loadChildren` 分支——大多数命名空间的 MetaTree 已经由 `useFilteredMetaTree` 提前展平,没遇到刚需
219
224
 
220
225
  #### FileSizeInput