@nocobase/client-v2 2.2.0-beta.9 → 3.0.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 (208) hide show
  1. package/es/APIClient.d.ts +1 -3
  2. package/es/BaseApplication.d.ts +1 -0
  3. package/es/acl/ACLProvider.d.ts +10 -0
  4. package/es/authRedirect.d.ts +5 -0
  5. package/es/collection-field-interface/CollectionFieldInterface.d.ts +1 -0
  6. package/es/collection-field-interface/CollectionFieldInterfaceManager.d.ts +1 -0
  7. package/es/components/AttachmentUpload.d.ts +51 -0
  8. package/es/components/category-tabs/SortableCategoryTabs.d.ts +55 -0
  9. package/es/components/category-tabs/index.d.ts +9 -0
  10. package/es/components/form/ScanInput/useCodeScanner.d.ts +3 -2
  11. package/es/components/form/TypedVariableInput.d.ts +31 -5
  12. package/es/components/form/filter/CollectionFilter.d.ts +2 -0
  13. package/es/components/form/filter/CollectionFilterItem.d.ts +11 -1
  14. package/es/components/form/filter/CollectionFilterPanel.d.ts +2 -0
  15. package/es/components/form/filter/index.d.ts +2 -0
  16. package/es/components/form/filter/useFilterActionProps.d.ts +2 -0
  17. package/es/components/index.d.ts +2 -0
  18. package/es/flow/actions/index.d.ts +1 -1
  19. package/es/flow/actions/linkageRules.d.ts +3 -0
  20. package/es/flow/admin-shell/admin-layout/AdminLayoutMenuModels.d.ts +1 -0
  21. package/es/flow/admin-shell/admin-layout/NocoBaseLogo.d.ts +10 -0
  22. package/es/flow/components/FieldAssignExactDatePicker.d.ts +1 -0
  23. package/es/flow/components/FieldAssignValueInput.d.ts +9 -0
  24. package/es/flow/components/FlowRoute.d.ts +2 -2
  25. package/es/flow/components/RunJSValueEditor.d.ts +1 -0
  26. package/es/flow/components/filter/FilterGroup.d.ts +1 -0
  27. package/es/flow/components/filter/VariableFilterItem.d.ts +6 -1
  28. package/es/flow/index.d.ts +1 -0
  29. package/es/flow/internal/registerDeviceTypeContext.d.ts +10 -0
  30. package/es/flow/models/base/ActionModelCore.d.ts +4 -2
  31. package/es/flow/models/base/BlockGridModel.d.ts +3 -0
  32. package/es/flow/models/base/PageModel/PageModel.d.ts +12 -0
  33. package/es/flow/models/base/PageModel/PageModelTabBar.d.ts +22 -0
  34. package/es/flow/models/base/PageModel/PageTabModel.d.ts +12 -0
  35. package/es/flow/models/blocks/form/QuickEditFormModel.d.ts +17 -2
  36. package/es/flow/models/blocks/table/TableColumnModel.d.ts +1 -0
  37. package/es/flow/models/fields/DateTimeFieldModel/dateLimit.d.ts +15 -7
  38. package/es/flow-compat/fieldValidationConstants.d.ts +1 -1
  39. package/es/flow-compat/routeTypes.d.ts +1 -0
  40. package/es/index.d.ts +8 -1
  41. package/es/index.mjs +190 -141
  42. package/es/nocobase-buildin-plugin/currentUserAuthStatus.d.ts +11 -0
  43. package/es/nocobase-buildin-plugin/index.d.ts +9 -0
  44. package/es/settings-app/SettingsApplication.d.ts +18 -0
  45. package/es/settings-app/SettingsBrand.d.ts +16 -0
  46. package/es/settings-app/SettingsBuildInPlugin.d.ts +9 -0
  47. package/es/settings-app/SettingsDocumentRedirect.d.ts +10 -0
  48. package/es/settings-app/SettingsGroupNav.d.ts +17 -0
  49. package/es/settings-app/SettingsPluginSettingsManager.d.ts +14 -0
  50. package/es/settings-app/SettingsRouterManager.d.ts +15 -0
  51. package/es/settings-app/SettingsSearch.d.ts +17 -0
  52. package/es/settings-app/SettingsShell.d.ts +10 -0
  53. package/es/settings-app/isSettingsApp.d.ts +18 -0
  54. package/es/settings-app/runtimePaths.d.ts +18 -0
  55. package/es/settings-app/settingsDocumentPath.d.ts +14 -0
  56. package/es/settings-app/settingsTheme.d.ts +87 -0
  57. package/es/settings-app/useSettingsThemeConfig.d.ts +22 -0
  58. package/es/settings-center/AdminSettingsLayout.d.ts +2 -2
  59. package/es/settings-center/groups.d.ts +66 -0
  60. package/es/settings-center/useSettingsGroups.d.ts +36 -0
  61. package/es/settings-center/useSettingsSearch.d.ts +35 -0
  62. package/es/settings-center/utils.d.ts +24 -0
  63. package/es/theme/index.d.ts +1 -0
  64. package/es/theme/itemActive.d.ts +24 -0
  65. package/es/theme/type.d.ts +9 -0
  66. package/es/utils/getRouteRuntimeVersion.d.ts +23 -0
  67. package/es/utils/index.d.ts +1 -0
  68. package/lib/index.js +195 -146
  69. package/lib/locale/languageCodes.js +3 -1
  70. package/package.json +9 -7
  71. package/src/APIClient.ts +1 -10
  72. package/src/Application.tsx +4 -0
  73. package/src/BaseApplication.tsx +11 -6
  74. package/src/__tests__/app.test.tsx +73 -0
  75. package/src/__tests__/authRedirect.test.ts +137 -0
  76. package/src/__tests__/browserChecker.test.ts +185 -6
  77. package/src/__tests__/getRouteRuntimeVersion.test.ts +68 -0
  78. package/src/__tests__/mockSettingsApplication.ts +29 -0
  79. package/src/__tests__/nocobase-buildin-plugin-auth.test.tsx +79 -10
  80. package/src/__tests__/plugin-manager.test.tsx +7 -6
  81. package/src/__tests__/settings-application.test.ts +164 -0
  82. package/src/__tests__/settings-auth-routes.test.ts +71 -0
  83. package/src/__tests__/settings-center.test.tsx +38 -37
  84. package/src/__tests__/settings-layout-root.test.tsx +260 -0
  85. package/src/__tests__/settings-runtime-paths.test.ts +99 -0
  86. package/src/__tests__/settings-shell.test.tsx +200 -0
  87. package/src/acl/ACLProvider.tsx +21 -0
  88. package/src/authRedirect.ts +72 -3
  89. package/src/collection-field-interface/CollectionFieldInterface.ts +1 -0
  90. package/src/collection-field-interface/CollectionFieldInterfaceManager.ts +1 -0
  91. package/src/collection-manager/field-validation.ts +1 -1
  92. package/src/components/AttachmentUpload.tsx +275 -0
  93. package/src/components/README.md +7 -1
  94. package/src/components/README.zh-CN.md +6 -1
  95. package/src/components/category-tabs/SortableCategoryTabs.tsx +210 -0
  96. package/src/components/category-tabs/index.ts +10 -0
  97. package/src/components/form/JsonTextArea.tsx +4 -0
  98. package/src/components/form/ScanInput/CodeScanner.tsx +79 -35
  99. package/src/components/form/ScanInput/__tests__/CodeScanner.test.tsx +101 -0
  100. package/src/components/form/ScanInput/__tests__/useCodeScanner.test.tsx +284 -11
  101. package/src/components/form/ScanInput/useCodeScanner.ts +332 -24
  102. package/src/components/form/TypedVariableInput.tsx +452 -101
  103. package/src/components/form/__tests__/TypedVariableInput.test.tsx +364 -12
  104. package/src/components/form/filter/CollectionFilter.tsx +4 -0
  105. package/src/components/form/filter/CollectionFilterItem.tsx +32 -7
  106. package/src/components/form/filter/CollectionFilterPanel.tsx +4 -0
  107. package/src/components/form/filter/__tests__/CollectionFilterItem.test.tsx +38 -0
  108. package/src/components/form/filter/__tests__/useFilterActionProps.test.tsx +95 -0
  109. package/src/components/form/filter/index.ts +2 -0
  110. package/src/components/form/filter/useFilterActionProps.ts +37 -6
  111. package/src/components/index.ts +2 -0
  112. package/src/flow/FlowPage.tsx +9 -1
  113. package/src/flow/__tests__/FlowPage.test.tsx +50 -3
  114. package/src/flow/__tests__/FlowRoute.test.tsx +128 -10
  115. package/src/flow/__tests__/PluginFlowEngine.test.ts +58 -0
  116. package/src/flow/actions/__tests__/actionLinkageRules.forkProps.test.ts +314 -0
  117. package/src/flow/actions/__tests__/dataScopeFormValueClear.test.ts +102 -0
  118. package/src/flow/actions/__tests__/linkageRules.tab.test.ts +171 -0
  119. package/src/flow/actions/__tests__/linkageRulesRefresh.test.ts +7 -3
  120. package/src/flow/actions/index.ts +2 -0
  121. package/src/flow/actions/linkageRules.tsx +111 -16
  122. package/src/flow/actions/linkageRulesRefresh.tsx +2 -6
  123. package/src/flow/admin-shell/admin-layout/AdminLayoutComponent.tsx +1 -57
  124. package/src/flow/admin-shell/admin-layout/NocoBaseLogo.tsx +77 -0
  125. package/src/flow/admin-shell/admin-layout/TopbarActionsBar.tsx +37 -14
  126. package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutComponent.test.tsx +253 -6
  127. package/src/flow/admin-shell/admin-layout/__tests__/TopbarActionsBar.test.tsx +77 -13
  128. package/src/flow/common/Markdown/style.ts +4 -0
  129. package/src/flow/components/BlockItemCard.tsx +2 -2
  130. package/src/flow/components/FieldAssignExactDatePicker.tsx +25 -11
  131. package/src/flow/components/FieldAssignValueInput.tsx +91 -20
  132. package/src/flow/components/FlowRoute.tsx +78 -32
  133. package/src/flow/components/RunJSValueEditor.tsx +9 -1
  134. package/src/flow/components/__tests__/FieldAssignValueInput.context.test.tsx +216 -0
  135. package/src/flow/components/filter/FilterGroup.tsx +33 -5
  136. package/src/flow/components/filter/VariableFilterItem.tsx +158 -10
  137. package/src/flow/components/filter/__tests__/FilterGroup.test.tsx +45 -0
  138. package/src/flow/components/filter/__tests__/VariableFilterItem.leftMetaTree.test.tsx +9 -0
  139. package/src/flow/components/filter/__tests__/VariableFilterItem.test.tsx +70 -1
  140. package/src/flow/index.ts +3 -0
  141. package/src/flow/internal/registerDeviceTypeContext.ts +39 -0
  142. package/src/flow/models/base/ActionModelCore.tsx +11 -2
  143. package/src/flow/models/base/BlockGridModel.tsx +26 -0
  144. package/src/flow/models/base/CollectionBlockModel.tsx +6 -2
  145. package/src/flow/models/base/PageModel/PageModel.tsx +387 -53
  146. package/src/flow/models/base/PageModel/PageModelTabBar.tsx +114 -0
  147. package/src/flow/models/base/PageModel/PageTabModel.tsx +249 -18
  148. package/src/flow/models/base/PageModel/__tests__/PageModel.test.ts +790 -10
  149. package/src/flow/models/base/PageModel/__tests__/PageModelTabBar.module-isolation.test.tsx +130 -0
  150. package/src/flow/models/base/PageModel/__tests__/PageModelTabBar.test.tsx +118 -0
  151. package/src/flow/models/base/PageModel/__tests__/PageTabModel.test.ts +1075 -7
  152. package/src/flow/models/base/__tests__/ActionModelCore.render.test.tsx +49 -0
  153. package/src/flow/models/base/__tests__/BlockGridModel.selectSceneActivation.test.ts +124 -0
  154. package/src/flow/models/base/__tests__/CollectionBlockModel.addAppends.test.ts +41 -0
  155. package/src/flow/models/blocks/filter-form/FilterFormBlockModel.tsx +28 -3
  156. package/src/flow/models/blocks/filter-form/FilterFormItemModel.tsx +27 -12
  157. package/src/flow/models/blocks/filter-form/__tests__/FilterFormItemModel.defineChildren.test.ts +36 -0
  158. package/src/flow/models/blocks/filter-form/__tests__/defaultValues.wiring.test.ts +66 -4
  159. package/src/flow/models/blocks/form/QuickEditFormModel.tsx +189 -36
  160. package/src/flow/models/blocks/form/__tests__/QuickEditFormModel.quickEdit.test.ts +350 -2
  161. package/src/flow/models/blocks/js-block/JSBlock.tsx +1 -1
  162. package/src/flow/models/blocks/table/TableActionsColumnModel.tsx +2 -1
  163. package/src/flow/models/blocks/table/TableBlockModel.tsx +4 -2
  164. package/src/flow/models/blocks/table/TableColumnModel.tsx +30 -1
  165. package/src/flow/models/blocks/table/__tests__/TableBlockModel.quickEditRefresh.test.ts +12 -0
  166. package/src/flow/models/blocks/table/__tests__/TableColumnModel.test.tsx +33 -0
  167. package/src/flow/models/fields/AssociationFieldModel/PopupSubTableFieldModel/PopupSubTableFieldModel.tsx +2 -1
  168. package/src/flow/models/fields/DateTimeFieldModel/__tests__/DateTimeNoTzFieldModel.dateLimit.test.tsx +149 -0
  169. package/src/flow/models/fields/DateTimeFieldModel/dateLimit.ts +149 -113
  170. package/src/flow/models/fields/JsonFieldModel.tsx +31 -8
  171. package/src/flow/models/fields/VariableFieldFormModel.tsx +3 -3
  172. package/src/flow/models/fields/__tests__/JsonFieldModel.test.ts +82 -0
  173. package/src/flow/models/fields/__tests__/VariableFieldFormModel.test.tsx +51 -0
  174. package/src/flow/models/fields/mobile-components/MobileLazySelect.tsx +20 -10
  175. package/src/flow/models/fields/mobile-components/MobileSelect.tsx +24 -12
  176. package/src/flow/models/topbar/TopbarActionModel.tsx +52 -180
  177. package/src/flow/utils/dataScopeFormValueClear.ts +4 -3
  178. package/src/flow-compat/fieldValidationConstants.ts +1 -1
  179. package/src/flow-compat/routeTypes.ts +1 -0
  180. package/src/index.ts +14 -1
  181. package/src/locale/languageCodes.ts +3 -1
  182. package/src/nocobase-buildin-plugin/currentUserAuthStatus.ts +58 -0
  183. package/src/nocobase-buildin-plugin/index.tsx +110 -70
  184. package/src/settings-app/SettingsApplication.ts +31 -0
  185. package/src/settings-app/SettingsBrand.tsx +108 -0
  186. package/src/settings-app/SettingsBuildInPlugin.ts +10 -0
  187. package/src/settings-app/SettingsDocumentRedirect.tsx +26 -0
  188. package/src/settings-app/SettingsGroupNav.tsx +124 -0
  189. package/src/settings-app/SettingsPluginSettingsManager.ts +38 -0
  190. package/src/settings-app/SettingsRouterManager.ts +92 -0
  191. package/src/settings-app/SettingsSearch.tsx +238 -0
  192. package/src/settings-app/SettingsShell.tsx +167 -0
  193. package/src/settings-app/isSettingsApp.ts +21 -0
  194. package/src/settings-app/runtimePaths.ts +104 -0
  195. package/src/settings-app/settingsDocumentPath.ts +66 -0
  196. package/src/settings-app/settingsTheme.ts +301 -0
  197. package/src/settings-app/useSettingsThemeConfig.ts +100 -0
  198. package/src/settings-center/AdminSettingsLayout.tsx +122 -141
  199. package/src/settings-center/SystemSettingsPage.tsx +4 -170
  200. package/src/settings-center/groups.ts +108 -0
  201. package/src/settings-center/useSettingsGroups.ts +105 -0
  202. package/src/settings-center/useSettingsSearch.ts +173 -0
  203. package/src/settings-center/utils.tsx +50 -1
  204. package/src/theme/index.tsx +1 -0
  205. package/src/theme/itemActive.ts +31 -0
  206. package/src/theme/type.ts +10 -0
  207. package/src/utils/getRouteRuntimeVersion.ts +185 -0
  208. package/src/utils/index.tsx +1 -0
