7620 Commits

Author SHA1 Message Date
aaaaaajie
bd87d74ce1 refactor: enhance role merging logic: prioritize strategy actions over existing actions 2025-04-01 17:38:06 +08:00
nocobase[bot]
219a5875b8 Merge branch 'main' into next 2025-04-01 05:25:32 +00:00
Junyi
4c3255d455
feat(database): add trim option for string field (#6565)
* feat(database): add trim option for string field

* refactor(database): change to setDataValue instead of hooks

* fix(database): fix test case of view collection
2025-04-01 13:25:08 +08:00
nocobase[bot]
4f5097f3a1 Merge branch 'main' into next 2025-04-01 03:38:37 +00:00
Katherine
69fac11204
fix: oneToMa ny e2e test (#6601) 2025-04-01 11:38:15 +08:00
nocobase[bot]
e3c82ecf13 Merge branch 'main' into next 2025-04-01 03:01:21 +00:00
YANG QIA
04e943a0b2
fix(m2m-array): error of filtering by fields in an association collection with a m2m array field (#6596)
* fix(m2m-array): error of filtering by fields in an association collection with a m2m array field

* test: add test

* feat: generateJoinOnForJSONArray
2025-04-01 11:00:59 +08:00
nocobase[bot]
5e70257416 Merge branch 'main' into next 2025-04-01 00:34:28 +00:00
Junyi
ce28c68018
refactor(plugin-workflow): improve code of schedule trigger (#6589) 2025-04-01 08:34:06 +08:00
nocobase[bot]
f5e0f41ecd Merge branch 'main' into next 2025-03-31 14:51:42 +00:00
Junyi
4ef6b9037d
fix(plugin-workflow): fix sync option display incorrectly (#6595) 2025-03-31 22:51:19 +08:00
Katherine
cb96426ecd
feat: support configuring colon visibility in form field labels based on layout (#6561)
* feat:  support hiding colons in form field labels

* refactor: colon default value
2025-03-31 20:11:36 +08:00
nocobase[bot]
591bdc0c73 Merge branch 'main' into next 2025-03-31 07:19:05 +00:00
chenos
c178c215a9 fix: to error message 2025-03-31 15:18:09 +08:00
Katherine
39a07fe546
fix: build error for action props (#6594) 2025-03-31 14:59:14 +08:00
nocobase[bot]
963681b809 Merge branch 'main' into next 2025-03-31 06:42:41 +00:00
Katherine
a7775c25db
fix: association field (select) displaying N/A when exposing related collection fields (#6582)
* fix: association field (select) displaying N/A when exposing related collection fields

* fix: cascade issue: 'The value of xxx cannot be in array format' when deleting and re-selecting

* fix: bug
2025-03-31 14:42:16 +08:00
nocobase[bot]
c94bc96f86 Merge branch 'main' into next 2025-03-31 04:53:49 +00:00
YANG QIA
febaef9cf9
fix(auth): token assignment in AuthProvider (#6593) 2025-03-31 12:53:25 +08:00
Katherine
22f521cf72
fix: submit and refresh buttons not displaying icon-only mode correctly (#6592) 2025-03-31 10:25:26 +08:00
nocobase[bot]
6cb5bcee92 Merge branch 'main' into next 2025-03-31 01:46:36 +00:00
Katherine
19a263ff5a
fix: prevent map management from passing required validation with space input (#6575) 2025-03-31 09:46:13 +08:00
nocobase[bot]
dfc0a2411a Merge branch 'main' into next 2025-03-31 01:27:33 +00:00
Katherine
c16d65ba7c
fix: cascade issue: 'The value of xxx cannot be in array format' when deleting and re-selecting (#6585)
* fix: cascade  issue: 'The value of xxx cannot be in array format' when deleting and re-selecting

* fix: bug

* fix: bug
2025-03-31 09:27:06 +08:00
nocobase[bot]
26e30489da chore(versions): 😊 publish v1.6.14 2025-03-29 03:46:43 +00:00
nocobase[bot]
1d40bd1b8a chore(versions): 😊 publish v1.7.0-beta.12 2025-03-28 11:44:46 +00:00
nocobase[bot]
949db31725 Merge branch 'main' into next 2025-03-28 10:04:59 +00:00
Katherine
8e90850e14
fix: missing data on boundary dates in weekly calendar view (#6587) 2025-03-28 18:04:35 +08:00
nocobase[bot]
92cfafa70c Merge branch 'main' into next 2025-03-28 09:11:53 +00:00
nocobase[bot]
cf09e64821 chore(versions): 😊 publish v1.6.13 2025-03-28 09:11:21 +00:00
nocobase[bot]
85082b84a3 Merge branch 'main' into next 2025-03-28 07:45:08 +00:00
Katherine
b86ea5dd61
fix: error when downloading async migration file (#6586) 2025-03-28 15:44:45 +08:00
chenos
9d3317fc45 Merge branch 'main' into next
# Conflicts:
#	packages/presets/nocobase/package.json
2025-03-28 15:00:16 +08:00
Katherine
28c633e369
fix: error in migration task popup during async export (#6584) 2025-03-28 13:58:16 +08:00
Sheldon Guo
d94c365e30
feat(qrcode-scanner): add an onScanSuccess callback to handle successful scans and exit the camera UI (#6580)
* fix(demos): set authentication token for mock API client in DesktopMode-basic

* feat(qrcode-scanner): add onScanSuccess callback to handle successful scans

* fix: include onScanSuccess in dependency array of useScanner hook

* fix: refactor onScanSuccess handling in QRCodeScanner and useScanner
2025-03-28 13:28:03 +08:00
Katherine
1492a03f6e
fix: error in migration task popup during async export (#6583) 2025-03-28 12:57:00 +08:00
chenos
6bb754612c
feat: locale tester (#6576)
* feat: locale tester

* fix: locale

* fix: acl.registerSnippet

* feat: package.json

* fix: locale
2025-03-28 12:39:44 +08:00
Zeke Zhang
9eaa47863d
fix: remove refreshComponent in Grid component (#6578)
* fix: remove refreshComponent in Grid component

* test: add e2e test for modal content persistence after reopening
2025-03-28 12:01:13 +08:00
nocobase[bot]
93a7035230 Merge branch 'main' into next 2025-03-28 03:01:43 +00:00
chenos
1b782c4f95
refactor: async tasks (#6531)
* refactor: async tasks

* refactor: selectWithTitle support optionRender

* refactor: adjust export filename

* fix: build error

* fix: export file name

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2025-03-28 11:01:20 +08:00
ajie
e59cec0e69
fix: incorrect current role assignment during login (#6581)
* fix: incorrect current role assignment during login
2025-03-28 11:00:29 +08:00
nocobase[bot]
220321ac4e Merge branch 'main' into next 2025-03-27 15:00:34 +00:00
Katherine
eba3f79134
fix: linkage conflict between same-named association fields in different sub-tables within the same form (#6577)
* fix: linkage conflict between same-named association fields in different sub-tables within same form

* fix: bug
2025-03-27 23:00:04 +08:00
nocobase[bot]
aad023cfc0 chore(versions): 😊 publish v1.6.12 2025-03-27 12:58:32 +00:00
nocobase[bot]
ab6440c2a9 Merge branch 'main' into next 2025-03-27 10:52:42 +00:00
mytharcher
5f85b9ab9a fix(plugin-file-manager): fix error of getting file key when path is null 2025-03-27 18:51:52 +08:00
nocobase[bot]
c9f37e61e5 chore(versions): 😊 publish v1.7.0-beta.11 2025-03-27 10:10:25 +00:00
nocobase[bot]
45e6e7d448 chore(versions): 😊 publish v1.7.0-beta.10 2025-03-27 06:10:23 +00:00
nocobase[bot]
8773912c34 chore(versions): 😊 publish v1.6.11 2025-03-27 04:21:59 +00:00
Junyi
2aa892a716
refactor(plugin-workflow): split executed columns to stats tables (#6534)
* refactor(plugin-workflow): split executed columns to stats table

* fix(plugin-workflow): fix client executed

* fix(plugin-workflow): fix test case

* fix(plugin-workflow): fix migration

* chore(plugin-workflow): remove unused file

* chore(plugin-workflow): remove stashed code
2025-03-27 11:30:17 +08:00