Commit Graph

248 Commits

Author SHA1 Message Date
c8b5005bd7 fix: table appends (#1099)
Reviewed-on: daoyoucloud/tachybase#1099
2024-05-31 20:03:14 +08:00
c882909bad refactor: client (#1092)
Reviewed-on: daoyoucloud/tachybase#1092
2024-05-31 18:43:29 +08:00
23283af669 fix: design menu not show (#1083)
Reviewed-on: daoyoucloud/tachybase#1083
2024-05-30 19:15:59 +08:00
8fdd5d4fe9 refactor: @hera/plugin-core (#1081)
Reviewed-on: daoyoucloud/tachybase#1081
2024-05-30 17:01:02 +08:00
dc175f789f fix: template-loading (#1072) close #626
Reviewed-on: daoyoucloud/tachybase#1072
2024-05-30 15:15:45 +08:00
82a70fd5c5 refactor: client build in plugins (#1067)
Reviewed-on: daoyoucloud/tachybase#1067
2024-05-29 17:04:28 +08:00
260a95cac2 refactor: types correct (#1056)
Reviewed-on: daoyoucloud/tachybase#1056
2024-05-28 16:36:49 +08:00
ccd799f85f refactor: migrate names (#1050)
Reviewed-on: daoyoucloud/tachybase#1050
2024-05-24 13:06:59 +08:00
f2a2cc228f refactor: migrate @emotion/css to antd-style (#1043)
Reviewed-on: daoyoucloud/tachybase#1043
2024-05-23 21:01:46 +08:00
b1dfce33cd fix: bulk update keys should obtained when clicked (#1040)
Reviewed-on: daoyoucloud/tachybase#1040
2024-05-23 16:59:41 +08:00
3e58c54aa8 feat: 仓库二期 (#719)
Co-authored-by: hello@lv <2256334253@qq.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#719
2024-05-08 16:20:31 +08:00
dcd89df482 feat: support edit associated form (#920)
Reviewed-on: daoyoucloud/tachybase#920
2024-05-07 20:30:14 +08:00
8c156c35d2 refactor: @hera/plugin-core @tachybase/schema, remove unused plugin-charts (#887)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachybase#887
2024-04-29 21:41:13 +08:00
021c8a9a16 fix: plugin-approval, submit approval or reject faild (#835)
Reviewed-on: daoyoucloud/tachybase#835
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-24 16:05:44 +08:00
4e902fc9e0 fix: source id & subtable sort
Reviewed-on: daoyoucloud/tachycode#624
2024-04-08 15:47:48 +08:00
bai.jingfeng
64387242a6 feat: 更新提交数据,支持增量提交 2024-04-07 21:05:51 +08:00
bai.jingfeng
37cc172d82 fix: 上游跟进, source id为null的情况,fix-source id null
#3917
2024-04-07 18:43:18 +08:00
4a0575985e Merge pull request 'fix: 日期提交给后端设置为utc类型,单选类型有误差,后期需要系统整理日期格式问题' (#595) from fix_date_utc into dev
Reviewed-on: daoyoucloud/tachycode#595
2024-04-03 19:21:53 +08:00
bai.jingfeng
2544dab6be fix: 数据关联表引用自己的情况不显示内容-同步官方, 发布后需要重新配置区块 2024-04-03 18:37:12 +08:00
bai.jingfeng
213a1b2dd4 fix: 日期提交给后端设置为utc类型,单选类型有误差,后期需要系统整理日期格式问题 2024-04-03 18:08:50 +08:00
dbb1703dff feat: @formily/* 统一成 @nocobase/schema,清理所有的 ts build 报错 (#566)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#566
2024-04-02 18:13:33 +08:00
katherinehhh
9acb908981 fix: templateBlockProvider support association field append 2024-03-30 21:41:37 +08:00
fd656387ea Merge remote-tracking branch 'upstream/main' into @hera/dev 2024-03-29 17:51:25 +08:00
katherinehhh
e88082232d
fix: reporting error when clicking on the print button for the detail block (#3845) 2024-03-28 14:42:56 +08:00
Zeke Zhang
2468caeeb9
refactor(DataBlock): details block (#3776)
* refactor: remove useless code related 'TableField'

* refactor: add details block UI schema and hooks

* refactor: update details block schema and create new hook for details block without paging props

* refactor: add useDetailsBlockWithoutPagingDecoratorProps and useDetailsBlockWithPagingDecoratorProps

* test: add unit tests

* chore: fix build

* chore: fix import path for withDynamicSchemaProps

* fix: fix import typo in createDetailsBlockWithoutPagingUISchema test

* chore: fix unit test

* refactor: should not get collection on getting association in UISchema

* chore: fix unit test

* refactor: use x-use-component-props instead of useProps

* chore: fix Pagination

* chore: skip weird tests

* chore: remove weird test

* refactor: update details block initializers and associated schemas

* refactor: rename to useDetailsWithPaginationProps

* refactor: rename to useDetailsWithPaginationDecoratorProps

* refactor: rename to createDetailsWithPaginationUISchema

* chore: fix unit test

* refactor: rename to createDetailsUISchema

* refactor: rename to useDetailsDecoratorProps

* refactor: rename to useDetailsProps

* refactor: rename to 'blockSettings:details'

* chore: fix e2e
2024-03-28 08:48:58 +08:00
Zeke Zhang
d932546194
refactor(DataBlock): grid card block (#3781)
* refactor: migrate createGridCardBlockSchema to modules

* refactor: add grid-card block hooks and decorator props

* refactor: should not get collection on getting association in UISchema

* refactor: use x-use-component-props instead of useProps

* chore: fix build
2024-03-27 20:56:30 +08:00
Zeke Zhang
d6f38495a7
refactor(DataBlock): filter form (#3785)
* refactor: migrate to modules

* refactor: add useFilterFormBlockProps

* refactor: add useFilterFormBlockDecoratorProps hook

* chore: avoid error

* refactor: use x-use-component-props instead of useProps

* chore: fix unit test

* chore: fix build
2024-03-27 20:52:29 +08:00
86ffb8f4a9 Merge remote-tracking branch 'upstream/main' into fix_new_version 2024-03-27 19:27:21 +08:00
Zeke Zhang
74051ff0a5
refactor(DataBlock): kanban and gantt and map and calendar (#3792)
* refactor: kanban

* refactor: gantt

* refactor: map

* refactor: calendar

* refactor: compat

* refactor: rename to createKanbanBlockUISchema

* refactor(kanban): use x-use-component-props instead of useProps

* refactor(Gantt): rename to createGanttBlockUISchema

* refactor: use x-use-component-props instead of useProps

* refactor: rename

* refactor(Map): use x-use-component-props instead of useProps

* refactor(Calendar): rename

* refactor(Calendar): should not get collection on getting association in UISchema

* refactor(Calendar): use x-use-component-props instead of useProps

* chore: add comment

* chore: fix unit test

* fix: add scopes to fix e2e

* fix(Calendar): add association property to CalendarBlockProvider decorator

* test: add e2e for Calenndar
2024-03-27 18:06:28 +08:00
Zeke Zhang
71005ff9bf
refactor(DataBlock): filter collapse block (#3786)
* refactor: filter collapse block

* refactor: rename file name
2024-03-27 18:05:07 +08:00
Zeke Zhang
16cad6972e
refactor(DataBlock): table selector (#3784)
* refactor: extract to common options

* refactor: migrate to modules

* test: add unit test

* refactor: use x-use-component-props instead of useProps

* chore: fix unit test

* chore: rename

* fix: useExpressionScope

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-03-27 17:51:13 +08:00
Zeke Zhang
76cd3474c3
refactor(DataBlock): list block (#3779)
* refactor: refactor list block initializer and record association list block initializer

* refactor: add useListBlockDecoratorProps

* chore: fix import path to avoid build error

* refactor: should not get collection on getting association in UISchema

* refactor: use x-use-component-props instead of useProps

* chore: fix unit test
2024-03-27 17:41:56 +08:00
Zeke Zhang
c6922b071d
refactor(DataBlock): form block (#3771)
* refactor: extract to createCreateFormBBlockUISchema

* refactor: extract to createEditFormBlockUISchema

* refactor: use new function to create UISchema

* refactor: add x-use-decorator-props

* fix: add withDynamicSchemaProps to FormBlockProvider

* chore: update import path for withDynamicSchemaProps

* refactor: should not get collection on getting association in UISchema

* refactor: use x-use-component-props instead of useProps

* fix: fix withDynamicSchemaProps

* chore: fix unit test
2024-03-27 17:32:26 +08:00
f364b40e79 Merge remote-tracking branch 'upstream/main' into merge_from_upstream 2024-03-27 17:03:22 +08:00
Zeke Zhang
e3d8a95809
fix(associationBlock): fix association blocks for parent collection f… (#3813)
* fix(associationBlock): fix association blocks for parent collection fields

* test: add e2e
2024-03-26 11:42:46 +08:00
Zeke Zhang
1c32983c00
refactor(DataBlock): table block (#3748)
* refactor: remove useless code

* chore: remove useless code

* feat: add createTableBlockSchema

* refactor: use createTableBlockUISchema

* refactor: extract useTableBlockParams

* refactor: extract useTableBlockSourceId

* refactor: compat

* refactor: fix typo in createTableBlockUISchema file

* refactor: should not get collection on getting association in UISchema

* refactor: use x-use-component-props instead of useProps

* chore: fix unit tests

* fix: fix errors

* refactor: refactor data block source ID hooks
2024-03-25 17:35:57 +08:00
Zeke Zhang
0269a1ff7d
fix(Details): block template (#3807)
* fix: add 'Details' in condition

* fix: block template
2024-03-25 16:25:41 +08:00
de89814eba Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-21 18:40:03 +08:00
katherinehhh
f385c34c72
fix: filter does not allow passing empty objects (#3780) 2024-03-21 16:32:51 +08:00
chenos
54f6597b9d
feat: disassociate action (#3759)
* feat: disassociate action

* chore: compat old initializer

* chore: add translation

* chore: add translation

* fix: acl

---------

Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-03-20 09:30:10 +08:00
d07932e9eb Merge remote-tracking branch 'origin/main' into merge_from_upstream_1 2024-03-17 04:28:06 +08:00
Zeke Zhang
126f60c959
fix(variables): fix varaibles for table selector (#3725)
* fix(variables): fix varaibles for table selector

* test: add e2e

* chore: fix build

* fix: should not display current record in create form

* fix: fix known bugs

* test: fix e2e
2024-03-15 22:56:35 +08:00
1f5c9fbdf5 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-15 16:04:04 +08:00
Zeke Zhang
b0705843e5
fix(Table): fix disappearing content after selecting a row (#3726) 2024-03-15 14:14:41 +08:00
abec9982fb Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-14 22:19:15 +08:00
Zeke Zhang
286af35ff8
refactor: add blocks in a unified way (#3668)
* refactor: rename filterMenuItemChildren to filterCollections

* refactor: revert parameters to destructured object

* refactor(Details): unify details block between page and popup

* refactor(Form): refactor(Details): unify form block between page and popup

* refactor: table & list & grid card

* refactor: form

* refactor: association details

* chore: useVisible

* refactor: calendar

* chore: remove relationshipBlocks

* refactor: unify Details schema

* fix: avoid error

* chore: add translate

* chore: add tag to association fields

* fix: add block useChildren and children merge

* test: fix e2e

* test: fix e2e

* fix: fix Calendar

* fix: fix search

* test: add e2e for search

* fix: fix T-3554

* fix: fix T-3551

* feat: add no data for details block

* chore: fix unit test

* chore: fix unit test

* chore: change text

* chore: optimize text

* chore: add translation

* style: fix memu item style

* refactor: rename

* test: fix e2e

* test: fix e2e

---------

Co-authored-by: dream2023 <1098626505@qq.com>
2024-03-14 19:20:02 +08:00
Zeke Zhang
ba1e44c527
feat: support to set data loading mode (#3712)
* feat: add setDataLoadingModeSettingItem

* feat: support to set data loading mode

* chore: add translation

* chore: refresh the block immediately after the configuration has been changed

* feat: the data loading mode should also work for the filter buttons

* feat: support old version

* fix: data scope

* fix: fix known bugs

* fix: add setting for table selector

* test: fix e2e
2024-03-14 18:10:54 +08:00
a7049de998 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-13 12:17:01 +08:00
katherinehhh
b4058ecb1b
fix: incorrect pagination query parameters when batch deleting last page (#3670) 2024-03-12 21:29:47 +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