3887 Commits

Author SHA1 Message Date
nocobase[bot]
461525353b Merge branch 'next' into develop 2025-04-30 10:30:06 +00:00
Katherine
86b6603b1d
feat: support variables in secondary confirmation title and content (#6787)
* feat: support variables in secondary confirmation title and content

* fix: bug

* fix: build error

* fix: e2e

* fix: test

* fix: test

* fix: test

* fix: test

* fix: bug

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test
2025-04-30 18:29:42 +08:00
nocobase[bot]
3a292cb2e4 Merge branch 'next' into develop 2025-04-30 02:36:31 +00:00
Katherine
1814835ec5
fix: build error (#6812) 2025-04-30 10:36:08 +08:00
nocobase[bot]
d2782db48b Merge branch 'next' into develop 2025-04-30 01:55:59 +00:00
katherinehhh
d4259214fc Merge branch 'main' into next 2025-04-30 09:54:17 +08:00
nocobase[bot]
7e5980c7af Merge branch 'next' into develop 2025-04-30 01:42:58 +00:00
gchust
b164d9a2fa
fix: incorrect variable selection when first click to load data (#6802)
* fix: incorrect variable selection when first click to load data

* Revert "fix: incorrect variable selection when first click to load data"

This reverts commit 0caa9a84b15c51cf87e03819c51b79d8be3e99e9.

* fix: e2e tests
2025-04-30 09:42:35 +08:00
Katherine
fd8606e69e
fix: duplicate validation error messages for rule violations in form field (#6805) 2025-04-30 09:36:05 +08:00
Katherine
fe005e091a
fix: ssue with configuring linkage rules in subform (popup) within subtable (#6803) 2025-04-30 09:35:26 +08:00
Sheldon Guo
b07f8a8768
feat: support placeholder (#6670) 2025-04-30 08:48:31 +08:00
nocobase[bot]
8d8cbb2db2 Merge branch 'next' into develop 2025-04-29 23:43:03 +00:00
nocobase[bot]
b98a9a97e8 Merge branch 'main' into next 2025-04-29 23:42:41 +00:00
Zeke Zhang
db88e8301f
fix: exclude 'attachmentURL' from associated form item filter (#6809) 2025-04-30 07:42:18 +08:00
nocobase[bot]
09c53403eb chore(versions): 😊 publish v1.6.25 2025-04-29 11:57:38 +00:00
nocobase[bot]
f009420588 Merge branch 'next' into develop 2025-04-29 06:36:35 +00:00
katherinehhh
08bd9fa8a8 Merge branch 'main' into next 2025-04-29 14:35:36 +08:00
Katherine
4f06ebcdd2
style: optimize subtable add button style and align paginator on the same row (#6790) 2025-04-29 11:07:17 +08:00
nocobase[bot]
b09464234d Merge branch 'next' into develop 2025-04-28 14:34:03 +00:00
Katherine
bd077d5cc2
fix: field linkage rules not working for subform (popup) in subtable (#6800) 2025-04-28 22:33:38 +08:00
nocobase[bot]
94d4f1f8fe Merge branch 'next' into develop 2025-04-28 11:28:02 +00:00
nocobase[bot]
cfbd0d6fbb Merge branch 'main' into next 2025-04-28 11:27:38 +00:00
Katherine
a28e1d2c39
fix: association field not submitting data when displaying field from related collection (#6798) 2025-04-28 19:27:16 +08:00
nocobase[bot]
2b4257d1c5 Merge branch 'next' into develop 2025-04-28 11:21:50 +00:00
nocobase[bot]
aaef833be5 Merge branch 'main' into next 2025-04-28 11:21:28 +00:00
Katherine
c1f8b4d2f7
Revert "fix: association field not submitting data when displaying field fro…" (#6796)
This reverts commit d4bf52a047243f5274e23dbf3e57e49d396dba00.
2025-04-28 19:21:06 +08:00
nocobase[bot]
f43760061f Merge branch 'next' into develop 2025-04-28 10:06:26 +00:00
nocobase[bot]
630409b4cb Merge branch 'main' into next 2025-04-28 10:05:52 +00:00
Katherine
d4bf52a047
fix: association field not submitting data when displaying field from related collection (#6789)
* fix: o2o association field not submitting data when display association field are used

* fix: bug

* fix: bug
2025-04-28 18:04:36 +08:00
nocobase[bot]
822d004ab0 Merge branch 'next' into develop 2025-04-28 09:49:09 +00:00
Katherine
f964d25bfa
fix: field linkage rules in filter form block missing 'current form' variable (#6794) 2025-04-28 17:48:12 +08:00
nocobase[bot]
19225ab829 chore(versions): 😊 publish v1.7.0-beta.26 2025-04-28 07:07:10 +00:00
nocobase[bot]
e95644d990 Merge branch 'next' into develop 2025-04-28 06:45:28 +00:00
Zeke Zhang
20c07d9947 Merge branch 'main' into next 2025-04-28 14:44:41 +08:00
Zeke Zhang
4547b7dd96
fix(Collapse): issue with data scope being cleared (#6782) 2025-04-28 14:25:15 +08:00
nocobase[bot]
1978d0edd5 Merge branch 'next' into develop 2025-04-28 06:16:49 +00:00
Katherine
93839acdb7
fix: alignment issue of the add child record button in the tree table (#6791) 2025-04-28 14:16:13 +08:00
Zeke Zhang
6808620a3d
fix: refreshing the page after switching operators causes an error (#6781)
* fix: clear default value when switching operators to prevent filtering API errors

* fix: update EditOperator to set default value to null and assign componentProps to x-component-props

* fix: set field value and initialValue to null in EditOperator to ensure proper state management
2025-04-28 14:12:28 +08:00
Zeke Zhang
4f1e3df663
chore(Filter): improve user experience (#6779) 2025-04-28 14:11:46 +08:00
nocobase[bot]
ca182a9cb5 Merge branch 'main' into next 2025-04-28 06:08:18 +00:00
Zeke Zhang
281b813f0c
refactor: remove rowKey from table block schema creation (#6792)
* refactor: remove rowKey from table block schema creation

* chore: fix unit test
2025-04-28 14:07:49 +08:00
nocobase[bot]
9cb8103813 Merge branch 'next' into develop 2025-04-28 04:35:46 +00:00
Zeke Zhang
fa887c4ad4 Merge branch 'main' into next 2025-04-28 12:34:49 +08:00
nocobase[bot]
4f33515136 chore(versions): 😊 publish v1.7.0-beta.25 2025-04-28 04:04:59 +00:00
nocobase[bot]
98cb86a979 Merge branch 'next' into develop 2025-04-27 11:51:32 +00:00
Katherine
14e6ccca01
refactor: show button title with tooltip on action icon hover (#6761)
* refactor: show button title with tooltip on action icon hover

* fix: test

* fix: style improve

* fix: filter action should onlyicon

* fix: test

* fix: test

* style: link action style improve
2025-04-27 19:51:10 +08:00
Zeke Zhang
17eaee373c
refactor: unify 404 page components (#6778) 2025-04-27 12:38:53 +08:00
Zeke Zhang
462cc31998
fix: filter out tabs from route items in toItems function (#6777)
* fix: filter out tabs from route items in toItems function

* chore: fix e2e

* chore: fix e2e
2025-04-27 12:32:51 +08:00
nocobase[bot]
33141d100e chore(versions): 😊 publish v1.7.0-beta.24 2025-04-25 13:16:59 +00:00
nocobase[bot]
936eddcc4b Merge branch 'next' into develop 2025-04-25 09:27:03 +00:00