4283 Commits

Author SHA1 Message Date
nocobase[bot]
696bb69080 Merge branch 'next' into develop 2024-12-16 07:02:54 +00:00
nocobase[bot]
289d476ad1 Merge branch 'main' into next 2024-12-16 07:02:30 +00:00
ChengLei Shao
347d43c0c5
feat(database): add firstOrCreate and updateOrCreate methods to Relation repository (#5894)
* feat(database): add firstOrCreate and updateOrCreate methods to BelongsToManyRepository

* fix: build

* fix: test
2024-12-16 15:02:06 +08:00
nocobase[bot]
a5ac08ac0b Merge branch 'next' into develop 2024-12-16 01:46:45 +00:00
Zeke Zhang
5ff8b19e57
fix(NocoBaseRecursionField): ignore x-read-pretty when merging schemas (#5885)
* fix(NocoBaseRecursionField): ignore x-read-pretty when merging schemas

* test: add e2e test
2024-12-16 09:46:19 +08:00
nocobase[bot]
20b4bbbd78 Merge branch 'next' into develop 2024-12-16 01:26:45 +00:00
nocobase[bot]
a623362ac5 Merge branch 'main' into next 2024-12-16 01:26:25 +00:00
nocobase[bot]
faf1eeedd0 Merge branch 'next' into develop 2024-12-16 01:26:19 +00:00
ChengLei Shao
fef379d9bf
fix: datetime parser of YYYYMMDD format (#5891)
* fix: parse number format in date only field

* chore: test

* chore: build
2024-12-16 09:26:03 +08:00
nocobase[bot]
082fa157f5 Merge branch 'main' into next 2024-12-16 01:25:46 +00:00
ChengLei Shao
fbe63b1712
fix: filter external data source collections (#5890)
* fix: filter external data source collections

* fix: test
2024-12-16 09:25:21 +08:00
nocobase[bot]
4e0cd8a57d chore(versions): 😊 publish v1.5.0-beta.9 2024-12-15 11:45:45 +00:00
nocobase[bot]
a8bc4155dd chore(versions): 😊 publish v1.5.0-beta.8 2024-12-15 07:54:02 +00:00
nocobase[bot]
b10daeccde Merge branch 'next' into develop 2024-12-14 15:04:02 +00:00
katherinehhh
17424ab90a Merge branch 'main' into next 2024-12-14 23:03:01 +08:00
Katherine
6ff60c1b8a
fix:pg view creation issue, resolve error when selecting views across schemas (#5881)
* fix: pg view creation issue, resolve error when selecting views across schemas

* fix: pg view creation issue, resolve error when selecting views across schemas

* refactor: locale

* fix: bug
2024-12-14 22:59:36 +08:00
nocobase[bot]
69f5f15e27 Merge branch 'next' into develop 2024-12-14 13:26:07 +00:00
katherinehhh
98ceee6066 Merge branch 'main' into next 2024-12-14 21:25:21 +08:00
xilesun
24f248acd1 chore: fix locale 2024-12-13 23:12:58 +08:00
Katherine
10a4754fa5
fix: collection select client test (#5889) 2024-12-13 17:57:38 +08:00
nocobase[bot]
93d2345c3c Merge branch 'next' into develop 2024-12-13 07:46:39 +00:00
Zeke Zhang
1daaaa0941 chore(ellipsis): unskip e2e test 2024-12-13 15:45:54 +08:00
nocobase[bot]
03509791fd Merge branch 'next' into develop 2024-12-13 06:04:33 +00:00
nocobase[bot]
93e8e535ad Merge branch 'main' into next 2024-12-13 06:04:14 +00:00
Katherine
0154a32996
fix: issue with group styles in form blocks when layout is set to horizontal (#5884) 2024-12-13 14:03:53 +08:00
nocobase[bot]
5a00386c4f chore(versions): 😊 publish v1.5.0-beta.7 2024-12-13 04:36:42 +00:00
nocobase[bot]
b5db91caf6 Merge branch 'next' into develop 2024-12-13 02:08:57 +00:00
xilesun
603de6946b Merge branch 'main' into next 2024-12-13 10:08:09 +08:00
nocobase[bot]
435239994e Merge branch 'next' into develop 2024-12-13 02:01:03 +00:00
Zhi Chen
21bd55422f
refactor(audit-manager): optimize the logic of getting metadata (#5814)
* chore: optmize log output

* chore: optmize log output
2024-12-13 10:00:41 +08:00
Zeke Zhang
e94eab7680
fix(RemoteSelect): fix 'N/A' issue (#5878) 2024-12-13 09:00:57 +08:00
YANG QIA
753e911ac4
fix(users): the form should be reset after adding or editing a user in the user management (#5875) 2024-12-12 22:56:06 +08:00
Katherine
e04c404b4c
feat: support selecting existing data in subform (#5849)
* feat: subform support selecting existing data

* chore: add new button in sub form

* fix: build

* fix: bug

* fix: test

* fix: test
2024-12-12 22:10:14 +08:00
nocobase[bot]
ca3b98ce1f chore(versions): 😊 publish v1.4.10 2024-12-12 14:04:41 +00:00
nocobase[bot]
1ebe1b142e Merge branch 'next' into develop 2024-12-12 13:31:21 +00:00
Zeke Zhang
bd51dc3500 fix(documentTitle): fix browser tab title display issue 2024-12-12 21:30:12 +08:00
nocobase[bot]
93a29b34c1 Merge branch 'next' into develop 2024-12-12 10:15:27 +00:00
nocobase[bot]
10a513f2ef Merge branch 'main' into next 2024-12-12 10:15:04 +00:00
ChengLei Shao
b897a8d5e6
fix: template with appends (#5839)
* fix: template with appends

* fix: assign logic

* chore: test
2024-12-12 18:14:38 +08:00
nocobase[bot]
8eaed047e6 Merge branch 'next' into develop 2024-12-12 08:35:54 +00:00
nocobase[bot]
1cd24dfe18 Merge branch 'main' into next 2024-12-12 08:35:12 +00:00
Katherine
8f8f9e4af2
fix: issue where file table selector is not display in non-configuration mode when using file select (#5874) 2024-12-12 16:34:51 +08:00
nocobase[bot]
3dc3dc6c13 Merge branch 'next' into develop 2024-12-12 03:17:46 +00:00
nocobase[bot]
1aa67a5f2c Merge branch 'main' into next 2024-12-12 03:17:38 +00:00
chenos
3ad8704153 chore: remove console log 2024-12-12 11:17:13 +08:00
nocobase[bot]
27b326d9ba chore(versions): 😊 publish v1.4.9 2024-12-12 03:15:37 +00:00
nocobase[bot]
d0087130f1 Merge branch 'next' into develop 2024-12-12 02:28:31 +00:00
nocobase[bot]
25a9165d7a Merge branch 'main' into next 2024-12-12 02:28:07 +00:00
Zeke Zhang
d5ac3eee04
fix(dataScope): fix issue with nested association field variables (#5866) 2024-12-12 10:27:42 +08:00
nocobase[bot]
dc11de9238 Merge branch 'next' into develop 2024-12-12 01:51:37 +00:00