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]
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]
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]
936eddcc4b
Merge branch 'next' into develop
2025-04-25 09:27:03 +00:00
Katherine
163ec58136
feat: support linkage rules in blocks ( #6636 )
...
* feat: support linkage rules setting for association block action
* chore: linkage rule
* fix: bug
* fix: bug
* refactor: linkage rule
* refactor: code imporve
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* refactor: code imporve
* fix: test
* fix: test
* fix: test
* test: e2e test
* fix: bug
* fix: bug
* fix: test
* fix: e2e test
* fix: bug
* feat: block support linkage rule
* feat: block support linkage rule
* feat: form block support linkage rule
* refactor: code improve
* refactor: detail block support linkage rule
* chore: support legacy leftVar in linkage rules
* fix: bug
* refactor: gantt support linkage rule
* refactor: map block support linkage rule
* fix: bug
* feat: markdown support linkage rule
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: create submit linkage rule
* fix: action panel
* refactor: code improve
* fix: bug
* refactor: action panpel support linkage rule
* fix: test
* fix: bug
* refactor: code improve
* fix: test
* fix: code improve
* fix: e2e test
* refactor: chart block
* refactor: support markdown under form block
* fix: bug
* refactor: refresh & expend action support linkage rule
* refactor: code improve
* fix: test
* fix: bug
* fix: bug
* fix: e2e test
* fix: e2e test
* fix: e2e test
* fix: test
* fix: test
* fix: merge bug
* fix: test
* fix: test bug
* fix: merge bug
* fix: bug
* fix: build error
* fix: bug
* fix: bug
* fix: bug
* fix: e2e test
* fix: e2e test
* fix: e2e test
2025-04-25 17:26:39 +08:00
nocobase[bot]
ba2e29c05c
Merge branch 'next' into develop
2025-04-25 07:44:19 +00:00
nocobase[bot]
20abfedc90
Merge branch 'main' into next
2025-04-25 07:43:57 +00:00
Zeke Zhang
1f974d241f
test: fix failed tests
2025-04-25 15:43:13 +08:00
nocobase[bot]
ce02f6e40e
Merge branch 'next' into develop
2025-04-25 07:09:54 +00:00
Katherine
9ae303844d
fix: url query parameter operator issue ( #6770 )
...
* fix: url query parameter operator issue
* fix: test
2025-04-25 15:09:32 +08:00
nocobase[bot]
8788fc9292
Merge branch 'next' into develop
2025-04-24 15:05:38 +00:00
gchust
b923d89fa0
feat: keep reference templates feature ( #6743 )
...
* feat: be able to create reference template
* chore: update template title
* fix: template menu position inconsitant
* chore: add reference templates into block template management view
* fix: menu not correct
* fix: incorrect label
* chore: remove useless component
* fix: build error
* fix: incorrect translate
* fix: incorrect translate tab [skip ci]
* chore: remove edit icon[skip ci]
* fix: e2e tests failing
2025-04-24 23:05:12 +08:00
nocobase[bot]
57ba3d54b3
Merge branch 'next' into develop
2025-04-24 09:59:23 +00:00
Katherine
a9fb7ea56e
feat(custom-request): support variable in success message of custom request action ( #6694 )
...
* feat: support variable in success message of custom request action
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
2025-04-24 17:59:01 +08:00
nocobase[bot]
91803a8ba1
Merge branch 'next' into develop
2025-04-24 09:33:47 +00:00
nocobase[bot]
d1d8f4bbe7
Merge branch 'main' into next
2025-04-24 09:33:26 +00:00
YANG QIA
bd06d13749
fix(m2m-array): incorrect data retrieved for m2m array fields from association in forms ( #6744 )
...
* fix(m2m-array): incorrect data retrieved for m2m array fields from association in forms
* fix(getAction): update pagination parameter for hasMany and belongsToMany actions
---------
Co-authored-by: Zeke Zhang <958414905@qq.com>
2025-04-24 17:33:00 +08:00
nocobase[bot]
6f9df134da
Merge branch 'next' into develop
2025-04-24 09:09:56 +00:00
nocobase[bot]
b739367029
Merge branch 'main' into next
2025-04-24 09:09:34 +00:00
Katherine
b8bfc17a59
refactor: adjust view collection action permission control ( #6764 )
2025-04-24 17:09:11 +08:00
nocobase[bot]
666a319735
Merge branch 'next' into develop
2025-04-24 08:32:55 +00:00
nocobase[bot]
717b5cc3c6
Merge branch 'main' into next
2025-04-24 08:32:27 +00:00
Katherine
04e17444fa
fix: only export action in view collection is support when writableView is false ( #6763 )
2025-04-24 16:32:06 +08:00
nocobase[bot]
7e39db82f0
Merge branch 'next' into develop
2025-04-24 08:17:14 +00:00
nocobase[bot]
6b3d0e1f6b
Merge branch 'main' into next
2025-04-24 08:16:49 +00:00
Junyi
717177b471
fix(client): adjust upload message ( #6757 )
2025-04-24 16:16:22 +08:00
nocobase[bot]
eae9775fa5
Merge branch 'next' into develop
2025-04-24 07:09:26 +00:00
