4837 Commits

Author SHA1 Message Date
chenos
29d7cf3dbf fix: assign overwrite strategy 2025-04-10 09:06:32 +08:00
nocobase[bot]
eeec17265c chore(versions): 😊 publish v1.7.0-beta.14 2025-04-09 11:28:40 +00:00
nocobase[bot]
b10ae3aff6 Merge branch 'next' into develop 2025-04-09 11:06:32 +00:00
ajie
41961fb923
fix: correct role union calculation logic (#6605)
* refactor: enhance role merging logic: prioritize strategy actions over existing actions

* refactor: union role acl

* refactor: union role acl

* refactor: union role acl

* fix: assign getKeys

* fix: assign

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: switch role set default role record

* refactor: add setCurrentRole cache

* fix: e2e test

* fix: setCurrentRole

* refactor: switch role

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2025-04-09 19:06:05 +08:00
nocobase[bot]
aae9319f73 chore(versions): 😊 publish v1.6.17 2025-04-09 06:28:10 +00:00
Zeke Zhang
aa67992c91
feat: support automatic data block refresh (#6591)
* fix: update FilterContext to allow null parent value

* fix: refactor context usage from FilterContext to DataBlocksContext in FilterProvider and SchemaSettings

* feat: add highlight and unhighlight functionality for data blocks in SchemaSettings

* Revert "fix: refactor context usage from FilterContext to DataBlocksContext in FilterProvider and SchemaSettings"

This reverts commit a75c7002010785f1cfd2e78c4f5998d0194366bc.

* Revert "fix: update FilterContext to allow null parent value"

This reverts commit 6eb0b1989e20be8310f8dbce4e875e862123f2b3.

* feat: add AllDataBlocksProvider and integrate it into SchemaSettings and Page components

* feat: add BlocksSelector component and integrate data block refresh functionality in Action and SchemaSettings

* feat: optimize handleClick to use useMemo for better performance and refresh data blocks after onClick

* feat: add dialog visibility control in BlocksSelector for improved user experience

* fix: avoid error

* feat: add highlight and scroll tracking functionality for data blocks

* feat: add transition

* feat: add tootip

* fix: prevent closed dialog blocks from appearing in the BlocksSelector options

* fix: handle errors during block refresh to prevent crashes

* chore: fix build

* feat: add AllDataBlocksProvider to BlockTemplatePage and export from index

* feat: set width for AfterSuccess dialog to 700

* feat: wrap MobileRouter with AllDataBlocksProvider for improved data handling

* feat: export BlocksSelector component and integrate into AfterSuccess settings

* fix: ensure container visibility is managed correctly in highlightBlock and unhighlightBlock functions

* fix: remove unnecessary display property manipulation in highlightBlock and simplify unhighlightBlock logic

* chore: hide data refresh after sucess option from block template configure page

* fix: revert code format

---------

Co-authored-by: gchust <gchust@qq.com>
2025-04-09 09:51:50 +08:00
nocobase[bot]
8d89174f31 Merge branch 'next' into develop 2025-04-08 14:18:39 +00:00
chenos
5ecc4f2381
feat: added localization module for UISchema, enabling custom translations for schema title and description. (#6574)
* feat: add i18n support for ui schema

* feat: add locale tester

* feat: uischame localization source

* refactor: page title

* refactor: tab title

* refactor: column title

* refactor: form field title

* fix: bug

* refactor: uischema localzation sync

* fix: bug

* fix: issue with Gantt block in tree collection (#6617)

* fix: issue with Gantt block in tree collection

* fix: bug

* fix: test

* feat: enhance error handling with optional title in AppError component (#6409)

* 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

* 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

* fix: variable parse failure when URL parameters contain Chinese characters (#6618)

* refactor: code improve

* fix: bug

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test

* fix: e2e test

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
Co-authored-by: Sheldon Guo <sheldon_66@163.com>
Co-authored-by: Junyi <mytharcher@users.noreply.github.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
2025-04-08 22:18:09 +08:00
nocobase[bot]
102f916354 Merge branch 'next' into develop 2025-04-08 09:25:39 +00:00
Zeke Zhang
ee603e7195 Merge branch 'main' into next 2025-04-08 17:24:52 +08:00
Junyi
3c5ff51472
chore(utils): add extends for dayjs (#6630) 2025-04-07 22:01:24 +08:00
nocobase[bot]
1d698dc9dc Merge branch 'next' into develop 2025-04-07 09:50:21 +00:00
Katherine
d5f99d97df
fix: single-select field with 'contains' filter on mobile does not support multiple selection (#6629) 2025-04-07 16:02:51 +08:00
Katherine
aa59e0131f
fix: rule with 'any' condition does not take effect when condition li… (#6628)
* fix: rule with 'any' condition does not take effect when condition list is empty

* fix: bug
2025-04-07 16:02:45 +08:00
Junyi
46227c877f
fix(client): support to search field (#6627) 2025-04-07 15:29:18 +08:00
Katherine
5f6d7f2e0e
fix: variable parse failure when URL parameters contain Chinese characters (#6618) 2025-04-07 09:29:14 +08:00
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
Sheldon Guo
8f5ae04743
feat: enhance error handling with optional title in AppError component (#6409) 2025-04-04 19:29:49 +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
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
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
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
nocobase[bot]
71a55d6f10 chore(versions): 😊 publish v1.6.15 2025-04-01 12:59:02 +00: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
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