7837 Commits

Author SHA1 Message Date
ChengLei Shao
20a4e14d4b
fix: prevent creation of collection with existing name (#5962)
* Fix: prevent creation of collection with existing name

* fix: test

* fix: test
2024-12-29 08:29:41 +08:00
nocobase[bot]
d7b58d1f94 Merge branch 'next' into develop 2024-12-28 14:45:30 +00:00
xilesun
35b76da8dd fix: test 2024-12-28 22:44:42 +08:00
nocobase[bot]
702a335b6d Merge branch 'next' into develop 2024-12-28 14:31:01 +00:00
nocobase[bot]
887f989da0 Merge branch 'main' into next 2024-12-28 14:30:36 +00:00
YANG QIA
a89269d25a
test: sub app agent (#5963)
* test: sub agent

* chore: test

---------

Co-authored-by: Chareice <chareice@live.com>
2024-12-28 22:30:12 +08:00
nocobase[bot]
c685b8ca4a Merge branch 'next' into develop 2024-12-28 13:29:10 +00:00
Katherine
2fd614fd64
fix: date range picker in filter form/action not showing time picker when showTime=true is set (#5956) 2024-12-28 21:28:46 +08:00
nocobase[bot]
10b6f6a851 Merge branch 'next' into develop 2024-12-28 12:48:10 +00:00
nocobase[bot]
31ddbc402f Merge branch 'main' into next 2024-12-28 12:47:48 +00:00
Katherine
c77a8a35ff
fix: issue with field assignment in subtable when re-select data after deleting data (#5958)
* fix: issue with field assignment in subtable when re-select data after deleting

* fix: bug
2024-12-28 20:47:22 +08:00
nocobase[bot]
4c0e2c1a82 Merge branch 'next' into develop 2024-12-28 12:02:21 +00:00
nocobase[bot]
936d834eb6 Merge branch 'main' into next 2024-12-28 12:01:58 +00:00
Zeke Zhang
aad9518c0a
chore: change default theme to compact mode (#5957) 2024-12-28 20:01:34 +08:00
nocobase[bot]
6a488f2189 Merge branch 'next' into develop 2024-12-27 11:35:35 +00:00
nocobase[bot]
1d57ab1799 Merge branch 'main' into next 2024-12-27 11:35:13 +00:00
Junyi
a6d9f2ff27
fix(plugin-workflow-manual): fix details block context (#5953)
* fix(client): fix details block context

* fix(plugin-workflow-manual): fix FormBlockProvider context
2024-12-27 19:34:50 +08:00
nocobase[bot]
0a210c1429 Merge branch 'next' into develop 2024-12-27 02:51:09 +00:00
nocobase[bot]
360a8535e1 chore(versions): 😊 publish v1.5.0-beta.18 v1.5.0-beta.18 2024-12-27 02:50:52 +00:00
Junyi
c7831676af
fix(plugin-workflow): fix date range variables (#5954)
* feat: hidden date range variables from nodes which is not filter components

* feat: remove system daterange variables from plugin

* refactor(plugin-workflow): move date range variables to component

* fix(plugin-workflow): remove useless code

---------

Co-authored-by: Linda <huanghui9850@gmail.com>
2024-12-26 23:42:38 +08:00
nocobase[bot]
7e9cda873f Merge branch 'next' into develop 2024-12-26 13:31:33 +00:00
nocobase[bot]
fd138ab045 Merge branch 'main' into next 2024-12-26 13:31:11 +00:00
Zeke Zhang
b8618e4c92
fix: fix children field error (#5951) 2024-12-26 21:30:49 +08:00
nocobase[bot]
be8f906f46 Merge branch 'next' into develop 2024-12-26 12:56:52 +00:00
Junyi
88cb820cdd
fix(client): remove console.log (#5721) 2024-12-26 20:56:27 +08:00
nocobase[bot]
b99ea5fa1d Merge branch 'next' into develop 2024-12-26 12:17:19 +00:00
nocobase[bot]
4f1358fe4d Merge branch 'main' into next 2024-12-26 12:16:58 +00:00
nocobase[bot]
2dce1e5a42 docs: update changelogs 2024-12-26 12:16:32 +00:00
nocobase[bot]
123569ed21 Merge branch 'next' into develop 2024-12-26 11:53:05 +00:00
nocobase[bot]
13cf4be201 Merge branch 'main' into next 2024-12-26 11:51:26 +00:00
nocobase[bot]
9ee8f4e481 chore(versions): 😊 publish v1.4.16 v1.4.16 2024-12-26 11:51:03 +00:00
nocobase[bot]
3b3cb6875f Merge branch 'next' into develop 2024-12-26 10:03:58 +00:00
chenos
6412e08b3f
fix: update ProviderOptions.tsx (#5949) 2024-12-26 18:03:30 +08:00
nocobase[bot]
a4192b8e99 Merge branch 'next' into develop 2024-12-26 06:24:32 +00:00
nocobase[bot]
d2bd8cdf48 Merge branch 'main' into next 2024-12-26 06:24:12 +00:00
chenos
c79b7297f2
fix: unix timestamp accuracy (#5931)
* fix: unix timestamp accuracy

* fix: unixTimestamp support int value

* fix: tojson

* fix(database): fix unix timestamp input value on number type

* chore(database): remove only in test

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
Co-authored-by: mytharcher <mytharcher@gmail.com>
2024-12-26 14:23:51 +08:00
xilesun
c6fbcfe329 fix: test 2024-12-26 13:43:55 +08:00
nocobase[bot]
80b312f6bb Merge branch 'next' into develop 2024-12-26 05:40:20 +00:00
xilesun
fdb304c4a2 fix: test 2024-12-26 13:39:47 +08:00
Junyi
56c03f3fef
feat(plugin-workflow): add workflow task panel in toolbar (#5858)
* feat(plugin-workflow): add workflow task panel in toolbar

* fix(plugin-workflow): fix type

* fix(plugin-workflow): fix manual task list filter

* fix(plugin-workflow): add tooltip for task button
2024-12-26 10:44:34 +08:00
nocobase[bot]
631cea1df9 Merge branch 'next' into develop 2024-12-25 11:33:18 +00:00
nocobase[bot]
ec8c2677b7 Merge branch 'main' into next 2024-12-25 11:32:57 +00:00
Katherine
9a93490dd2
fix: o2o association field not displaying target collection field in… (#5921)
* fix: o2o association field not  displaying target collection field in detail and form block

* fix: test
2024-12-25 19:32:31 +08:00
nocobase[bot]
129c14cd19 Merge branch 'next' into develop 2024-12-25 02:18:36 +00:00
Zeke Zhang
d753c5add9
fix(Table): fix compatibility issues (#5934)
* fix(Table): fix compatibility issues

* Revert "fix(Table): fix compatibility issues"

This reverts commit 2c000832dd7479e24c960b4b68c6f36007933ca6.

* fix(Table): fix compatibility issues
2024-12-25 10:18:15 +08:00
nocobase[bot]
fe27acec9e Merge branch 'next' into develop 2024-12-25 02:16:47 +00:00
Zeke Zhang
de4921834d
fix(NocoBaseReactiveField): remove disable and readOnly (#5922)
Fix the issue where the delete button is disabled in the block template management page
2024-12-25 10:16:25 +08:00
nocobase[bot]
a2c6db9221 Merge branch 'next' into develop 2024-12-25 00:46:00 +00:00
nocobase[bot]
8d75a7fcfd Merge branch 'main' into next 2024-12-25 00:45:38 +00:00
Sheldon Guo
5210267d53
fix(notification-in-app-message): include user ID filter in in-app channels query (#5942) 2024-12-25 08:45:07 +08:00