4796 Commits

Author SHA1 Message Date
gchust
c6e75919ba
fix: block template configure page style (#6625)
* fix: block template configure page style

* fix: unit tests errors

* chore: update tests snapshot

* fix: inconsistant style
2025-04-06 19:27:06 +08:00
Zeke Zhang
def3a0a388
fix: add headers to API request in AssociationFieldProvider (#6619)
* fix: add headers to API request in AssociationFieldProvider

* fix: handle optional dataSource in headers for API request in AssociationFieldProvider
2025-04-06 17:53:10 +08:00
Junyi
393b46a3bc
refactor(client): add trim API for Input and Variable.TextArea (#6624)
* refactor(client): add trim API for Input and Variable.TextArea

* fix(client): avoid trim property to be passed to inner component
2025-04-06 09:58:46 +08:00
aaaaaajie
27cfefeb88 refactor: support main source mssql 2025-04-06 03:01:02 +08:00
Sheldon Guo
8f5ae04743
feat: enhance error handling with optional title in AppError component (#6409) 2025-04-04 19:29:49 +08:00
aaaaaajie
0e3a02cdb3 fix: merge develop 2025-04-04 00:55:49 +08:00
aaaaaajie
11578db51c Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-04-04 00:08:58 +08:00
Katherine
235cbebf74
fix: issue with Gantt block in tree collection (#6617)
* fix: issue with Gantt block in tree collection

* fix: bug

* fix: test
2025-04-03 20:25:44 +08:00
nocobase[bot]
47e967b9da Merge branch 'next' into develop 2025-04-03 08:44:05 +00:00
Zeke Zhang
3fb5afc33b fix(Collapse): avoid crashing 2025-04-03 16:41:47 +08:00
nocobase[bot]
c37ea4d60a chore(versions): 😊 publish v1.6.16 2025-04-03 07:15:19 +00:00
nocobase[bot]
4eb79f7aa9 Merge branch 'main' into next 2025-04-03 04:27:29 +00:00
chenos
709e09b1c8
fix: rename 2025-04-03 12:27:06 +08:00
chenos
54b6078c26
fix: rename 2025-04-03 12:24:28 +08:00
nocobase[bot]
6be064bc57 Merge branch 'next' into develop 2025-04-03 01:33:24 +00:00
nocobase[bot]
9d6c04640f Merge branch 'main' into next 2025-04-03 01:33:01 +00:00
Katherine
1552245abc
fix: style issue of tooltip-icon in form fields (#6615) 2025-04-03 09:32:32 +08:00
nocobase[bot]
d36c35977d Merge branch 'next' into develop 2025-04-02 08:59:25 +00:00
nocobase[bot]
d7d85d179e Merge branch 'main' into next 2025-04-02 08:59:03 +00:00
Zeke Zhang
cf36a3216b chore: add comment 2025-04-02 16:58:01 +08:00
aaaaaajie
a5c9a62ae3 fix: merge develop and fix confliect 2025-04-02 15:52:55 +08:00
nocobase[bot]
d0483f07b3 Merge branch 'next' into develop 2025-04-02 07:42:12 +00:00
katherinehhh
05284f29a8 Merge branch 'main' into next 2025-04-02 15:41:20 +08:00
Katherine
d2025ee76f
fix: field label display issue to prevent truncation by colon (#6599)
* fix: form field label truncation due to colon

* fix: test

* fix: bug
2025-04-02 14:54:09 +08:00
chenos
ab95c13a73 fix: assign 2025-04-02 14:46:41 +08:00
chenos
5046d68c8e fix: assign getKeys 2025-04-02 12:48:00 +08:00
Katherine
6632c755d6
fix: x-disabled property not taking effect on form fields (#6610) 2025-04-02 11:32:33 +08:00
Zeke Zhang
23f0fdefb1
fix(public-form): determine whether it is a mobile terminal based on the device type (#6611)
* Revert "fix: update mobile layout handling and clean up unused context (#6600)"

This reverts commit 3558fc3ced64cbdd8aedece062d9a221821ba55d.

* fix: update mobile detection logic in PublicFormPage component
2025-04-02 11:00:31 +08:00
nocobase[bot]
994be1a2a1 chore(versions): 😊 publish v1.7.0-beta.13 2025-04-02 01:08:51 +00:00
aaaaaajie
ee70b65d1b feat: plugins in mssql 2025-04-02 02:43:52 +08:00
aaaaaajie
fcfeffe504 refactor: union role acl 2025-04-01 23:49:01 +08:00
nocobase[bot]
f59270f179 Merge branch 'next' into develop 2025-04-01 15:29:41 +00:00
nocobase[bot]
6a191f390c Merge branch 'main' into next 2025-04-01 15:29:17 +00:00
YANG QIA
12e6824153
fix(db): filterByTk is ignored when both filter and filterByTk are used in o2m deletion (#6606)
* fix(db): `filterByTk` is ignored when both `filter` and `filterByTk` are used in o2m deletion

* test: add test
2025-04-01 23:28:41 +08:00
aaaaaajie
18b8f9bc0e refactor: union role acl 2025-04-01 21:13:28 +08:00
nocobase[bot]
71a55d6f10 chore(versions): 😊 publish v1.6.15 2025-04-01 12:59:02 +00:00
aaaaaajie
9ef9dd4c15 refactor: union role acl 2025-04-01 20:36:53 +08:00
nocobase[bot]
d13718a1c0 Merge branch 'next' into develop 2025-04-01 09:47:56 +00:00
nocobase[bot]
de2e49acda Merge branch 'main' into next 2025-04-01 09:47:35 +00:00
Junyi
54817e1453
feat(database): add trim option for text field (#6603) 2025-04-01 17:47:12 +08:00
aaaaaajie
bd87d74ce1 refactor: enhance role merging logic: prioritize strategy actions over existing actions 2025-04-01 17:38:06 +08:00
nocobase[bot]
b81615d700 Merge branch 'next' into develop 2025-04-01 07:19:54 +00:00
nocobase[bot]
3f3c7f3e91 Merge branch 'main' into next 2025-04-01 07:14:46 +00:00
Junyi
520ffa3e3e
fix(client): support disabled props for SchemaInitializerItem when has items (#6597)
* fix(client): support disabled props for SchemaInitializerItem when has items

* refactor(client): use default menu props for disabled
2025-04-01 15:14:23 +08:00
nocobase[bot]
ce118fa479 Merge branch 'next' into develop 2025-04-01 07:11:17 +00:00
nocobase[bot]
ff57b76a0c Merge branch 'main' into next 2025-04-01 07:10:52 +00:00
Junyi
164772afb8
fix(database): fix datetimeNoTz field (#6588)
* fix(database): fix datetimeNoTz field

* fix(database): fix test case
2025-04-01 15:10:28 +08:00
nocobase[bot]
97c310e9f2 Merge branch 'next' into develop 2025-04-01 05:25:53 +00:00
nocobase[bot]
219a5875b8 Merge branch 'main' into next 2025-04-01 05:25:32 +00:00
Junyi
4c3255d455
feat(database): add trim option for string field (#6565)
* feat(database): add trim option for string field

* refactor(database): change to setDataValue instead of hooks

* fix(database): fix test case of view collection
2025-04-01 13:25:08 +08:00