fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-06 05:59:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,547 Commits 225 Branches 563 Tags
Commit Graph

528 Commits

Author SHA1 Message Date
nocobase[bot]
62d857b1bc chore(versions): 😊 publish v1.7.0-beta.16 2025-04-11 16:42:25 +00:00
nocobase[bot]
95952c7a45 chore(versions): 😊 publish v1.7.0-beta.15 2025-04-10 03:29:03 +00:00
nocobase[bot]
eeec17265c chore(versions): 😊 publish v1.7.0-beta.14 2025-04-09 11:28:40 +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
ajie
e59cec0e69
fix: incorrect current role assignment during login (#6581) 
* fix: incorrect current role assignment during login
 2025-03-28 11:00:29 +08: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
Mathy Vandersmissen
945d2483b7
Updated dutch language files (#6546) 2025-03-26 14:35:43 +08:00
ajie
ba1887849e
refactor: optimize the order and style of role switching (#6555) 
* refactor: optimize the order and style of role switching

---------

Co-authored-by: gchust <gchust@qq.com>
Co-authored-by: nocobase[bot] <179432756+nocobase[bot]@users.noreply.github.com>
 2025-03-26 10:43:56 +08: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]
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]
b3991670be Merge branch 'next' into develop 2025-03-18 07:24:10 +00:00
nocobase[bot]
5cb60ad9f8 Merge branch 'main' into next 2025-03-18 07:23:47 +00:00
chenos
dd47ca4552 fix: locale error 2025-03-18 15:23:13 +08: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]
3ec5aaa251 Merge branch 'next' into develop 2025-03-14 00:38:40 +00:00
Mathy Vandersmissen
6db5bd7f33
Update dutch language files (#6461) 2025-03-14 08:38:14 +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
ajie
367ae2184c
fix: switching roles does not take effect (#6454) 
* fix: switching roles does not take effect

* fix: test
 2025-03-13 22:51:19 +08:00
nocobase[bot]
aab7d09456 chore(versions): 😊 publish v1.7.0-beta.2 2025-03-13 13:25:24 +00:00
katherinehhh
4d10946a2e Merge branch 'next' into develop 2025-03-13 16:30:40 +08:00
nocobase[bot]
e140b0a7d1 Merge branch 'main' into next 2025-03-13 08:26:49 +00:00
chenos
1be324f524 fix: cannot read properties of null (reading 'sort') 2025-03-13 16:25:58 +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
f84e2c470b
fix: replace all instances of ctx.state.currentRole with ctx.state.currentRoles (#6427) 
* fix: desktop and mobile accessible list when union roles include root

* fix: desktop and mobile accessible list when union roles include root

* fix: test

* fix: test

* fix: test

* fix: test

* fix: test
 2025-03-13 15:15:58 +08:00
chenos
3d4cf53a06
fix: roleMode (#6443) 2025-03-13 10:15:58 +08:00
nocobase[bot]
79aee8825d Merge branch 'main' into next 2025-03-12 13:40:09 +00:00
N3tN00b3r
97940d246c
Updating italian translations (#6434) 
* Add italian translation

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Update it-IT.json

* Create it-IT.json

* Create it-IT.json

* Update it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

The following strings have been intentionally not translated to avoid misinterpretation of the technical terms:

Access Key ID
Access Key Secret
Secret ID
Secret Key

* Create it-IT.json

* Create it-IT.json

* Update it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Create it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Create it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Create it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json

* Update it-IT.json
 2025-03-12 21:39:47 +08:00
Jonas Fleischer
9d572bf8f4
feat: add German localization files for NocoBase core and plugins (#6435) 
* feat: add German localization files for NocoBase core and plugins

* feat: expand German localization for NocoBase plugins compared to chinese translation

This commit adds and enhances German translation files across multiple NocoBase plugins, including:
- Workflow plugins (action trigger, manual, notification, etc.)
- File management
- Charts and data visualization
- Async task management
- Import/export functionality
- Theme editor
- And several other core and extension plugins
 2025-03-12 21:35:26 +08:00
nocobase[bot]
ed98b8c7af chore(versions): 😊 publish v1.6.2 2025-03-12 08:00:54 +00: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
gchust
62f10d9c97
chore: upgrade ant design to 5.24.2 (#6343) 
* chore: upgrade ant design to 5.24.2

* chore: fix errors after upgrade ant design

* fix: ts errors

* fix: ts error

* fix: ts error

* chore: keep original code format

* chore: revert format changes

* chore: keep code format

* fix: unit tests error after upgrade ant design

* fix: style issues for variable inputs

* fix: inbox style issue

* fix: some buttons not showing in drawer

* chore: fix formily antd version

* fix: incorrect details block pagination style [skip ci]

* fix: incorrect cron style after upgrade ant design [skip ci]

* fix: unit tests errors after upgrading ant design

* fix: update unit tests for collection select and color picker components

* fix: e2e tests errors

* fix: e2e tests failing

* fix: tests error

* fix: e2e test cases

* fix: some e2e tests failing

* fix: e2e testing errors

* fix: e2e build failing

* fix: update yarn.lock to avoid comment ci timeout

* Revert "fix: update yarn.lock to avoid comment ci timeout"

This reverts commit 6f117f57a0fd1d605de7ef18022c5c3e658e24af.

* chore: comment ci timeout

* chore: e2e

* fix: workflow approval e2e testing

* fix: e2e stable for some tests
 2025-03-12 08:46:38 +08:00
nocobase[bot]
cfde026371 Merge branch 'next' into develop 2025-03-11 14:19:54 +00:00
mahuantest
955457c121
feat(locale): add translation of nl-NL (dutch) (#6166) 
* feat(locale): add offset param to charts-query(backend)

* feat(locale): add offset param to charts-query(frontend)

* feat(locale): add translation of de-DE

* feat(locale): add translation of nl-NL (dutch)

---------

Co-authored-by: mahuan <1007409254@qq.com>
 2025-03-11 22:19:26 +08:00
nocobase[bot]
00b7e0e0bd chore(versions): 😊 publish v1.6.1 2025-03-11 10:14:56 +00:00
nocobase[bot]
e7dea7fdfb chore(versions): 😊 publish v1.6.0 2025-03-11 05:29:43 +00:00
nocobase[bot]
cd4ed1803b chore(versions): 😊 publish v1.7.0-beta.1 2025-03-11 04:55:31 +00:00
nocobase[bot]
00c2ed0808 chore(versions): 😊 publish v1.7.0-alpha.1 2025-03-11 04:10:21 +00:00