417 Commits

Author SHA1 Message Date
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
nocobase[bot]
994be1a2a1 chore(versions): 😊 publish v1.7.0-beta.13 2025-04-02 01:08:51 +00:00
nocobase[bot]
1d40bd1b8a chore(versions): 😊 publish v1.7.0-beta.12 2025-03-28 11:44:46 +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]
b707061ef6 chore(versions): 😊 publish v1.7.0-alpha.10 2025-03-27 04:19:11 +00:00
nocobase[bot]
befdd5366c chore(versions): 😊 publish v1.7.0-beta.9 2025-03-25 05:03:40 +00:00
nocobase[bot]
ffaa71e01e chore(versions): 😊 publish v1.7.0-alpha.4 2025-03-23 05:22:57 +00:00
nocobase[bot]
45c50cdcc4 chore(versions): 😊 publish v1.7.0-alpha.3 2025-03-18 02:00:02 +00:00
nocobase[bot]
14bfb7abb7 chore(versions): 😊 publish v1.7.0-alpha.2 2025-03-14 23:14:25 +00:00
ajie
f98181cbe9
fix: merge acl action params appends bug (#6456) 2025-03-13 22:52:03 +08:00
ajie
85e16912cf
fix: error when data scope is set to own data and the table lacks a creator field (#6428)
* fix: resolve error when query has createdById but table lacks it

* chore: update logic and add test

* fix: filter params get collection
2025-03-13 15:20:11 +08:00
ajie
d7821bf6d7
feat: support user role union (#6301)
* feat: support merge role function

* feat: test

* fix: snippets merge bug

* feat: support with-acl-meta allowedActions

* feat: support mobileRoutes role union

* feat: support union role of data source manager plugin

* fix: merge action fields

* fix: merge action

* chore: code clean

* fix: perform a deep clone of the object in the toJSON method

* refactor: mergeRole code migration

* fix: desktopRoutes test

* fix: build

* refactor: optimze acl role code and add test

* fix: bug

* fix: skip test

* fix: acl role action whitelist invalid

* fix: actions bug

* chore: merge develop

* chore: desktop routes code

* fix: test

* feat: support set system role mode

* fix: test

* fix: snippets bug

* chore: update text

* fix: test

* fix: test

* fix: text

* fix: text

* refactor: optimze code

* refactor: optimze code

* refactor: optimze code

* refactor: optimze code

---------

Co-authored-by: 霍世杰 <huoshijie@huoshijiedeMacBook-Pro.local>
Co-authored-by: chenos <chenlinxh@gmail.com>
2025-03-12 09:03:33 +08:00
nocobase[bot]
00c2ed0808 chore(versions): 😊 publish v1.7.0-alpha.1 2025-03-11 04:10:21 +00:00
nocobase[bot]
ffd59ebfdf chore(versions): 😊 publish v1.6.0-alpha.31 2025-03-10 17:42:29 +00:00
nocobase[bot]
63887c160b chore(versions): 😊 publish v1.6.0-alpha.30 2025-03-07 08:12:39 +00:00
nocobase[bot]
79a7eee889 chore(versions): 😊 publish v1.6.0-alpha.29 2025-02-27 07:22:26 +00:00
nocobase[bot]
def75b475f chore(versions): 😊 publish v1.6.0-alpha.28 2025-02-18 11:31:06 +00:00
nocobase[bot]
c60f293620 chore(versions): 😊 publish v1.6.0-alpha.27 2025-02-16 07:05:02 +00:00
nocobase[bot]
ccc7779435 chore(versions): 😊 publish v1.6.0-alpha.26 2025-02-15 15:55:11 +00:00
nocobase[bot]
dea9965187 chore(versions): 😊 publish v1.6.0-alpha.25 2025-02-12 01:01:30 +00:00
nocobase[bot]
c0617c70ab chore(versions): 😊 publish v1.6.0-alpha.24 2025-02-11 04:02:25 +00:00
nocobase[bot]
c0ec18c0ec chore(versions): 😊 publish v1.6.0-alpha.23 2025-02-07 11:53:20 +00:00
nocobase[bot]
cd50adcf5e chore(versions): 😊 publish v1.6.0-alpha.22 2025-02-07 07:46:20 +00:00
nocobase[bot]
c71edbb4e7 chore(versions): 😊 publish v1.6.0-alpha.21 2025-02-07 01:51:40 +00:00
nocobase[bot]
c43fe72a66 chore(versions): 😊 publish v1.6.0-alpha.20 2025-02-02 04:55:59 +00:00
nocobase[bot]
4d0b1117b1 chore(versions): 😊 publish v1.6.0-alpha.19 2025-01-25 12:54:44 +00:00
nocobase[bot]
61488d95af chore(versions): 😊 publish v1.6.0-alpha.18 2025-01-24 06:10:10 +00:00
nocobase[bot]
93b8f93b74 chore(versions): 😊 publish v1.6.0-alpha.17 2025-01-19 12:54:20 +00:00
nocobase[bot]
4ba5dc0d6c chore(versions): 😊 publish v1.6.0-alpha.16 2025-01-19 06:19:56 +00:00
nocobase[bot]
8baec18988 chore(versions): 😊 publish v1.6.0-alpha.15 2025-01-19 02:05:02 +00:00
nocobase[bot]
4f523316b4 chore(versions): 😊 publish v1.6.0-alpha.14 2025-01-14 05:56:55 +00:00
nocobase[bot]
814693476d chore(versions): 😊 publish v1.6.0-alpha.13 2025-01-14 05:27:59 +00:00
nocobase[bot]
98a98b5fa0 chore(versions): 😊 publish v1.6.0-alpha.12 2025-01-10 03:51:12 +00:00
nocobase[bot]
7a91444572 chore(versions): 😊 publish v1.6.0-alpha.11 2025-01-09 10:15:45 +00:00
nocobase[bot]
fb49ba2a1c chore(versions): 😊 publish v1.6.0-alpha.10 2025-01-08 06:33:41 +00:00
nocobase[bot]
ff4f3ac955 chore(versions): 😊 publish v1.6.0-alpha.9 2025-01-06 05:23:18 +00:00
nocobase[bot]
466221f69f chore(versions): 😊 publish v1.6.0-alpha.8 2025-01-02 09:55:39 +00:00
nocobase[bot]
2e70e75642 chore(versions): 😊 publish v1.6.0-alpha.7 2024-12-24 16:40:13 +00:00
nocobase[bot]
9ea2d8d7d4 chore(versions): 😊 publish v1.6.0-alpha.6 2024-12-19 02:21:42 +00:00
nocobase[bot]
93a29b34c1 Merge branch 'next' into develop 2024-12-12 10:15:27 +00:00
nocobase[bot]
10a513f2ef Merge branch 'main' into next 2024-12-12 10:15:04 +00:00
ChengLei Shao
b897a8d5e6
fix: template with appends (#5839)
* fix: template with appends

* fix: assign logic

* chore: test
2024-12-12 18:14:38 +08:00
nocobase[bot]
27b326d9ba chore(versions): 😊 publish v1.4.9 2024-12-12 03:15:37 +00:00
nocobase[bot]
c804068478 chore(versions): 😊 publish v1.6.0-alpha.5 2024-12-11 14:26:08 +00:00
nocobase[bot]
062b4bffd7 chore(versions): 😊 publish v1.5.0-beta.6 2024-12-11 09:54:46 +00:00
nocobase[bot]
b2f632c767 chore(versions): 😊 publish v1.5.0-beta.5 2024-12-11 07:36:12 +00:00
nocobase[bot]
0bbc7250b6 chore(versions): 😊 publish v1.5.0-beta.4 2024-12-11 06:58:08 +00:00
chenos
10ddc12fba chore: update version 2024-12-11 13:09:52 +08:00