4670 Commits

Author SHA1 Message Date
Katherine
24b2e3c60d
feat: support date scope (min/max) configuration for time fields in l… (#6356)
* feat: support date scope (min/max) configuration for time fields in linkage rules

* fix: bug

* fix: bug

* fix: bug
2025-03-12 18:32:45 +08:00
nocobase[bot]
a4e3de0780 Merge branch 'next' into develop 2025-03-12 08:18:48 +00:00
Katherine
7552f45f3e
feat: support configuring selectable field options in linkage rules (#6338)
* feat: support configuring selectable field options in linkage rules

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* test: e2e test
2025-03-12 16:18:25 +08:00
nocobase[bot]
ed98b8c7af chore(versions): 😊 publish v1.6.2 2025-03-12 08:00:54 +00:00
nocobase[bot]
4110ae88a7 Merge branch 'next' into develop 2025-03-12 01:23:03 +00:00
nocobase[bot]
64e31cfdd2 Merge branch 'main' into next 2025-03-12 01:22:43 +00:00
chenos
9dfb75663a fix: cannot find module 'typeof-article' 2025-03-12 09:22:07 +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
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
Zeke Zhang
c2786c1bee
feat: adapt styles for mobile devices (#6393)
* feat(layout): integrate ConfigProvider for theme management in admin layout

* feat(layout): add mobile layout context and transform utility for schema

* feat(toolbar): disable dragging in mobile layout for BlockSchemaToolbar

* test: add unit tests for transformMultiColumnToSingleColumn function

* feat: add mobile layout support to form schema transformation

* feat: support mobile layout in Tabs component schema transformation

* feat: integrate mobile layout support into designable components

* feat: refactor mobile layout hooks and integrate MobileComponentsProvider

* feat: update mobile layout styles and integrate global theme in ActionDrawer

* feat: update Mobile component to use CommonDrawer for popup handling in mobile layout

* feat: adjust padding in ActionDrawer style for improved layout on mobile

* feat: optimize scope usage in InternalPicker for improved performance

* feat: update Action.Page style to improve overflow handling

* style: remove minHeight from ActionDrawer style

* feat: add mobile layout support and transform schema for multi-column fields

* feat: support mobile components

* fix(mobile): issue with mobile flash/flicker

* feat: hide Plugin manager and Settings center

* feat: hide scroll bar in mobile

* feat(todos): support to collapse sider menu

* feat: enhance mobile layout theme support with dark mode
2025-03-12 07:51:11 +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]
fff98d9bef Merge branch 'next' into develop 2025-03-11 13:52:34 +00:00
nocobase[bot]
da31263ba6 Merge branch 'main' into next 2025-03-11 13:52:08 +00:00
Katherine
3e1b828fc7
fix: date field range selection excludes the max date (#6418) 2025-03-11 21:51:44 +08:00
gchust
67fb0df0f8
fix: mobile saveas template not working correctly (#6420) 2025-03-11 19:27:50 +08:00
nocobase[bot]
00b7e0e0bd chore(versions): 😊 publish v1.6.1 2025-03-11 10:14:56 +00:00
nocobase[bot]
c14f852928 Merge branch 'main' into next 2025-03-11 08:13:59 +00:00
Zeke Zhang
ece3d10139
fix(globalOperators): handle null and empty array cases in function (#6415) 2025-03-11 16:13:34 +08:00
nocobase[bot]
47769734f2 Merge branch 'next' into develop 2025-03-11 06:31:23 +00:00
nocobase[bot]
655adc2de0 Merge branch 'main' into next 2025-03-11 06:31:00 +00:00
Zeke Zhang
d90c17b3a4
feat: add deletePopupContext function to manage popup context storage (#6411) 2025-03-11 14:30:37 +08:00
nocobase[bot]
7e61612c78 Merge branch 'next' into develop 2025-03-11 05:45:17 +00:00
nocobase[bot]
dffaaace94 Merge branch 'main' into next 2025-03-11 05:44:56 +00:00
Katherine
5ade85acd4
fix: multi-select field value changes and option loss when deleting subtable records (#6405) 2025-03-11 13:44:33 +08: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
nocobase[bot]
e59e57b6a3 Merge branch 'next' into develop 2025-03-11 03:11:52 +00:00
Zeke Zhang
256b526800
fix(menuItemSettings): enhance route moving logic to support nested i… (#6413)
* fix(menuItemSettings): enhance route moving logic to support nested insertion

* fix(menuItemSettings): update position method from 'prepend' to 'insertBefore'

* fix: insertBefore

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2025-03-11 11:11:30 +08:00
nocobase[bot]
13df55e52c Merge branch 'next' into develop 2025-03-11 00:24:45 +00:00
Zeke Zhang
45bfc0649f
fix: menu icon display issue (#6410) 2025-03-11 08:24:19 +08:00
nocobase[bot]
ffd59ebfdf chore(versions): 😊 publish v1.6.0-alpha.31 2025-03-10 17:42:29 +00:00
gchust
b73f170edd
fix: save as template not shown (#6398)
* fix: save as template not shown

* fix: block template settings and route handling

* fix: incorrect l18n
2025-03-10 21:40:51 +08:00
nocobase[bot]
f70ff6da80 Merge branch 'next' into develop 2025-03-10 12:38:00 +00:00
Katherine
8741c26a86
fix: formDrawer theme context issue (#6403) 2025-03-10 20:37:34 +08:00
nocobase[bot]
6ec8de180c Merge branch 'next' into develop 2025-03-10 11:58:58 +00:00
Junyi
e5507d0758
refactor(plugin-workflow): change task center api and ui (#6272)
* refactor(plugin-workflow): change task center api and ui

* fix(client): add className property for Grid.Col

* refactor(plugin-workflow): adjust tasks menu style

* fix(plugin-workflow): fix menu title

* feat(plugin-workflow): automatically update tasks number

* fix(plugin-workflow): ignore ws if not exist

* fix(plugin-workflow): fix compatibility of no user approvals

* refactor(server): revert ws api back

* fix(plugin-workflow-manual): fix migration and renamed test cases

* fix(plugin-workflow): fix acl for task resource

* refactor(client): show badge number in toolbar

* fix(plugin-workflow): fix toolbar number

* fix(client): adjust badge font size

* refactor(plugin-workflow): adjust task center style and api

* fix(plugin-workflow-manual): fix constants

* refactor(plugin-workflow-manual): change legacy workflow todo block to list style

* test(plugin-workflow-manual): migrations

* refactor(plugin-workflow): add workflow title component

* fix(plugin-workflow-manual): fix e2e test cases

* fix(plugin-workflow): fix test kit
2025-03-10 19:58:33 +08:00
nocobase[bot]
0d38e3af74 Merge branch 'next' into develop 2025-03-10 10:34:44 +00:00
Katherine
4d1f28bf57
feat: compatible with historical button access control settings (#6376)
* feat: compatible with historical button access control settings

* fix:  bug
2025-03-10 18:34:19 +08:00
Zeke Zhang
ceb1dbdaa0
fix(globalOperators): handle null and empty array cases in $anyOf function (#6400) 2025-03-10 16:50:57 +08:00
nocobase[bot]
c2e2344a83 chore(versions): 😊 publish v1.6.0-beta.19 2025-03-10 06:13:38 +00:00
nocobase[bot]
51f2e555b4 Merge branch 'next' into develop 2025-03-10 02:54:21 +00:00
nocobase[bot]
bd3d3d3067 Merge branch 'main' into next 2025-03-10 02:53:58 +00:00
chenos
5cb6088db3
fix: mtime 2025-03-10 10:53:32 +08:00
nocobase[bot]
9539ab547a Merge branch 'next' into develop 2025-03-10 02:38:49 +00:00
nocobase[bot]
a7c35e84c6 Merge branch 'main' into next 2025-03-10 02:38:28 +00:00
chenos
8d62af75a0
fix: dist 2025-03-10 10:38:05 +08:00
nocobase[bot]
c65e4ce9a0 Merge branch 'next' into develop 2025-03-10 02:36:12 +00:00
chenos
c0d2c330ab
fix: useApp 2025-03-10 10:35:49 +08:00