5043 Commits

Author SHA1 Message Date
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
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]
cbe93f9e4a Merge branch 'next' into develop 2025-04-24 12:30:02 +00:00
nocobase[bot]
5b0b208515 Merge branch 'main' into next 2025-04-24 12:29:38 +00:00
chenos
b0cee75bf1
chore: downgrade mariadb to 2.5.6 due to compatibility issues (#6762) 2025-04-24 20:29:13 +08:00
nocobase[bot]
c4582474b7 Merge branch 'next' into develop 2025-04-24 12:10:33 +00:00
nocobase[bot]
b1eda23558 Merge branch 'main' into next 2025-04-24 12:10:10 +00:00
Katherine
e2e4c69941
refactor: unavailableActions to sql collection and view collection (#6765)
* refactor: unavailableActions to sql collection and view collection

* fix: unavailableActions
2025-04-24 20:09:42 +08:00
nocobase[bot]
5cf066a865 chore(versions): 😊 publish v1.7.0-beta.23 2025-04-24 11:45:11 +00:00
nocobase[bot]
bfe77cd81d chore(versions): 😊 publish v1.6.24 2025-04-24 10:20:37 +00: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
Katherine
2ef89513ff
refactor: remove icon from row buttons in plugin (#6760) 2025-04-24 15:09:01 +08:00
nocobase[bot]
3d08fee9f3 Merge branch 'next' into develop 2025-04-24 01:55:03 +00:00
nocobase[bot]
c6935a8923 Merge branch 'main' into next 2025-04-24 01:54:43 +00:00
Katherine
0758490913
fix: unexpected data creation when displaying association field under sub-form/sub-table in create form action (#6727)
* fix: unexpected data creation when displaying relational field subtable in create form

* fix: bug

* fix: bug

* fix: bug
2025-04-24 09:54:22 +08:00
nocobase[bot]
851f35657a chore(versions): 😊 publish v1.7.0-alpha.12 2025-04-24 01:43:51 +00:00
nocobase[bot]
d7c4921d1d chore(versions): 😊 publish v1.7.0-beta.22 2025-04-24 00:00:43 +00:00
nocobase[bot]
c8e5a1c7e7 chore(versions): 😊 publish v1.6.23 2025-04-23 15:06:25 +00:00
nocobase[bot]
f7aa0501bc Merge branch 'next' into develop 2025-04-23 14:06:49 +00:00
Katherine
a76ae40968
fix: display issue with linkage rules in multi-level association data (#6755) 2025-04-23 22:06:16 +08:00
nocobase[bot]
560d6a7e31 Merge branch 'next' into develop 2025-04-23 13:27:14 +00:00
nocobase[bot]
aecca20215 Merge branch 'main' into next 2025-04-23 13:26:43 +00:00
chenos
452619c511
refactor: optimize internal logic of the nocobase upgrade command (#6754)
* chore: update-deps

* fix: upgrade
2025-04-23 21:26:07 +08:00
nocobase[bot]
7fb0805888 chore(versions): 😊 publish v1.7.0-beta.21 2025-04-23 10:21:44 +00:00
nocobase[bot]
ee92356ae0 Merge branch 'next' into develop 2025-04-23 08:20:19 +00:00
nocobase[bot]
97c33f6eed Merge branch 'main' into next 2025-04-23 08:19:57 +00:00