607 Commits

Author SHA1 Message Date
Zeke Zhang
20c07d9947 Merge branch 'main' into next 2025-04-28 14:44:41 +08:00
Zeke Zhang
4f1e3df663
chore(Filter): improve user experience (#6779) 2025-04-28 14:11:46 +08:00
nocobase[bot]
4f33515136 chore(versions): 😊 publish v1.7.0-beta.25 2025-04-28 04:04:59 +00:00
nocobase[bot]
33141d100e chore(versions): 😊 publish v1.7.0-beta.24 2025-04-25 13:16:59 +00:00
nocobase[bot]
5cf066a865 chore(versions): 😊 publish v1.7.0-beta.23 2025-04-24 11:45:11 +00:00
nocobase[bot]
bfe77cd81d chore(versions): 😊 publish v1.6.24 2025-04-24 10:20:37 +00:00
nocobase[bot]
d7c4921d1d chore(versions): 😊 publish v1.7.0-beta.22 2025-04-24 00:00:43 +00:00
nocobase[bot]
c8e5a1c7e7 chore(versions): 😊 publish v1.6.23 2025-04-23 15:06:25 +00:00
nocobase[bot]
7fb0805888 chore(versions): 😊 publish v1.7.0-beta.21 2025-04-23 10:21:44 +00:00
nocobase[bot]
5fd8649fc3 chore(versions): 😊 publish v1.6.22 2025-04-22 09:44:09 +00:00
Katherine
ffdd03b4bc
fix: date time field condition not working in linkage rules (#6728)
* fix: datetime field in linakge rule condiction

* fix: bug

* fix: bug
2025-04-21 20:52:24 +08:00
chenos
72c5fdd14b Merge branch 'main' into next
# Conflicts:
#	packages/core/auth/package.json
#	packages/core/create-nocobase-app/templates/app/package.json.tpl
#	packages/core/data-source-manager/package.json
#	packages/core/server/package.json
2025-04-21 19:48:52 +08:00
chenos
120aa3420c
chore(deps): upgrade dependencies (#6708)
* chore: upgrade jsonwebtoken to version 9.0.2

* chore: update

* fix: deps

* fix: semver

* chore: dicer

* chore: upgrade multer

* fix: dicer

* fix: remove sqlite

* chore: check db dialect

* chore: remove sqlite3

* fix: yarn add sqlite3 --no-save -W

* fix: test

* fix: test

* fix: ci

* fix: test

* fix: deps
2025-04-21 18:52:26 +08:00
katherinehhh
8e4ccd1916 Merge branch 'main' into next 2025-04-18 17:44:36 +08:00
Katherine
aa6a46924a
fix(date-picker): picker switching issue in date field of filter button (#6695)
* fix:  picker switching issue in date field of filter button

* fix: bug

* fix: bug
2025-04-18 17:29:52 +08:00
nocobase[bot]
e1e2f7a83c Merge branch 'main' into next 2025-04-18 01:24:33 +00:00
Zeke Zhang
3067b3a4b1
fix(tree-block): the issue where the tree block filter condition was empty (#6634)
* fix: enhance useFilterAPI to support sourceKey in filter functions

* fix: update useFilterAPI to use key variable for dynamic field assignment

* feat: add treeFind function for depth-first traversal of tree structures

* feat: enhance getSupportFieldsByForeignKey to include target collection matching

* feat: add getInheritChain method to InheritanceCollectionMixin and corresponding tests
2025-04-18 09:24:08 +08:00
nocobase[bot]
402c3f4b3a chore(versions): 😊 publish v1.7.0-beta.20 2025-04-18 00:52:00 +00:00
nocobase[bot]
b04e877d31 chore(versions): 😊 publish v1.7.0-beta.19 2025-04-17 08:13:12 +00:00
nocobase[bot]
7f1d642848 chore(versions): 😊 publish v1.6.21 2025-04-17 06:51:36 +00:00
nocobase[bot]
f1c9a14e6c chore(versions): 😊 publish v1.7.0-beta.18 2025-04-15 16:11:32 +00:00
nocobase[bot]
bc7af8b80f chore(versions): 😊 publish v1.7.0-beta.17 2025-04-14 16:52:54 +00:00
nocobase[bot]
4da85db68b chore(versions): 😊 publish v1.6.20 2025-04-14 15:35:54 +00:00
nocobase[bot]
1af62daf9f chore(versions): 😊 publish v1.6.19 2025-04-14 06:26:27 +00:00
nocobase[bot]
62d857b1bc chore(versions): 😊 publish v1.7.0-beta.16 2025-04-11 16:42:25 +00:00
nocobase[bot]
8b983f8913 chore(versions): 😊 publish v1.6.18 2025-04-11 13:05:40 +00:00
nocobase[bot]
95952c7a45 chore(versions): 😊 publish v1.7.0-beta.15 2025-04-10 03:29:03 +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
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]
aae9319f73 chore(versions): 😊 publish v1.6.17 2025-04-09 06:28:10 +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
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
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]
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