Commit Graph

1936 Commits

Author SHA1 Message Date
a7049de998 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-13 12:17:01 +08:00
9ee80846fb Merge pull request 'fix: 修改级联组件适配' (#355) from fix_cascade into @hera/dev
Reviewed-on: daoyoucloud/tachycode#355
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 12:12:22 +08:00
wjh
7df5c093b0 fix: 修改级联组件适配 2024-03-13 12:07:50 +08:00
katherinehhh
c7cfeec6a1
feat: add uuid & nanoid & unitTimestamp interface (#3684)
* refactor: select & radio compoent supports multiple type of value

* fix: ridio test

* feat: uuid & nanoid & snowflake interface

* refactor: delete snowflake

* feat: nanoid field type (#3685)

* refactor: add child in inheritance of tree collection (#3676)

* refactor: add child in inheritance of tree collection

* refactor: add child in inheritance of tree collection

* style: style improve

* feat: nanoid field

* chore: nanoid field type map

---------

Co-authored-by: katherinehhh <shunai.tang@hand-china.com>

* chore: nanoid options

* refactor: unixTimestamp

* fix: test

* refactor: unixTimestamp

* refactor: unixTimestamp

* refactor: locale imrove

* refactor: local improve

* refactor: nanoIDInput

* refactor: nanoIDInput

* refactor: nanoIDInput

* refactor: unixTimestamp

* refactor: nanoIDInput

* fix: test

---------

Co-authored-by: ChengLei Shao <chareice@live.com>
2024-03-13 12:07:45 +08:00
wjh
dcf3cf63e3 fix: 修改级联组件适配 2024-03-13 12:04:46 +08:00
Junyi
f68b2fb04a
refactor(client): add component to support data source select (#3691) 2024-03-13 10:23:08 +08:00
Zeke Zhang
d904d13c52
fix(Form): should be created instead of updated when clicking submit (#3687)
* fix(Form): should be created instead of updated when clicking submit

* test: add e2e

* test: optimize e2e
2024-03-13 10:13:02 +08:00
2f57f697b5 Revert "Revert "fix: linkage should set undefined""
This reverts commit cf77654834.
2024-03-12 23:15:59 +08:00
cf77654834 Revert "fix: linkage should set undefined"
This reverts commit c0de2384df.
2024-03-12 23:11:04 +08:00
chenos
24b52c98d1 fix: add external deps 2024-03-12 22:30:13 +08:00
katherinehhh
b4058ecb1b
fix: incorrect pagination query parameters when batch deleting last page (#3670) 2024-03-12 21:29:47 +08:00
chenos
2e7da6e29b chore(versions): 😊 publish v0.20.0-alpha.9 2024-03-12 21:15:51 +08:00
wjh
e03e68232e fix: 修改级联组件适配 2024-03-12 20:40:58 +08:00
c0de2384df fix: linkage should set undefined 2024-03-12 20:09:35 +08:00
1737a0f83b Merge pull request 'main' (#349) from main into @hera/dev
Reviewed-on: daoyoucloud/tachycode#349
2024-03-12 20:00:15 +08:00
katherinehhh
559cbca396
refactor: add child in inheritance of tree collection (#3676)
* refactor: add child in inheritance of tree collection

* refactor: add child in inheritance of tree collection

* style: style improve
2024-03-12 17:27:35 +08:00
ChengLei Shao
37b97c6e52
chore: escape underscore char in include query (#3681) 2024-03-12 14:53:12 +08:00
katherinehhh
4a346a4119
fix: view collection association field foreignkey should be select (#3671) 2024-03-12 09:30:38 +08:00
ChengLei Shao
cdf9f4818f
fix: acl should return true when resource allowed (#3675)
* fix: acl should return true when resource allowed

* chore: test
2024-03-12 09:08:15 +08:00
ChengLei Shao
3da2a8af92
fix: init scope value when all data is null value (#3674) 2024-03-11 19:37:48 +08:00
jack zhang
f9567d711b
fix: inheritance cache bug (#3669) 2024-03-11 16:57:37 +08:00
katherinehhh
ba2467c9bf fix: assign field values modal shuold support maskClosable 2024-03-11 16:52:14 +08:00
e69e9b9940 fix: resource conflict with nocobase settings 2024-03-11 12:32:06 +08:00
c0f46dcf87 Merge pull request 'main' (#339) from main into @hera/dev
Reviewed-on: daoyoucloud/tachycode#339
2024-03-11 10:31:45 +08:00
xilesun
6fd06a28c8 chore(versions): 😊 publish v0.20.0-alpha.8 2024-03-11 09:59:08 +08:00
ChengLei Shao
a477facdbf
chore: move collection manager snippets into data source (#3666) 2024-03-10 09:57:14 +08:00
44c6d89e54 fix: template block linkage and association data load failed 2024-03-10 04:20:59 +08:00
2d991ba7cf 合并对main的所有修改
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->

<!-- Explain the reason for adding or modifying this feature. -->

<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend

<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->

<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->

<!-- Including any screenshots of the new feature or modification. -->

Co-authored-by: sealday <sealday@gmail.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-authored-by: 吕延祥 <2256334253@qq.com>
Reviewed-on: daoyoucloud/nocobase#317
2024-03-10 04:06:04 +08:00
Zeke Zhang
9e88972ba6
fix(Form): retain field's default value after submitting the form (#3665)
* fix(Form): should not be clear default value after submit

* test: make e2e more stable
2024-03-09 18:59:56 +08:00
ChengLei Shao
46daba1e6e
fix: infer postgres field (#3663) 2024-03-09 10:08:32 +08:00
chenos
63d1a8d90c chore(versions): 😊 publish v0.20.0-alpha.7 2024-03-08 14:11:35 +08:00
katherinehhh
db045c61d2
fix: view collection interface missing (#3658) 2024-03-08 12:00:59 +08:00
jack zhang
2fc13c180c
fix: getCollection bug (#3656) 2024-03-08 11:18:32 +08:00
chenos
8b4821e2df chore(versions): 😊 publish v0.20.0-alpha.6 2024-03-08 10:23:26 +08:00
ChengLei Shao
cacaafd05b
fix: parse association field in acl (#3655) 2024-03-08 09:21:27 +08:00
katherinehhh
16581a547c
fix(cascadeSelect): cassadeSelect does not dislay data in edit form (#3649) 2024-03-07 19:22:34 +08:00
YANG QIA
263ee28c72
fix(db): through scope in eager loading & fix(acl): filter reset issue (#3636)
* fix(database): through scope in eager loading

* chore: update

* fix: role users filter

* chore: update
2024-03-07 13:38:17 +08:00
katherinehhh
30b4ed77a1
fix: dateTime format configured in table is invalid (#3630)
* fix: datetime format configured in the table is invalid

* test: date display format

* refactor: default timeformat

* test: datetime display format
2024-03-07 10:48:49 +08:00
chenos
0f1115b058 fix(create-action): invalid save mode 2024-03-06 23:05:16 +08:00
chenos
2e3dd1250c fix(acl): create action aliases 2024-03-06 22:56:43 +08:00
katherinehhh
d82ed8058c
style: flexWrap in actionBar (#3635) 2024-03-06 21:32:32 +08:00
jack zhang
454d1d34ed
fix: add displayName (#3628)
* fix: context add displayName

* fix: observer add displayName

* fix: memo component add displayName

* fix: forwordRef component add displayName
2024-03-06 18:22:31 +08:00
Zeke Zhang
0d327bb539
fix(ActionLink): fix hover style (#3629) 2024-03-06 14:58:08 +08:00
Junyi
c2b121cda6
feat(plugin-workflow-form-trigger): add trigger button to all single record action bar (#3563)
* feat(plugin-workflow-form-trigger): add trigger button to all single record actionbar

* fix(plugin-workflow-form-trigger): fix button style and triggering

* fix(plugin-workflow): fix unused hook ref in workflow

* fix(plugin-workflow-form-trigger): fix button style

* refactor(plugin-workflow-action-trigger): change plugin name

* fix(plugin-workflow-action-trigger): fix unmigrated stuff

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case

* fix(presets): fix package name

* fix(plugin-workflow-action-trigger): fix e2e test and migration

* fix(plugin-workflow-action-trigger): fix migration

* fix(plugin-workflow-action-trigger): fix migration

* fix(plugin-workflow-action-trigger): fix migration

* feat(plugin-workflow-action-trigger): add destroy to trigger

* fix(plugin-workflow-action-trigger): fix appends select

* fix(plugin-workflow-action-trigger): remove support for destroy action

* fix(plugin-workflow-action-trigger): fix collection check

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case
2024-03-06 14:42:20 +08:00
jack zhang
d3627c5ba9
fix: sidebar menu text overflow (#3626) 2024-03-06 14:37:13 +08:00
Zeke Zhang
d56268730b
fix(subTable): fix changing title field invalid (#3625)
* test: add e2e

* fix: fieldNames change in sub-table should take effect in real time

* fix: fieldNames change in sub-table should take effect in real time

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-06 14:10:31 +08:00
Zeke Zhang
202fcef17c
fix: fix hover style for sub table (#3623)
* Revert "style(TableColumn): fix style of mouse hover (#3597)"

This reverts commit 488616f7fe.

* fix: fix hover style for sub table

* fix: style

* Revert "fix: style"

This reverts commit 33901c4ff96458b17f0f68839f726f520370e622.

* fix: style
2024-03-06 00:29:30 +08:00
chenos
0fc382d298 chore(versions): 😊 publish v0.20.0-alpha.5 2024-03-06 00:20:06 +08:00
chenos
e82179ff61 fix(select): fieldNames are missing the value parameter 2024-03-05 23:58:56 +08:00
Zeke Zhang
5ca1827e7e
fix(save-record): differentiate between creation and updating based on record.isNew (#3620) 2024-03-05 21:22:24 +08:00