9999 Commits

Author SHA1 Message Date
nocobase[bot]
461525353b Merge branch 'next' into develop 2025-04-30 10:30:06 +00:00
Katherine
86b6603b1d
feat: support variables in secondary confirmation title and content (#6787)
* feat: support variables in secondary confirmation title and content

* fix: bug

* fix: build error

* fix: e2e

* fix: test

* fix: test

* fix: test

* fix: test

* fix: bug

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test
2025-04-30 18:29:42 +08:00
nocobase[bot]
3a292cb2e4 Merge branch 'next' into develop 2025-04-30 02:36:31 +00:00
Katherine
1814835ec5
fix: build error (#6812) 2025-04-30 10:36:08 +08:00
nocobase[bot]
d2782db48b Merge branch 'next' into develop 2025-04-30 01:55:59 +00:00
katherinehhh
d4259214fc Merge branch 'main' into next 2025-04-30 09:54:17 +08:00
nocobase[bot]
7e5980c7af Merge branch 'next' into develop 2025-04-30 01:42:58 +00:00
gchust
b164d9a2fa
fix: incorrect variable selection when first click to load data (#6802)
* fix: incorrect variable selection when first click to load data

* Revert "fix: incorrect variable selection when first click to load data"

This reverts commit 0caa9a84b15c51cf87e03819c51b79d8be3e99e9.

* fix: e2e tests
2025-04-30 09:42:35 +08:00
Katherine
fd8606e69e
fix: duplicate validation error messages for rule violations in form field (#6805) 2025-04-30 09:36:05 +08:00
Katherine
fe005e091a
fix: ssue with configuring linkage rules in subform (popup) within subtable (#6803) 2025-04-30 09:35:26 +08:00
nocobase[bot]
569e2444ae Merge branch 'next' into develop 2025-04-30 01:34:54 +00:00
xilesun
dfc5ec098c fix(verification): migration version number 2025-04-30 09:34:05 +08:00
Sheldon Guo
b07f8a8768
feat: support placeholder (#6670) 2025-04-30 08:48:31 +08:00
nocobase[bot]
8d8cbb2db2 Merge branch 'next' into develop 2025-04-29 23:43:03 +00:00
nocobase[bot]
b98a9a97e8 Merge branch 'main' into next 2025-04-29 23:42:41 +00:00
Zeke Zhang
db88e8301f
fix: exclude 'attachmentURL' from associated form item filter (#6809) 2025-04-30 07:42:18 +08:00
nocobase[bot]
a29c7cdd77 Merge branch 'next' into develop 2025-04-29 12:07:40 +00:00
nocobase[bot]
39e27f94a7 Merge branch 'main' into next 2025-04-29 12:07:16 +00:00
nocobase[bot]
5c2bd3c496 docs: update changelogs 2025-04-29 12:06:39 +00:00
nocobase[bot]
45dec8ad86 Merge branch 'next' into develop 2025-04-29 12:00:15 +00:00
nocobase[bot]
4a0ce6fdda Merge branch 'main' into next 2025-04-29 11:58:24 +00:00
nocobase[bot]
09c53403eb chore(versions): 😊 publish v1.6.25 v1.6.25 2025-04-29 11:57:38 +00:00
nocobase[bot]
0ae42b35b9 Merge branch 'next' into develop 2025-04-29 07:27:14 +00:00
nocobase[bot]
0965749f8c Merge branch 'main' into next 2025-04-29 07:26:50 +00:00
YANG QIA
6cb13f73e6
fix(auth): disallow changing of authenticator uid (#6808) 2025-04-29 15:26:23 +08:00
nocobase[bot]
f009420588 Merge branch 'next' into develop 2025-04-29 06:36:35 +00:00
katherinehhh
08bd9fa8a8 Merge branch 'main' into next 2025-04-29 14:35:36 +08:00
nocobase[bot]
9f3d2a9ce3 Merge branch 'next' into develop 2025-04-29 06:23:03 +00:00
Katherine
ab1cf294d6
fix: duplicate linkage rules in the operation panel's link action (#6806) 2025-04-29 14:22:37 +08:00
Katherine
4f06ebcdd2
style: optimize subtable add button style and align paginator on the same row (#6790) 2025-04-29 11:07:17 +08:00
nocobase[bot]
b09464234d Merge branch 'next' into develop 2025-04-28 14:34:03 +00:00
Katherine
bd077d5cc2
fix: field linkage rules not working for subform (popup) in subtable (#6800) 2025-04-28 22:33:38 +08:00
nocobase[bot]
1d3013eee6 Merge branch 'next' into develop 2025-04-28 13:17:54 +00:00
nocobase[bot]
973038a2e9 Merge branch 'main' into next 2025-04-28 13:17:32 +00:00
Junyi
823d67ac13
fix(database): fix trim option for string and text field (#6797) 2025-04-28 21:17:05 +08:00
nocobase[bot]
459475d0ee Merge branch 'next' into develop 2025-04-28 13:02:16 +00:00
Katherine
9c789b88c4
fix: custom request response set to variable not displaying correctly (#6793) 2025-04-28 21:01:35 +08:00
nocobase[bot]
b25d99ea11 Merge branch 'next' into develop 2025-04-28 11:49:05 +00:00
nocobase[bot]
090e012384 Merge branch 'main' into next 2025-04-28 11:48:43 +00:00
Junyi
3b1b4cfef5
fix(plugin-file-manager): add oss timeout option default to 10min (#6795) 2025-04-28 19:48:18 +08:00
nocobase[bot]
94d4f1f8fe Merge branch 'next' into develop 2025-04-28 11:28:02 +00:00
nocobase[bot]
cfbd0d6fbb Merge branch 'main' into next 2025-04-28 11:27:38 +00:00
Katherine
a28e1d2c39
fix: association field not submitting data when displaying field from related collection (#6798) 2025-04-28 19:27:16 +08:00
nocobase[bot]
2b4257d1c5 Merge branch 'next' into develop 2025-04-28 11:21:50 +00:00
nocobase[bot]
aaef833be5 Merge branch 'main' into next 2025-04-28 11:21:28 +00:00
Katherine
c1f8b4d2f7
Revert "fix: association field not submitting data when displaying field fro…" (#6796)
This reverts commit d4bf52a047243f5274e23dbf3e57e49d396dba00.
2025-04-28 19:21:06 +08:00
nocobase[bot]
f43760061f Merge branch 'next' into develop 2025-04-28 10:06:26 +00:00
nocobase[bot]
630409b4cb Merge branch 'main' into next 2025-04-28 10:05:52 +00:00
Katherine
d4bf52a047
fix: association field not submitting data when displaying field from related collection (#6789)
* fix: o2o association field not submitting data when display association field are used

* fix: bug

* fix: bug
2025-04-28 18:04:36 +08:00
nocobase[bot]
822d004ab0 Merge branch 'next' into develop 2025-04-28 09:49:09 +00:00