@@ -194,6 +194,35 @@ export class TableColumnModel extends DisplayItemModel {
194
194
  .filter(Boolean);
195
195
  }
196
196
 
197
+ canQuickEdit(record: Record<string, unknown>): boolean {
198
+ if (!this.props.editable) {
199
+ return false;
200
+ }
201
+ if (this.context.skipAclCheck) {
202
+ return true;
203
+ }
204
+
205
+ const blockModel = this.context.blockModel;
206
+ const collection = blockModel?.collection;
207
+ const resource = blockModel?.resource;
208
+ const collectionField = this.collectionField;
209
+ if (!collection || !resource || !collectionField) {
210
+ return false;
211
+ }
212
+
213
+ const filterByTk = collection.getFilterByTK(record);
214
+ const recordPkValue = typeof filterByTk === 'string' || typeof filterByTk === 'number' ? filterByTk : undefined;
215
+
216
+ return this.context.acl.can({
217
+ dataSourceKey: collection.dataSourceKey,
218
+ resourceName: resource.getResourceName() || collection.name,
219
+ actionName: 'update',
220
+ recordPkValue,
221
+ allowedActions: resource.getMeta('allowedActions'),
222
+ fields: [collectionField.name],
223
+ });
224
+ }
225
+
197
226
  getColumnProps(): TableColumnProps & { sortField?: string } {
198
227
  if (!this.props.width) {
199
228
  return;
@@ -250,7 +279,7 @@ export class TableColumnModel extends DisplayItemModel {
250
279
  record,
251
280
  recordIndex: record?.__index || recordIndex,
252
281
  width: this.props.width - 16,
253
- editable: this.props.editable,
282
+ editable: this.canQuickEdit(record),
254
283
  dataIndex: this.props.dataIndex,
255
284
  title: this.props.title,
256
285
  overflowMode: this.props.overflowMode,
@@ -9,8 +9,20 @@
9
9
 
10
10
  import { FlowEngine, MultiRecordResource } from '@nocobase/flow-engine';
11
11
  import { describe, expect, it } from 'vitest';
12
+ import { TableBlockModel } from '../TableBlockModel';
12
13
 
13
14
  describe('TableBlockModel quick edit refresh', () => {
15
+ it('requests record-level ACL metadata for table data', () => {
16
+ const engine = new FlowEngine();
17
+ const model = {
18
+ context: engine.context,
19
+ };
20
+
21
+ const resource = TableBlockModel.prototype.createResource.call(model, {}, {});
22
+
23
+ expect(resource.getRequestOptions().headers['X-With-ACL-Meta']).toBe('true');
24
+ });
25
+
14
26
  it('updates table data through a new array reference after quick editing a flat row', () => {
15
27
  const engine = new FlowEngine();
16
28
  const resource = engine.context.createResource(MultiRecordResource);
@@ -66,6 +66,39 @@ describe('TableColumnModel sorter settings', () => {
66
66
  expect(setProps).toHaveBeenCalledWith('editable', false);
67
67
  });
68
68
 
69
+ it('checks record update scope and field permission before enabling quick edit', () => {
70
+ const can = vi.fn(() => false);
71
+ const model = {
72
+ props: { editable: true },
73
+ collectionField: { name: 'title' },
74
+ context: {
75
+ skipAclCheck: false,
76
+ acl: { can },
77
+ blockModel: {
78
+ collection: {
79
+ dataSourceKey: 'main',
80
+ name: 'posts',
81
+ getFilterByTK: () => 2,
82
+ },
83
+ resource: {
84
+ getResourceName: () => 'posts',
85
+ getMeta: () => ({ update: [1] }),
86
+ },
87
+ },
88
+ },
89
+ };
90
+
91
+ expect(TableColumnModel.prototype.canQuickEdit.call(model, { id: 2 })).toBe(false);
92
+ expect(can).toHaveBeenCalledWith({
93
+ dataSourceKey: 'main',
94
+ resourceName: 'posts',
95
+ actionName: 'update',
96
+ recordPkValue: 2,
97
+ allowedActions: { update: [1] },
98
+ fields: ['title'],
99
+ });
100
+ });
101
+
69
102
  it('hides sortable setting for association fields', async () => {
70
103
  const engine = new FlowEngine();
71
104
  const model = new TableColumnModel({ uid: 'table-column-association-sorter', flowEngine: engine } as any);
@@ -102,7 +102,7 @@ const RenderCell = observer<any>((props) => {
102
102
  transform: translateY(-50%);
103
103
  }
104
104
  &:hover {
105
- background: rgba(24, 144, 255, 0.1) !important;
105
+ box-shadow: inset 0 0 0 9999px rgba(24, 144, 255, 0.1);
106
106
  }
107
107
  &:hover .edit-icon {
108
108
  display: inline-flex;
@@ -126,6 +126,7 @@ const RenderCell = observer<any>((props) => {
126
126
  fieldPath: dataIndex,
127
127
  record: record,
128
128
  fieldProps: { ...columnModel.props, ...columnModel.subModels.field.props },
129
+ sourceFieldModelUid: columnModel.subModels.field.uid,
129
130
  onOk: (values) => {
130
131
  record[dataIndex] = values[dataIndex];
131
132
  // 仅重渲染单元格
@@ -17,6 +17,8 @@ import { DateTimeNoTzPicker } from '../DateTimeNoTzFieldModel';
17
17
  let capturedDatePickerProps: any;
18
18
  let currentForm: any;
19
19
  const mockResolveJsonTemplate = vi.fn();
20
+ const mockRunjs = vi.fn();
21
+ const mockLoggerWarn = vi.fn();
20
22
 
21
23
  vi.mock('@nocobase/flow-engine', async (importOriginal) => {
22
24
  const actual = await importOriginal<typeof import('@nocobase/flow-engine')>();
@@ -32,6 +34,10 @@ vi.mock('@nocobase/flow-engine', async (importOriginal) => {
32
34
  }),
33
35
  useFlowContext: () => ({
34
36
  resolveJsonTemplate: mockResolveJsonTemplate,
37
+ runjs: mockRunjs,
38
+ logger: {
39
+ warn: mockLoggerWarn,
40
+ },
35
41
  }),
36
42
  };
37
43
  });
@@ -64,6 +70,9 @@ describe('DateTimeNoTzPicker date range limit', () => {
64
70
  currentForm = undefined;
65
71
  capturedDatePickerProps = undefined;
66
72
  mockResolveJsonTemplate.mockReset();
73
+ mockRunjs.mockReset();
74
+ mockLoggerWarn.mockReset();
75
+ mockRunjs.mockResolvedValue({ success: true, value: undefined });
67
76
  mockResolveJsonTemplate.mockImplementation(async (params) => ({
68
77
  ...params,
69
78
  _maxDate: currentForm?.getFieldValue?.('b'),
@@ -239,4 +248,144 @@ describe('DateTimeNoTzPicker date range limit', () => {
239
248
  expect(timeConfig?.disabledMinutes?.(12)).toEqual([]);
240
249
  expect(timeConfig?.disabledSeconds?.(12, 34)).toEqual([]);
241
250
  });
251
+
252
+ it('evaluates RunJS before applying minDate', async () => {
253
+ const code = 'return new Date("2026-05-10T08:09:10.000Z").toISOString();';
254
+ mockRunjs.mockResolvedValue({ success: true, value: '2026-05-10T08:09:10.000Z' });
255
+ mockResolveJsonTemplate.mockImplementation(async (params) => params);
256
+
257
+ render(<TestWrapper picker="date" showTime _minDate={{ code, version: 'v2' }} onChange={vi.fn()} value={null} />);
258
+
259
+ await waitFor(() => {
260
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-09 00:00:00'))).toBe(true);
261
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-10 00:00:00'))).toBe(false);
262
+ });
263
+
264
+ expect(mockRunjs.mock.calls[0]?.[0]).toBe(code);
265
+ expect(mockRunjs.mock.calls[0]?.[2]).toEqual({ version: 'v2' });
266
+ expect(mockResolveJsonTemplate).toHaveBeenCalledWith({
267
+ _minDate: '2026-05-10T08:09:10.000Z',
268
+ _maxDate: undefined,
269
+ });
270
+ });
271
+
272
+ it('supports a RunJS minDate together with a variable maxDate', async () => {
273
+ mockRunjs.mockResolvedValue({ success: true, value: '2026-05-10 08:00:00' });
274
+ mockResolveJsonTemplate.mockImplementation(async (params) => ({
275
+ ...params,
276
+ _maxDate: '2026-05-12 18:30:40',
277
+ }));
278
+
279
+ render(
280
+ <TestWrapper
281
+ picker="date"
282
+ showTime
283
+ _minDate={{ code: 'return "2026-05-10 08:00:00";', version: 'v2' }}
284
+ _maxDate={'{{ $nForm.max }}'}
285
+ onChange={vi.fn()}
286
+ value={null}
287
+ />,
288
+ );
289
+
290
+ await waitFor(() => {
291
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-09 00:00:00'))).toBe(true);
292
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-13 00:00:00'))).toBe(true);
293
+ });
294
+
295
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-11 00:00:00'))).toBe(false);
296
+ });
297
+
298
+ it('clears stale restrictions when RunJS execution fails', async () => {
299
+ mockResolveJsonTemplate.mockImplementation(async (params) => params);
300
+ mockRunjs.mockImplementation(async (code) => {
301
+ if (code === 'throw new Error("failed");') {
302
+ return { success: false, error: new Error('failed') };
303
+ }
304
+ return { success: true, value: '2026-05-10 08:00:00' };
305
+ });
306
+
307
+ const view = render(
308
+ <TestWrapper
309
+ picker="date"
310
+ showTime
311
+ _minDate={{ code: 'return "2026-05-10 08:00:00";', version: 'v2' }}
312
+ onChange={vi.fn()}
313
+ value={null}
314
+ />,
315
+ );
316
+
317
+ await waitFor(() => {
318
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-09 00:00:00'))).toBe(true);
319
+ });
320
+
321
+ view.rerender(
322
+ <TestWrapper
323
+ picker="date"
324
+ showTime
325
+ _minDate={{ code: 'throw new Error("failed");', version: 'v2' }}
326
+ onChange={vi.fn()}
327
+ value={null}
328
+ />,
329
+ );
330
+
331
+ await waitFor(() => {
332
+ expect(mockLoggerWarn).toHaveBeenCalled();
333
+ expect(capturedDatePickerProps?.minDate).toBeNull();
334
+ expect(capturedDatePickerProps?.disabledDate).toBeNull();
335
+ expect(capturedDatePickerProps?.disabledTime).toBeNull();
336
+ });
337
+ });
338
+
339
+ it('keeps the latest RunJS result when an earlier execution finishes later', async () => {
340
+ const slowResolvers: Array<(result: { success: boolean; value: string }) => void> = [];
341
+ mockResolveJsonTemplate.mockImplementation(async (params) => params);
342
+ mockRunjs.mockImplementation((code) => {
343
+ if (code === 'return "slow";') {
344
+ return new Promise((resolve) => {
345
+ slowResolvers.push(resolve);
346
+ });
347
+ }
348
+ return Promise.resolve({ success: true, value: '2026-06-01 00:00:00' });
349
+ });
350
+
351
+ const view = render(
352
+ <TestWrapper
353
+ picker="date"
354
+ showTime
355
+ _minDate={{ code: 'return "slow";', version: 'v2' }}
356
+ onChange={vi.fn()}
357
+ value={null}
358
+ />,
359
+ );
360
+
361
+ await waitFor(() => {
362
+ expect(slowResolvers.length).toBeGreaterThan(0);
363
+ });
364
+
365
+ view.rerender(
366
+ <TestWrapper
367
+ picker="date"
368
+ showTime
369
+ _minDate={{ code: 'return "fast";', version: 'v2' }}
370
+ onChange={vi.fn()}
371
+ value={null}
372
+ />,
373
+ );
374
+
375
+ await waitFor(() => {
376
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-05-31 00:00:00'))).toBe(true);
377
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-07-01 00:00:00'))).toBe(false);
378
+ });
379
+
380
+ slowResolvers.forEach((resolve) => resolve({ success: true, value: '2026-12-01 00:00:00' }));
381
+
382
+ await waitFor(() => {
383
+ expect(mockResolveJsonTemplate).toHaveBeenCalledWith({
384
+ _minDate: '2026-12-01 00:00:00',
385
+ _maxDate: undefined,
386
+ });
387
+ });
388
+
389
+ expect(capturedDatePickerProps?.disabledDate?.(dayjs('2026-07-01 00:00:00'))).toBe(false);
390
+ });
242
391
  });
@@ -8,140 +8,176 @@
8
8
  */
9
9
 
10
10
  import { autorun } from '@formily/reactive';
11
- import { Form } from 'antd';
12
- import { useFlowContext } from '@nocobase/flow-engine';
11
+ import { Form, type FormInstance } from 'antd';
12
+ import { resolveRunJSObjectValues, useFlowContext } from '@nocobase/flow-engine';
13
13
  import { dayjs } from '@nocobase/utils/client';
14
+ import type { ConfigType, Dayjs } from 'dayjs';
14
15
  import { first, last } from 'lodash';
15
- import React, { useEffect, useRef, useState } from 'react';
16
+ import { useCallback, useEffect, useRef, useState } from 'react';
16
17
 
17
18
  type DateLimitProps = {
18
- _minDate?: any;
19
- _maxDate?: any;
20
- currentForm?: any;
19
+ _minDate?: unknown;
20
+ _maxDate?: unknown;
21
+ currentForm?: unknown;
21
22
  };
22
23
 
23
- export function useDateLimit(props: DateLimitProps) {
24
- const ctx = useFlowContext();
25
- const isAntdFormInstance = typeof props.currentForm?.getFieldsValue === 'function';
26
- const currentFormValues = Form.useWatch([], isAntdFormInstance ? props.currentForm : undefined);
27
- const [minDate, setMinDate] = useState<dayjs.Dayjs | null>(null);
28
- const [maxDate, setMaxDate] = useState<dayjs.Dayjs | null>(null);
29
- const [disabledDate, setDisabledDate] = useState<any>(null);
30
- const [disabledTime, setDisabledTime] = useState<any>(null);
31
- const disposeRef = useRef<any>(null);
24
+ type DisabledTimeConfig = {
25
+ disabledHours: () => number[];
26
+ disabledMinutes: (selectedHour: number) => number[];
27
+ disabledSeconds: (selectedHour: number, selectedMinute: number) => number[];
28
+ };
32
29
 
33
- useEffect(() => {
34
- if (disposeRef.current) {
35
- disposeRef.current();
36
- }
30
+ type DisabledDate = (current: Dayjs) => boolean;
31
+ type DisabledTime = (current: Dayjs | null) => DisabledTimeConfig;
37
32
 
38
- disposeRef.current = autorun(() => {
39
- void limitDate();
40
- });
33
+ function isAntdFormInstance(value: unknown): value is FormInstance {
34
+ if (!value || typeof value !== 'object') return false;
35
+ return typeof (value as Partial<FormInstance>).getFieldsValue === 'function';
36
+ }
41
37
 
42
- return () => {
43
- disposeRef.current?.();
44
- };
45
- }, [ctx, currentFormValues, props._maxDate, props._minDate]);
38
+ function parseDateLimitValue(value: unknown): Dayjs | null {
39
+ if (!value) return null;
40
+ const parsed = dayjs(value as ConfigType);
41
+ return parsed.isValid() ? parsed : null;
42
+ }
46
43
 
47
- const limitDate = async () => {
48
- const resolvedParams = await ctx.resolveJsonTemplate({
49
- _minDate: props._minDate,
50
- _maxDate: props._maxDate,
51
- });
44
+ export function useDateLimit(props: DateLimitProps) {
45
+ const ctx = useFlowContext();
46
+ const currentForm = isAntdFormInstance(props.currentForm) ? props.currentForm : undefined;
47
+ const currentFormValues = Form.useWatch([], currentForm);
48
+ const [minDate, setMinDate] = useState<Dayjs | null>(null);
49
+ const [maxDate, setMaxDate] = useState<Dayjs | null>(null);
50
+ const [disabledDate, setDisabledDate] = useState<DisabledDate | null>(null);
51
+ const [disabledTime, setDisabledTime] = useState<DisabledTime | null>(null);
52
+ const evaluationIdRef = useRef(0);
53
+
54
+ const limitDate = useCallback(async () => {
55
+ const evaluationId = ++evaluationIdRef.current;
56
+
57
+ try {
58
+ const runJSResolvedParams = await resolveRunJSObjectValues(ctx, {
59
+ _minDate: props._minDate,
60
+ _maxDate: props._maxDate,
61
+ });
62
+ const resolvedParams = (await ctx.resolveJsonTemplate({
63
+ _minDate: runJSResolvedParams._minDate,
64
+ _maxDate: runJSResolvedParams._maxDate,
65
+ })) as { _minDate?: unknown; _maxDate?: unknown };
66
+
67
+ if (evaluationId !== evaluationIdRef.current) return;
68
+
69
+ const nextMinRaw = Array.isArray(resolvedParams?._minDate)
70
+ ? first(resolvedParams._minDate)
71
+ : resolvedParams?._minDate;
72
+ const nextMaxRaw = Array.isArray(resolvedParams?._maxDate)
73
+ ? last(resolvedParams._maxDate)
74
+ : resolvedParams?._maxDate;
75
+ const nextMinDate = parseDateLimitValue(nextMinRaw);
76
+ const nextMaxDate = parseDateLimitValue(nextMaxRaw);
77
+
78
+ setMinDate(nextMinDate);
79
+ setMaxDate(nextMaxDate);
80
+
81
+ const fullTimeArr = Array.from({ length: 60 }, (_, i) => i);
82
+
83
+ const nextDisabledDate: DisabledDate = (current) => {
84
+ if (!dayjs.isDayjs(current)) return false;
85
+
86
+ const min = nextMinDate?.startOf('day') || null;
87
+ const max = nextMaxDate?.endOf('day') || null;
88
+
89
+ if (min && current.startOf('day').isBefore(min)) {
90
+ return true;
91
+ }
92
+ if (max && current.startOf('day').isAfter(max)) {
93
+ return true;
94
+ }
95
+ return false;
96
+ };
52
97
 
53
- const nextMinRaw = Array.isArray(resolvedParams?._minDate)
54
- ? first(resolvedParams._minDate)
55
- : resolvedParams?._minDate;
56
- const nextMaxRaw = Array.isArray(resolvedParams?._maxDate)
57
- ? last(resolvedParams._maxDate)
58
- : resolvedParams?._maxDate;
59
- const nextMinDate = nextMinRaw ? dayjs(nextMinRaw) : null;
60
- const nextMaxDate = nextMaxRaw ? dayjs(nextMaxRaw) : null;
61
-
62
- setMinDate(nextMinDate?.isValid?.() ? nextMinDate : null);
63
- setMaxDate(nextMaxDate?.isValid?.() ? nextMaxDate : null);
64
-
65
- const fullTimeArr = Array.from({ length: 60 }, (_, i) => i);
66
-
67
- const nextDisabledDate = (current: dayjs.Dayjs) => {
68
- if (!dayjs.isDayjs(current)) return false;
69
-
70
- const min = nextMinDate?.isValid?.() ? nextMinDate.startOf('day') : null;
71
- const max = nextMaxDate?.isValid?.() ? nextMaxDate.endOf('day') : null;
72
-
73
- if (min && current.startOf('day').isBefore(min)) {
74
- return true;
75
- }
76
- if (max && current.startOf('day').isAfter(max)) {
77
- return true;
78
- }
79
- return false;
80
- };
98
+ const nextDisabledTime: DisabledTime = (current) => {
99
+ if (!current || (!nextMinDate && !nextMaxDate)) {
100
+ return { disabledHours: () => [], disabledMinutes: () => [], disabledSeconds: () => [] };
101
+ }
81
102
 
82
- const nextDisabledTime = (current: dayjs.Dayjs) => {
83
- if (!current || (!nextMinDate?.isValid?.() && !nextMaxDate?.isValid?.())) {
84
- return { disabledHours: () => [], disabledMinutes: () => [], disabledSeconds: () => [] };
85
- }
103
+ const isCurrentMinDay = !!nextMinDate && current.isSame(nextMinDate, 'day');
104
+ const isCurrentMaxDay = !!nextMaxDate && current.isSame(nextMaxDate, 'day');
86
105
 
87
- const isCurrentMinDay = !!nextMinDate?.isValid?.() && current.isSame(nextMinDate, 'day');
88
- const isCurrentMaxDay = !!nextMaxDate?.isValid?.() && current.isSame(nextMaxDate, 'day');
106
+ const disabledHours = () => {
107
+ const hours = [];
108
+ if (isCurrentMinDay && nextMinDate) {
109
+ for (let hour = 0; hour < nextMinDate.hour(); hour++) {
110
+ hours.push(hour);
111
+ }
112
+ }
113
+ if (isCurrentMaxDay && nextMaxDate) {
114
+ for (let hour = nextMaxDate.hour() + 1; hour < 24; hour++) {
115
+ hours.push(hour);
116
+ }
117
+ }
118
+ return hours;
119
+ };
89
120
 
90
- const disabledHours = () => {
91
- const hours = [];
92
- if (isCurrentMinDay && nextMinDate) {
93
- for (let hour = 0; hour < nextMinDate.hour(); hour++) {
94
- hours.push(hour);
121
+ const disabledMinutes = (selectedHour: number) => {
122
+ if (isCurrentMinDay && nextMinDate && selectedHour === nextMinDate.hour()) {
123
+ return fullTimeArr.filter((minute) => minute < nextMinDate.minute());
95
124
  }
96
- }
97
- if (isCurrentMaxDay && nextMaxDate) {
98
- for (let hour = nextMaxDate.hour() + 1; hour < 24; hour++) {
99
- hours.push(hour);
125
+ if (isCurrentMaxDay && nextMaxDate && selectedHour === nextMaxDate.hour()) {
126
+ return fullTimeArr.filter((minute) => minute > nextMaxDate.minute());
100
127
  }
101
- }
102
- return hours;
128
+ return [];
129
+ };
130
+
131
+ const disabledSeconds = (selectedHour: number, selectedMinute: number) => {
132
+ if (
133
+ isCurrentMinDay &&
134
+ nextMinDate &&
135
+ selectedHour === nextMinDate.hour() &&
136
+ selectedMinute === nextMinDate.minute()
137
+ ) {
138
+ return fullTimeArr.filter((second) => second < nextMinDate.second());
139
+ }
140
+ if (
141
+ isCurrentMaxDay &&
142
+ nextMaxDate &&
143
+ selectedHour === nextMaxDate.hour() &&
144
+ selectedMinute === nextMaxDate.minute()
145
+ ) {
146
+ return fullTimeArr.filter((second) => second > nextMaxDate.second());
147
+ }
148
+ return [];
149
+ };
150
+
151
+ return {
152
+ disabledHours,
153
+ disabledMinutes,
154
+ disabledSeconds,
155
+ };
103
156
  };
104
157
 
105
- const disabledMinutes = (selectedHour: number) => {
106
- if (isCurrentMinDay && nextMinDate && selectedHour === nextMinDate.hour()) {
107
- return fullTimeArr.filter((minute) => minute < nextMinDate.minute());
108
- }
109
- if (isCurrentMaxDay && nextMaxDate && selectedHour === nextMaxDate.hour()) {
110
- return fullTimeArr.filter((minute) => minute > nextMaxDate.minute());
111
- }
112
- return [];
113
- };
158
+ setDisabledDate(() => nextDisabledDate);
159
+ setDisabledTime(() => nextDisabledTime);
160
+ } catch (error) {
161
+ if (evaluationId !== evaluationIdRef.current) return;
114
162
 
115
- const disabledSeconds = (selectedHour: number, selectedMinute: number) => {
116
- if (
117
- isCurrentMinDay &&
118
- nextMinDate &&
119
- selectedHour === nextMinDate.hour() &&
120
- selectedMinute === nextMinDate.minute()
121
- ) {
122
- return fullTimeArr.filter((second) => second < nextMinDate.second());
123
- }
124
- if (
125
- isCurrentMaxDay &&
126
- nextMaxDate &&
127
- selectedHour === nextMaxDate.hour() &&
128
- selectedMinute === nextMaxDate.minute()
129
- ) {
130
- return fullTimeArr.filter((second) => second > nextMaxDate.second());
131
- }
132
- return [];
133
- };
163
+ ctx.logger?.warn?.({ err: error }, 'Failed to resolve date range limit');
164
+ setMinDate(null);
165
+ setMaxDate(null);
166
+ setDisabledDate(null);
167
+ setDisabledTime(null);
168
+ }
169
+ }, [ctx, props._maxDate, props._minDate]);
134
170
 
135
- return {
136
- disabledHours,
137
- disabledMinutes,
138
- disabledSeconds,
139
- };
140
- };
171
+ useEffect(() => {
172
+ const dispose = autorun(() => {
173
+ limitDate();
174
+ });
141
175
 
142
- setDisabledDate(() => nextDisabledDate);
143
- setDisabledTime(() => nextDisabledTime);
144
- };
176
+ return () => {
177
+ evaluationIdRef.current += 1;
178
+ dispose();
179
+ };
180
+ }, [currentFormValues, limitDate]);
145
181
 
146
182
  return {
147
183
  minDate,
@@ -13,6 +13,22 @@ import JSON5 from 'json5';
13
13
  import React, { useState, useEffect, useRef } from 'react';
14
14
  import { FieldModel } from '../base/FieldModel';
15
15
 
16
+ const jsonValidationRuleMarker = '__jsonSyntaxValidation';
17
+
18
+ interface JsonValidationRule {
19
+ [jsonValidationRuleMarker]: true;
20
+ type: 'any';
21
+ validator?: (_rule: unknown, value: unknown) => Promise<void>;
22
+ }
23
+
24
+ function isRuleObject(rule: unknown): rule is Record<string, unknown> {
25
+ return typeof rule === 'object' && rule !== null;
26
+ }
27
+
28
+ function isJsonValidationRule(rule: unknown): rule is JsonValidationRule {
29
+ return isRuleObject(rule) && rule[jsonValidationRuleMarker] === true;
30
+ }
31
+
16
32
  const jsonCss = css`
17
33
  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
18
34
  font-size: 14px;
@@ -40,7 +56,7 @@ export const JsonInput = observer((props: any) => {
40
56
  }
41
57
 
42
58
  internalChange.current = false;
43
- }, [value]);
59
+ }, [_JSON, space, value]);
44
60
 
45
61
  // 用户输入时
46
62
  const handleChange = (ev) => {
@@ -91,23 +107,30 @@ JsonFieldModel.registerFlow({
91
107
  key: 'jsonInitSetting',
92
108
  steps: {
93
109
  initValidation: {
94
- handler(ctx, params) {
95
- const rules = ctx.model.parent.props.rules || [];
110
+ handler(ctx) {
111
+ const currentRules = Array.isArray(ctx.model.parent.props.rules) ? ctx.model.parent.props.rules : [];
112
+ const rules = currentRules.filter((rule: unknown) => {
113
+ return (!isRuleObject(rule) || Object.keys(rule).length > 0) && !isJsonValidationRule(rule);
114
+ });
96
115
  // 添加 JSON 语法校验规则
97
116
  rules.push({
98
- validator: (_, value) => {
117
+ // validator 函数序列化后会被丢弃;保留 any 类型可避免持久化规则退化为默认字符串校验。
118
+ type: 'any',
119
+ [jsonValidationRuleMarker]: true,
120
+ validator: (_rule: unknown, value: unknown) => {
99
121
  // 允许空
100
122
  if (value === null || value === undefined || value === '') return Promise.resolve();
101
123
  // 如果已经是对象/数组,直接通过
102
124
  if (typeof value === 'object') return Promise.resolve();
103
125
  try {
104
- JSON.parse(value);
126
+ JSON.parse(String(value));
105
127
  return Promise.resolve();
106
- } catch (err) {
107
- return Promise.reject(ctx.t('Invalid JSON format') + ': ' + err.message);
128
+ } catch (error) {
129
+ const message = error instanceof Error ? error.message : String(error);
130
+ return Promise.reject(ctx.t('Invalid JSON format') + ': ' + message);
108
131
  }
109
132
  },
110
- });
133
+ } satisfies JsonValidationRule);
111
134
  ctx.model.parent.setProps({
112
135
  rules,
113
136
  });
@@ -48,12 +48,12 @@ export class VariableFieldFormModel extends FlowModel {
48
48
  <FormProvider form={this.form}>
49
49
  <FormLayout layout={'vertical'}>
50
50
  {this.mapSubModels('fields', (field) => {
51
- // 确保字段模型具备稳定的 id/name,便于依赖路径的组件(如公式字段)正确解析
51
+ // Avoid conflicting with the DOM nodeName property when rendering the temporary input.
52
52
  const init = field?.getStepParams?.('fieldSettings', 'init') || {};
53
53
  const fp = init?.fieldPath as string | undefined;
54
54
  if (fp) {
55
- const namePath = fp.includes('.') ? fp.split('.') : [fp];
56
- const toSet: any = {};
55
+ const namePath = (fp === 'nodeName' ? '__nb_variable_field_nodeName' : fp).split('.');
56
+ const toSet: Record<string, unknown> = {};
57
57
  if (!field?.props?.id) toSet.id = namePath;
58
58
  if (!field?.props?.name) toSet.name = namePath;
59
59
  if (Object.keys(toSet).length) field?.setProps?.(toSet);