3573 Commits

Author SHA1 Message Date
sheldon guo
15fe39d699 Revert "refactor: replace utils parse import with json-templates parse in multiple files"
This reverts commit 71dca1ba180231c2238d3be09813f4e0cfa0f742.
2025-03-05 21:30:23 +08:00
Sheldon Guo
640f24400e refactor: replace utils parse import with json-templates parse in multiple files 2025-03-05 21:30:22 +08:00
nocobase[bot]
0cfeac22c6 Merge branch 'next' into develop 2025-03-05 09:55:11 +00:00
nocobase[bot]
bd4e86d4b3 Merge branch 'main' into next 2025-03-05 09:54:50 +00:00
Junyi
cb2cb0b5ed
fix(plugin-file-manager): fix error thrown when creating file collection (#6363) 2025-03-05 17:54:27 +08:00
nocobase[bot]
675749638b Merge branch 'next' into develop 2025-03-05 03:48:56 +00:00
nocobase[bot]
d57e11336b Merge branch 'main' into next 2025-03-05 03:48:36 +00:00
Katherine
4dc22e06a5
fix: subform components not aligning with main form when label is hidden (#6357) 2025-03-05 11:48:15 +08:00
nocobase[bot]
733246467f Merge branch 'next' into develop 2025-03-04 08:48:59 +00:00
nocobase[bot]
2bad77ac83 Merge branch 'main' into next 2025-03-04 08:48:35 +00:00
Katherine
2cfe4d7af7
fix: association block not rendering in popup within collection inher… (#6303)
* fix: association block not rendering in popup within collection inheritance

* fix: bug

* Merge main into F-1713
2025-03-04 16:48:09 +08:00
nocobase[bot]
a2c2255d48 Merge branch 'next' into develop 2025-03-04 06:59:46 +00:00
Katherine
50ac2a0d85
fix: resolve scrollbar issue when opening page tab with full-height block (#6347) 2025-03-04 14:59:22 +08:00
nocobase[bot]
53e9ad38cd chore(versions): 😊 publish v1.6.0-beta.16 2025-03-04 03:20:25 +00:00
nocobase[bot]
f1bd0a1f4d chore(versions): 😊 publish v1.5.20 2025-03-03 03:57:16 +00:00
nocobase[bot]
94ba56aa4d Merge branch 'next' into develop 2025-03-03 02:29:02 +00:00
Zeke Zhang
ef98a84269 Merge branch 'main' into next 2025-03-03 10:28:13 +08:00
Zeke Zhang
3c9a43c187
feat(favicon): add dynamic favicon update functionality (#6337) 2025-03-03 10:24:51 +08:00
nocobase[bot]
af38a7cd22 Merge branch 'next' into develop 2025-03-02 13:34:25 +00:00
Katherine
ef18e272cf
style: optimize block description style (#6325) 2025-03-02 21:33:58 +08:00
YANG QIA
c53b613517
refactor: verification (#6026)
* refactor: verification

* refactor: update

* chore: update

* feat: verificator

* chore: update

* chore: crud

* feat: bind

* feat: unbind

* fix: auth-sms

* feat: update

* chore: add test cases and fix bug

* fix(auth-sms): tests

* chore: update

* chore: i18n

* chore: update

* chore: update

* fix: required form fields

* chore: uid field

* fix: remote select

* fix: test

* fix: test

* fix: menu

* chore: description

* fix: test

* chore: update
2025-03-01 22:25:56 +08:00
nocobase[bot]
33110193fe chore(versions): 😊 publish v1.5.19 2025-03-01 06:20:47 +00:00
nocobase[bot]
f59e415690 Merge branch 'next' into develop 2025-02-28 07:30:46 +00:00
Katherine
1423b62f02
feat: time field support time format (#6329)
* feat: time field support time format settings

* test: e2e test

* test: e2e test

* test: e2e test

* fix: bug
2025-02-28 15:30:22 +08:00
nocobase[bot]
608e4e749b Merge branch 'next' into develop 2025-02-27 08:45:15 +00:00
nocobase[bot]
04deacc470 Merge branch 'main' into next 2025-02-27 08:44:55 +00:00
Katherine
97f81d3237
fix: add new button appears on hover in association field read-only mode (#6322)
* fix: add new button appears on hover in association field read-only mode

* fix: bug
2025-02-27 16:44:33 +08:00
nocobase[bot]
1a64270a17 chore(versions): 😊 publish v1.5.18 2025-02-27 08:11:48 +00:00
nocobase[bot]
79a7eee889 chore(versions): 😊 publish v1.6.0-alpha.29 2025-02-27 07:22:26 +00:00
nocobase[bot]
e360a4e12f chore(versions): 😊 publish v1.5.17 2025-02-27 04:31:25 +00:00
nocobase[bot]
08f4d7eeb0 chore(versions): 😊 publish v1.6.0-beta.15 2025-02-27 04:27:59 +00:00
nocobase[bot]
f33bbf16dd Merge branch 'next' into develop 2025-02-27 04:08:54 +00:00
Zeke Zhang
bb044f1176
fix(menu): drag issue (#6315) 2025-02-27 12:08:33 +08:00
nocobase[bot]
b32ecc968f Merge branch 'next' into develop 2025-02-27 03:48:12 +00:00
nocobase[bot]
2b829e682c Merge branch 'main' into next 2025-02-27 03:47:50 +00:00
Katherine
85157856c4
fix: dataBlockInitializer (#6319)
* fix: bug

* fix: bug
2025-02-27 11:47:30 +08:00
nocobase[bot]
56a7b0491a Merge branch 'next' into develop 2025-02-27 02:18:32 +00:00
nocobase[bot]
e91e507cc9 Merge branch 'main' into next 2025-02-27 02:18:10 +00:00
nocobase[bot]
8c801015d2 chore(versions): 😊 publish v1.6.0-beta.14 2025-02-27 01:13:54 +00:00
Katherine
bbb3bc9a40
fix: error when creating comment block without comment collection (#6309) 2025-02-27 09:08:07 +08:00
nocobase[bot]
0535a273e8 Merge branch 'next' into develop 2025-02-26 23:37:44 +00:00
nocobase[bot]
971f5a419e Merge branch 'main' into next 2025-02-26 23:37:24 +00:00
Zeke Zhang
605eea4399
fix(filter-provider): improve filter utility with dynamic value and field resolution (#6314) 2025-02-27 07:37:00 +08:00
nocobase[bot]
220721d5d5 chore(versions): 😊 publish v1.6.0-beta.13 2025-02-26 15:01:33 +00:00
nocobase[bot]
a6bc833feb Merge branch 'next' into develop 2025-02-26 14:55:59 +00:00
Zeke Zhang
8223419fc4 Merge branch 'main' into next 2025-02-26 22:55:00 +08:00
Zeke Zhang
376cb21a71
fix(action-modal): improve modal visibility handling (#6305) 2025-02-26 22:52:51 +08:00
katherinehhh
96cc54d927 Merge branch 'next' into develop 2025-02-26 17:28:41 +08:00
Katherine
cf7131a36f
feat: add permission control for buttons with blacklist support (#6254)
* chore(versions): 😊 publish v1.6.0-alpha.24

* chore(versions): 😊 publish v1.6.0-alpha.25

* feat: support extending frontend filter operators (#6085)

* feat: operator extension

* fix: bug

* refactor: code improve

* fix: jsonLogic

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* refactor: remove registerOperators (#6224)

* refactor(plugin-workflow): trigger workflow action settings (#6143)

* refactor(plugin-workflow): move bind workflow settings to plugin

* refactor(plugin-block-workbench): move component to core

* refactor(plugin-block-workbench): adjust component api

* fix(plugin-workflow-action-trigger): fix test cases

* fix(plugin-workflow): fix component scope

* fix(plugin-workflow-action-trigger): fix test cases

* chore(versions): 😊 publish v1.6.0-alpha.26

* feat: support the extension of preset fields in collections (#6183)

* feat: support the extension of preset fields in collections

* fix: bug

* fix: bug

* fix: bug

* refactor: create collection

* fix: config

* fix: test case

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: bug

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* feat: support for the extension of optional fields for Kanban, Calendar, and Formula Field plugins (#6076)

* feat: kanban field extention

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* feat: calender title fields

* feat: background color fields

* fix: bug

* fix: bug

* feat: formula field expression support field

* feat: preset fields

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* revert: preset fields

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* fix: bug

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: locale

* refactor: code improve

* fix: bug

* refactor: code improve

* refactor: code improve

* refactor: code improve

* refactor: locale

* fix: test

* fix: bug

* fix: test

* fix: test

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* chore(versions): 😊 publish v1.6.0-alpha.27

* fix(data-source-main): update order

* fix: improve code

* fix: getFontColor (#6241)

* chore(versions): 😊 publish v1.6.0-alpha.28

* feat: add permission control for buttons with blacklist support

* fix: print action e2e test (#6256)

* fix: print action e2e test

* fix: test

* fix: bug

* refactor: custom request

* fix: merge bug

* fix: merge bug

* fix: merge bug

* fix: merge bug

* fix: bug

* fix: bug

* fix: bug

* test: e2e test

* fix: bug

* test: e2e test

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: test

---------

Co-authored-by: nocobase[bot] <179432756+nocobase[bot]@users.noreply.github.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Junyi <mytharcher@users.noreply.github.com>
2025-02-26 17:19:25 +08:00
nocobase[bot]
85f9b04c81 Merge branch 'next' into develop 2025-02-26 08:41:04 +00:00