4796 Commits

Author SHA1 Message Date
nocobase[bot]
4f5097f3a1 Merge branch 'main' into next 2025-04-01 03:38:37 +00:00
Katherine
69fac11204
fix: oneToMa ny e2e test (#6601) 2025-04-01 11:38:15 +08:00
Zeke Zhang
3558fc3ced
fix: update mobile layout handling and clean up unused context (#6600) 2025-04-01 11:36:37 +08:00
nocobase[bot]
b8b539dbc8 Merge branch 'next' into develop 2025-04-01 03:01:44 +00:00
nocobase[bot]
e3c82ecf13 Merge branch 'main' into next 2025-04-01 03:01:21 +00:00
YANG QIA
04e943a0b2
fix(m2m-array): error of filtering by fields in an association collection with a m2m array field (#6596)
* fix(m2m-array): error of filtering by fields in an association collection with a m2m array field

* test: add test

* feat: generateJoinOnForJSONArray
2025-04-01 11:00:59 +08:00
aaaaaajie
1e23c28601 feat: plugin users in mssql 2025-04-01 02:27:00 +08:00
aaaaaajie
bc7fe14d54 feat: auth plugin in mssql 2025-04-01 01:03:33 +08:00
aaaaaajie
6db58cdd8a Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-03-31 23:14:25 +08:00
aaaaaajie
431dfeffa6 feat: auth plugin in mssql 2025-03-31 23:13:25 +08:00
nocobase[bot]
2dbce800d5 Merge branch 'next' into develop 2025-03-31 12:12:01 +00:00
Katherine
cb96426ecd
feat: support configuring colon visibility in form field labels based on layout (#6561)
* feat:  support hiding colons in form field labels

* refactor: colon default value
2025-03-31 20:11:36 +08:00
nocobase[bot]
ca6fbf1082 Merge branch 'next' into develop 2025-03-31 07:19:26 +00:00
nocobase[bot]
591bdc0c73 Merge branch 'main' into next 2025-03-31 07:19:05 +00:00
chenos
c178c215a9 fix: to error message 2025-03-31 15:18:09 +08:00
nocobase[bot]
c5f8b21051 Merge branch 'next' into develop 2025-03-31 06:59:34 +00:00
Katherine
39a07fe546
fix: build error for action props (#6594) 2025-03-31 14:59:14 +08:00
nocobase[bot]
1344b1ce22 Merge branch 'next' into develop 2025-03-31 06:43:01 +00:00
nocobase[bot]
963681b809 Merge branch 'main' into next 2025-03-31 06:42:41 +00:00
Katherine
a7775c25db
fix: association field (select) displaying N/A when exposing related collection fields (#6582)
* fix: association field (select) displaying N/A when exposing related collection fields

* fix: cascade issue: 'The value of xxx cannot be in array format' when deleting and re-selecting

* fix: bug
2025-03-31 14:42:16 +08:00
nocobase[bot]
dae5706bdc Merge branch 'next' into develop 2025-03-31 02:25:49 +00:00
Katherine
22f521cf72
fix: submit and refresh buttons not displaying icon-only mode correctly (#6592) 2025-03-31 10:25:26 +08:00
nocobase[bot]
d760c57b7f Merge branch 'next' into develop 2025-03-31 01:27:54 +00:00
nocobase[bot]
dfc0a2411a Merge branch 'main' into next 2025-03-31 01:27:33 +00:00
Katherine
c16d65ba7c
fix: cascade issue: 'The value of xxx cannot be in array format' when deleting and re-selecting (#6585)
* fix: cascade  issue: 'The value of xxx cannot be in array format' when deleting and re-selecting

* fix: bug

* fix: bug
2025-03-31 09:27:06 +08:00
aaaaaajie
09eda5ffdc feat: mock server access to plugin mssql import static and compatible mssql function 2025-03-30 19:24:28 +08:00
aaaaaajie
c98508d12c Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-03-30 19:22:19 +08:00
nocobase[bot]
26e30489da chore(versions): 😊 publish v1.6.14 2025-03-29 03:46:43 +00:00
aaaaaajie
f3b492a57d feat: support mssql changeColumn function 2025-03-28 21:02:20 +08: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
chenos
68f63b359b Merge branch 'next' into develop
# Conflicts:
#	packages/presets/nocobase/package.json
2025-03-28 15:02:25 +08:00
chenos
9d3317fc45 Merge branch 'main' into next
# Conflicts:
#	packages/presets/nocobase/package.json
2025-03-28 15:00:16 +08:00
Zeke Zhang
9eaa47863d
fix: remove refreshComponent in Grid component (#6578)
* fix: remove refreshComponent in Grid component

* test: add e2e test for modal content persistence after reopening
2025-03-28 12:01:13 +08:00
nocobase[bot]
ecdf6e839a Merge branch 'next' into develop 2025-03-28 03:02:05 +00:00
nocobase[bot]
93a7035230 Merge branch 'main' into next 2025-03-28 03:01:43 +00:00
chenos
1b782c4f95
refactor: async tasks (#6531)
* refactor: async tasks

* refactor: selectWithTitle support optionRender

* refactor: adjust export filename

* fix: build error

* fix: export file name

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2025-03-28 11:01:20 +08:00
aaaaaajie
5ed00e912c Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-03-27 23:35:31 +08:00
nocobase[bot]
f7c7791039 Merge branch 'next' into develop 2025-03-27 15:01:00 +00:00
nocobase[bot]
220321ac4e Merge branch 'main' into next 2025-03-27 15:00:34 +00:00
Katherine
eba3f79134
fix: linkage conflict between same-named association fields in different sub-tables within the same form (#6577)
* fix: linkage conflict between same-named association fields in different sub-tables within same form

* fix: bug
2025-03-27 23:00:04 +08:00
nocobase[bot]
aad023cfc0 chore(versions): 😊 publish v1.6.12 2025-03-27 12:58:32 +00:00
aaaaaajie
9c85d43164 feat: support mssql view function and fix test 2025-03-27 19:26:05 +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
nocobase[bot]
8773912c34 chore(versions): 😊 publish v1.6.11 2025-03-27 04:21:59 +00:00
nocobase[bot]
b707061ef6 chore(versions): 😊 publish v1.7.0-alpha.10 2025-03-27 04:19:11 +00:00
Zeke Zhang
7d2ddb2ca0 Merge branch 'next' into develop 2025-03-27 11:17:51 +08:00
Zeke Zhang
51a2d17f13
fix: adjust the font size displayed on the phone to 14px (#6570)
* refactor(plugin-mobile): rename GlobalStyle to ResetScrollbar for clarity

* fix: increase font size in InternalAdminLayout from 14 to 16

* fix: ensure button alignment in WorkbenchBlock styles
2025-03-27 11:13:58 +08:00
Zeke Zhang
9c6c612c4d
fix(layout): adjust height calculation for mobile support using dvh unit (#6571)
* fix(layout): adjust height calculation for mobile support using dvh unit

* feat: add createStyles import from antd-style for styling enhancements
2025-03-27 10:49:19 +08:00