8744 Commits

Author SHA1 Message Date
Sheldon Guo
2608e8d4a9
Merge branch 'develop' into feat/json-templates 2025-02-27 07:02:04 +08:00
nocobase[bot]
e15c4ef1fe Merge branch 'next' into develop 2025-02-26 16:12:44 +00:00
xilesun
2b5ce1bad1 fix(acl): test 2025-02-27 00:11:54 +08:00
sheldon guo
e8939b0fab feat: integrate json-template-parser package and update imports across core modules 2025-02-26 23:07:28 +08:00
nocobase[bot]
9ede0cdb24 Merge branch 'next' into develop 2025-02-26 15:01:59 +00:00
nocobase[bot]
220721d5d5 chore(versions): 😊 publish v1.6.0-beta.13 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
sheldon guo
afc76bc775 feat: rename pkg name to json-template-parser package 2025-02-26 22:44:56 +08:00
nocobase[bot]
2b9e591fd4 Merge branch 'next' into develop 2025-02-26 14:25:00 +00:00
nocobase[bot]
6876c3ddb7 Merge branch 'main' into next 2025-02-26 14:24:37 +00:00
xilesun
8bd3d3625c chore: update changelogAndRelease.js 2025-02-26 22:24:03 +08:00
sheldon guo
a6dbac8773 feat: refactor json-templates engine and filters structure for improved organization 2025-02-26 22:07:08 +08:00
nocobase[bot]
ff3165bb5b Merge branch 'next' into develop 2025-02-26 12:09:29 +00:00
nocobase[bot]
d48adaac6a Merge branch 'main' into next 2025-02-26 12:09:01 +00:00
Junyi
22869ca184
fix(plugin-file-manager): fix migration for inherited collection (#6310) 2025-02-26 20:08:35 +08:00
nocobase[bot]
4e452865ad Merge branch 'next' into develop 2025-02-26 11:52:16 +00:00
gchust
f805780ae0
fix: yarn dev error after create-nocobase-app (#6299) 2025-02-26 19:51:46 +08:00
gchust
92e71407c1
fix: block's template info not loading correctly (#6306) 2025-02-26 19:49:34 +08:00
sheldon guo
9494b3f1f5 feat: update json-templates import to use @nocobase/json-templates and adjust exports 2025-02-26 19:19:38 +08:00
sheldon guo
ad563e7315 Revert "refactor: replace utils parse import with json-templates parse in multiple files"
This reverts commit 71dca1ba180231c2238d3be09813f4e0cfa0f742.
2025-02-26 19:14:27 +08:00
nocobase[bot]
4f61f6c07c Merge branch 'next' into develop 2025-02-26 11:02:31 +00:00
Katherine
ffa75f4033
add: custom request action migration (#6313)
* feat: customRequestsRoles migration

* feat: customRequestsRoles migration
2025-02-26 19:02:05 +08:00
nocobase[bot]
c3527a3bd5 Merge branch 'next' into develop 2025-02-26 10:59:48 +00:00
Katherine
dd608f96ea
Revert "add: custom requests action migration (#6311)" (#6312)
This reverts commit 109873f7e59723b269640d76e98057770092b42a.
2025-02-26 18:59:24 +08:00
nocobase[bot]
5dc77dd564 Merge branch 'next' into develop 2025-02-26 10:59:03 +00:00
Katherine
109873f7e5
add: custom requests action migration (#6311) 2025-02-26 18:58:38 +08:00
nocobase[bot]
50d260885a Merge branch 'next' into develop 2025-02-26 10:39:22 +00:00
nocobase[bot]
b938437613 Merge branch 'main' into next 2025-02-26 10:38:55 +00:00
YANG QIA
414ec3c817
fix(acl): incorrect data records when using m2m fields in collection permission data scope (#6304)
* fix(acl): incorrect data records when using m2m fields in collection permission data scope

* fix: duplicate
2025-02-26 18:38:26 +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]
cb0f097c3c Merge branch 'next' into develop 2025-02-26 09:04:08 +00:00
katherinehhh
0953b60308 Merge branch 'main' into next 2025-02-26 17:03:08 +08:00
Katherine
55b70335cf
fix: incorrect data filtering in popup Kanban using popup record variables (#6290) 2025-02-26 16:51:28 +08:00
nocobase[bot]
85f9b04c81 Merge branch 'next' into develop 2025-02-26 08:41:04 +00:00
Katherine
b28dea76e8
fix: build error (#6308) 2025-02-26 16:40:40 +08:00
nocobase[bot]
06edd7fc78 Merge branch 'next' into develop 2025-02-26 06:50:19 +00:00
nocobase[bot]
98d7136633 Merge branch 'main' into next 2025-02-26 06:49:53 +00:00
Zeke Zhang
9d3497811b
fix(linkage-rules): clear field value when expression value is empty (#6300) 2025-02-26 14:49:25 +08:00
nocobase[bot]
4809963c71 Merge branch 'next' into develop 2025-02-26 06:07:55 +00:00
nocobase[bot]
67095238b6 Merge branch 'main' into next 2025-02-26 06:07:33 +00:00
chenos
779daa2024
chore: update Dockerfile (#6298)
* chore: update Dockerfile

* fix: error

* fix: error

* fix: error

* fix: error

* fix: error
2025-02-26 14:07:06 +08:00
nocobase[bot]
84f4e6f309 Merge branch 'next' into develop 2025-02-26 04:35:45 +00:00
Katherine
3e477a4182
refactor: add 'collectionField' parameter to TitleRenderer in calendar block (#6302) 2025-02-26 12:35:21 +08:00
nocobase[bot]
ecbd5852ca Merge branch 'next' into develop 2025-02-26 04:20:37 +00:00
nocobase[bot]
0a587a6e3a Merge branch 'main' into next 2025-02-26 04:20:16 +00:00
Junyi
929f2c94d5
fix(plugin-field-sequence): fix read only mode (#6274) 2025-02-26 12:19:55 +08:00
nocobase[bot]
69fc919184 Merge branch 'next' into develop 2025-02-26 03:25:36 +00:00