590 Commits

Author SHA1 Message Date
aaaaaajie
5548728b40 chore: merge develop 2025-04-11 17:35:53 +08:00
nocobase[bot]
345a3dd27c Merge branch 'next' into develop 2025-04-10 01:07:10 +00:00
chenos
29d7cf3dbf fix: assign overwrite strategy 2025-04-10 09:06:32 +08:00
nocobase[bot]
eeec17265c chore(versions): 😊 publish v1.7.0-beta.14 2025-04-09 11:28:40 +00:00
nocobase[bot]
b10ae3aff6 Merge branch 'next' into develop 2025-04-09 11:06:32 +00:00
ajie
41961fb923
fix: correct role union calculation logic (#6605)
* refactor: enhance role merging logic: prioritize strategy actions over existing actions

* refactor: union role acl

* refactor: union role acl

* refactor: union role acl

* fix: assign getKeys

* fix: assign

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: add setCurrentRole cache

* fix: e2e test

* fix: setCurrentRole

* refactor: switch role

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2025-04-09 19:06:05 +08:00
aaaaaajie
3739c6f9f5 Merge branch 'next' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-04-08 22:51:08 +08:00
nocobase[bot]
102f916354 Merge branch 'next' into develop 2025-04-08 09:25:39 +00:00
Zeke Zhang
ee603e7195 Merge branch 'main' into next 2025-04-08 17:24:52 +08:00
Junyi
3c5ff51472
chore(utils): add extends for dayjs (#6630) 2025-04-07 22:01:24 +08:00
nocobase[bot]
c37ea4d60a chore(versions): 😊 publish v1.6.16 2025-04-03 07:15:19 +00:00
aaaaaajie
a5c9a62ae3 fix: merge develop and fix confliect 2025-04-02 15:52:55 +08:00
chenos
ab95c13a73 fix: assign 2025-04-02 14:46:41 +08:00
chenos
5046d68c8e fix: assign getKeys 2025-04-02 12:48:00 +08:00
nocobase[bot]
994be1a2a1 chore(versions): 😊 publish v1.7.0-beta.13 2025-04-02 01:08:51 +00:00
nocobase[bot]
71a55d6f10 chore(versions): 😊 publish v1.6.15 2025-04-01 12:59:02 +00:00
aaaaaajie
1e23c28601 feat: plugin users in mssql 2025-04-01 02:27:00 +08:00
aaaaaajie
431dfeffa6 feat: auth plugin in mssql 2025-03-31 23:13:25 +08:00
nocobase[bot]
26e30489da chore(versions): 😊 publish v1.6.14 2025-03-29 03:46:43 +00:00
nocobase[bot]
1d40bd1b8a chore(versions): 😊 publish v1.7.0-beta.12 2025-03-28 11:44:46 +00:00
nocobase[bot]
cf09e64821 chore(versions): 😊 publish v1.6.13 2025-03-28 09:11:21 +00:00
nocobase[bot]
aad023cfc0 chore(versions): 😊 publish v1.6.12 2025-03-27 12:58:32 +00:00
nocobase[bot]
c9f37e61e5 chore(versions): 😊 publish v1.7.0-beta.11 2025-03-27 10:10:25 +00:00
nocobase[bot]
45e6e7d448 chore(versions): 😊 publish v1.7.0-beta.10 2025-03-27 06:10:23 +00:00
nocobase[bot]
8773912c34 chore(versions): 😊 publish v1.6.11 2025-03-27 04:21:59 +00:00
nocobase[bot]
b707061ef6 chore(versions): 😊 publish v1.7.0-alpha.10 2025-03-27 04:19:11 +00:00
nocobase[bot]
37ab4452ba chore(versions): 😊 publish v1.6.10 2025-03-25 06:45:45 +00:00
nocobase[bot]
befdd5366c chore(versions): 😊 publish v1.7.0-beta.9 2025-03-25 05:03:40 +00:00
chenos
07ac4717b3 Merge branch 'develop' into next
# Conflicts:
#	packages/core/client/src/locale/it-IT.json
#	packages/plugins/@nocobase/plugin-action-import/src/client/ImportAction.tsx
2025-03-25 12:40:54 +08:00
nocobase[bot]
ffaa71e01e chore(versions): 😊 publish v1.7.0-alpha.4 2025-03-23 05:22:57 +00:00
nocobase[bot]
edacd05301 chore(versions): 😊 publish v1.7.0-beta.8 2025-03-23 04:46:53 +00:00
nocobase[bot]
01ec734a58 chore(versions): 😊 publish v1.6.9 2025-03-23 03:34:33 +00:00
nocobase[bot]
e3b99cc75c chore(versions): 😊 publish v1.6.8 2025-03-22 12:57:51 +00:00
nocobase[bot]
3f75da95d3 chore(versions): 😊 publish v1.6.7 2025-03-20 09:48:46 +00:00
Zeke Zhang
bf7607a695
fix(mobile): known issues (#6476)
* feat(Nester): support mobile layout by transforming multi-column schema to single-column

* fix(chart): change multiple columns to single column

* fix: update openMode handling in ActionContainer component

* fix: update drawer style selector in Action.Drawer.style.ts

* fix: adjust padding and background color handling in WorkflowTasks component

* fix: refactor schema handling for mobile layout in InternalPicker, Nester, and Form components

* fix: prevent schema insertion in mobile layout for AssociationField component

* fix: remove deprecated useCollectionManager in DetailsBlockProvider component

* fix: relationship fields not displaying data
2025-03-20 17:28:36 +08:00
nocobase[bot]
a7b7c10ba7 chore(versions): 😊 publish v1.7.0-beta.7 2025-03-19 10:26:54 +00:00
nocobase[bot]
bdab512485 chore(versions): 😊 publish v1.7.0-beta.6 2025-03-19 00:23:14 +00:00
nocobase[bot]
727768bf71 chore(versions): 😊 publish v1.6.6 2025-03-18 15:15:17 +00:00
nocobase[bot]
45c50cdcc4 chore(versions): 😊 publish v1.7.0-alpha.3 2025-03-18 02:00:02 +00:00
nocobase[bot]
a2dc41229f chore(versions): 😊 publish v1.7.0-beta.5 2025-03-18 00:49:54 +00:00
nocobase[bot]
2481e3f4ff chore(versions): 😊 publish v1.6.5 2025-03-17 10:27:39 +00:00
nocobase[bot]
14bfb7abb7 chore(versions): 😊 publish v1.7.0-alpha.2 2025-03-14 23:14:25 +00:00
nocobase[bot]
6a1a8ee670 chore(versions): 😊 publish v1.7.0-beta.4 2025-03-14 17:34:44 +00:00
nocobase[bot]
6bc55d4f9f chore(versions): 😊 publish v1.6.4 2025-03-14 16:37:22 +00:00
nocobase[bot]
7b74ca1d30 Merge branch 'next' into develop 2025-03-14 14:20:07 +00:00
nocobase[bot]
684230b6e3 Merge branch 'main' into next 2025-03-14 14:19:44 +00:00
Junyi
4b91d890cf
refactor(utils): move md5 to utils (#6468)
* refactor(utils): move md5 to utils

* fix(utils): fix export

* fix(utils): add missed file
2025-03-14 22:19:20 +08:00
nocobase[bot]
cfa2ee98fb chore(versions): 😊 publish v1.7.0-beta.3 2025-03-13 23:05:42 +00:00
nocobase[bot]
7281979cc3 chore(versions): 😊 publish v1.6.3 2025-03-13 16:32:19 +00:00
nocobase[bot]
aab7d09456 chore(versions): 😊 publish v1.7.0-beta.2 2025-03-13 13:25:24 +00:00