chenos
f1a88e2a89
Merge branch 'develop' into feat/commercial
...
# Conflicts:
# packages/core/cli/package.json
2025-04-24 20:56:34 +08:00
nocobase[bot]
57ba3d54b3
Merge branch 'next' into develop
2025-04-24 09:59:23 +00:00
Katherine
a9fb7ea56e
feat(custom-request): support variable in success message of custom request action ( #6694 )
...
* feat: support variable in success message of custom request action
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: bug
2025-04-24 17:59:01 +08:00
nocobase[bot]
91803a8ba1
Merge branch 'next' into develop
2025-04-24 09:33:47 +00:00
nocobase[bot]
d1d8f4bbe7
Merge branch 'main' into next
2025-04-24 09:33:26 +00:00
YANG QIA
bd06d13749
fix(m2m-array): incorrect data retrieved for m2m array fields from association in forms ( #6744 )
...
* fix(m2m-array): incorrect data retrieved for m2m array fields from association in forms
* fix(getAction): update pagination parameter for hasMany and belongsToMany actions
---------
Co-authored-by: Zeke Zhang <958414905@qq.com>
2025-04-24 17:33:00 +08:00
nocobase[bot]
6f9df134da
Merge branch 'next' into develop
2025-04-24 09:09:56 +00:00
nocobase[bot]
b739367029
Merge branch 'main' into next
2025-04-24 09:09:34 +00:00
Katherine
b8bfc17a59
refactor: adjust view collection action permission control ( #6764 )
2025-04-24 17:09:11 +08:00
nocobase[bot]
666a319735
Merge branch 'next' into develop
2025-04-24 08:32:55 +00:00
nocobase[bot]
717b5cc3c6
Merge branch 'main' into next
2025-04-24 08:32:27 +00:00
Katherine
04e17444fa
fix: only export action in view collection is support when writableView is false ( #6763 )
2025-04-24 16:32:06 +08:00
nocobase[bot]
7e39db82f0
Merge branch 'next' into develop
2025-04-24 08:17:14 +00:00
nocobase[bot]
6b3d0e1f6b
Merge branch 'main' into next
2025-04-24 08:16:49 +00:00
Junyi
717177b471
fix(client): adjust upload message ( #6757 )
2025-04-24 16:16:22 +08:00
nocobase[bot]
eae9775fa5
Merge branch 'next' into develop
2025-04-24 07:09:26 +00:00
Katherine
2ef89513ff
refactor: remove icon from row buttons in plugin ( #6760 )
2025-04-24 15:09:01 +08:00
nocobase[bot]
3d08fee9f3
Merge branch 'next' into develop
2025-04-24 01:55:03 +00:00
nocobase[bot]
c6935a8923
Merge branch 'main' into next
2025-04-24 01:54:43 +00:00
Katherine
0758490913
fix: unexpected data creation when displaying association field under sub-form/sub-table in create form action ( #6727 )
...
* fix: unexpected data creation when displaying relational field subtable in create form
* fix: bug
* fix: bug
* fix: bug
2025-04-24 09:54:22 +08:00
nocobase[bot]
851f35657a
chore(versions): 😊 publish v1.7.0-alpha.12
2025-04-24 01:43:51 +00:00
nocobase[bot]
d7c4921d1d
chore(versions): 😊 publish v1.7.0-beta.22
2025-04-24 00:00:43 +00:00
nocobase[bot]
c8e5a1c7e7
chore(versions): 😊 publish v1.6.23
2025-04-23 15:06:25 +00:00
nocobase[bot]
f7aa0501bc
Merge branch 'next' into develop
2025-04-23 14:06:49 +00:00
Katherine
a76ae40968
fix: display issue with linkage rules in multi-level association data ( #6755 )
2025-04-23 22:06:16 +08:00
nocobase[bot]
7fb0805888
chore(versions): 😊 publish v1.7.0-beta.21
2025-04-23 10:21:44 +00:00
nocobase[bot]
ee92356ae0
Merge branch 'next' into develop
2025-04-23 08:20:19 +00:00
nocobase[bot]
97c33f6eed
Merge branch 'main' into next
2025-04-23 08:19:57 +00:00
Katherine
3d73ea0acb
fix: tree table 'Add Child' button linkage rule without 'current record' variable ( #6752 )
2025-04-23 16:19:36 +08:00
Zeke Zhang
6b51026941
Merge branch 'next' into develop
2025-04-23 16:08:37 +08:00
nocobase[bot]
2622074094
Merge branch 'main' into next
2025-04-23 06:01:45 +00:00
Katherine
63ebe1d357
refactor: formula syntax references link ( #6751 )
2025-04-23 14:01:20 +08:00
nocobase[bot]
ba89bcd4b4
Merge branch 'main' into next
2025-04-23 03:40:15 +00:00
Katherine
7340a7d187
fix: missing filter for already associated data when adding association data ( #6750 )
...
* fix: missing filter for already associated data when adding association collection table
* fix: bug
2025-04-23 11:39:54 +08:00
Zeke Zhang
9eb5dbc853
fix: issue with data block refresh not working ( #6748 )
2025-04-23 08:30:55 +08:00
nocobase[bot]
5fd8649fc3
chore(versions): 😊 publish v1.6.22
2025-04-22 09:44:09 +00:00
nocobase[bot]
ad0b48a26c
Merge branch 'main' into next
2025-04-22 03:37:11 +00:00
Zeke Zhang
e5055ef4f6
fix(styles): add relative positioning to span elements in mobile navigation bar action ( #6734 )
2025-04-22 11:36:48 +08:00
nocobase[bot]
75aede8ef5
Merge branch 'main' into next
2025-04-22 03:36:16 +00:00
Zeke Zhang
2faed8de79
fix(SchemaSettingsActionModalItem): fix zIndex ( #6733 )
2025-04-22 11:35:54 +08:00
Katherine
3049f35490
fix: issue with time field as condition in linkage rules ( #6738 )
2025-04-22 11:13:29 +08:00
Katherine
ffdd03b4bc
fix: date time field condition not working in linkage rules ( #6728 )
...
* fix: datetime field in linakge rule condiction
* fix: bug
* fix: bug
2025-04-21 20:52:24 +08:00
jiann
53f2ff4779
Merge remote-tracking branch 'origin/develop' into feat/commercial
2025-04-21 11:21:17 +08:00
nocobase[bot]
932d5d4bfe
Merge branch 'next' into develop
2025-04-21 01:47:54 +00:00
Katherine
374c569dc0
fix: incorrect value display for "Enable index column" ( #6724 )
2025-04-21 09:47:15 +08:00
nocobase[bot]
6712a25486
Merge branch 'next' into develop
2025-04-21 01:25:27 +00:00
nocobase[bot]
813be720de
Merge branch 'main' into next
2025-04-21 01:25:02 +00:00
nocobase[bot]
3cc140d42b
Merge branch 'next' into develop
2025-04-21 01:19:53 +00:00
chenos
31da3c78e9
feat: allow setting sidebar width in theme config ( #6720 )
2025-04-21 09:19:31 +08:00
Katherine
569ae3c110
fix: missing action option constraints when reopening linkage rules ( #6723 )
...
* fix: missing action option constraints when reopening linkage rules
* fix: bug
2025-04-21 09:19:05 +08:00
