Commit Graph

1659 Commits

Author SHA1 Message Date
baijingfeng
57e14cdb77 Merge pull request 'fix: 上游跟进, source id为null的情况,fix-source id null' (#616) from fix/source-id into dev
Reviewed-on: daoyoucloud/tachycode#616
2024-04-07 18:44:46 +08:00
bai.jingfeng
37cc172d82 fix: 上游跟进, source id为null的情况,fix-source id null
#3917
2024-04-07 18:43:18 +08:00
e41536ed42 Merge pull request 'fix: 上游跟进,fix- getSourceKeyByAssocation #3947' (#613) from fix/source-key into dev
Reviewed-on: daoyoucloud/tachycode#613
2024-04-07 18:39:30 +08:00
bai.jingfeng
9f12aa8ae5 fix: 上游跟踪,fix- getSourceKeyByAssocation #3947 2024-04-07 17:53:02 +08:00
bai.jingfeng
7f43de4e23 fix: 配置字段,显示一对一的关联表的筛选项 2024-04-07 11:34:37 +08:00
5db6f51e70 chore: upgrade version 2024-04-06 03:36:20 +08:00
5897990f05 chore: remove help 2024-04-06 03:35:27 +08:00
b752e1afe0 feat: optimize block add menu 2024-04-03 20:02:39 +08:00
93d0e17912 fix: add menu 2024-04-03 19:57:59 +08:00
ae83be17c3 fix: import error 2024-04-03 19:42:04 +08:00
732a2673a0 chore: upgrade version 2024-04-03 19:40:05 +08:00
7d500fe1c9 fix: should shadow merge 2024-04-03 19:37:19 +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
ec4779a94d chore: upgrade version 2024-04-03 00:24:39 +08:00
bai.jingfeng
953e13fce7 feat: 系统设置-交互行为优化. 系统设置区块,配置操作,提交按钮,初始化时,支持设置提交成功后的回调 2024-04-02 20:55:22 +08:00
67d6b2d5f4 chore: upgrade version 2024-04-02 20:38:48 +08:00
f70de8501b chore: upgrade version 2024-04-02 19:17:40 +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
3d7af7734c feat: 支持 docker 构建
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#561
2024-04-01 17:29:46 +08:00
d1b50a8f31 feat: 将 yarn + learn 的 monorepo 转成 pnpm (#548) (#555)
Reviewed-on: daoyoucloud/tachycode#555
2024-04-01 13:39:44 +08:00
lyx
b8406d8436 feat: git revert 005b5a313d 2024-04-01 11:28:38 +08:00
8c4730a4ab fix: table style error 2024-03-30 22:53:30 +08:00
katherinehhh
9acb908981 fix: templateBlockProvider support association field append 2024-03-30 21:41:37 +08:00
f06518a05c refactor: move menu load and dump function to core/client 2024-03-30 05:28:26 +08:00
e4125ee1df Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-30 02:24:40 +08:00
dc7c6a5052 Revert "refactor: linkage rule fireImmediately (#3847)"
This reverts commit 0191070547.
2024-03-29 18:50:42 +08:00
92f31ef92a Revert "fix: template block linkage and association data load failed"
This reverts commit 44c6d89e54.
2024-03-29 18:48:45 +08:00
a2f2f9435f fix: util path 2024-03-29 17:58:56 +08:00
fd656387ea Merge remote-tracking branch 'upstream/main' into @hera/dev 2024-03-29 17:51:25 +08:00
chenos
6e20ab1a77 chore(versions): 😊 publish v0.21.0-alpha.1 2024-03-29 17:43:20 +08:00
jack zhang
005b5a313d
fix: association parent request (#3865)
* fix: association parent request

* fix: bug
2024-03-29 15:59:41 +08:00
Zeke Zhang
d0746b1155
test: add unit test for parseHTML (#3870) 2024-03-29 14:52:20 +08:00
YANG QIA
868a487b2d
fix(data-vi): bug when filtering chart with assocations (#3867)
* fix(data-vi): bug when filtering chart with assocations

* fix: remote select
2024-03-29 14:13:59 +08:00
chenos
11536cb0e0 fix(client): the reference template was deleted by mistake 2024-03-29 12:14:10 +08:00
jack zhang
a38e34cf9a
fix: table settings get collectionField (#3837)
* fix: table settings get collectionField

* fix: remove duplicate useCollectionField

* fix: bug

* refactor: tagComponentFieldSettings

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-29 09:12:52 +08:00
Zeke Zhang
29af40f504 style(Help): optimize style 2024-03-29 08:40:16 +08:00
Zeke Zhang
08162e1004
fix(LinkageRules): should work properly after the block is saved as a template (#3855)
* test: add e2e

* chore: optimize e2e

* fix: use context in Form
2024-03-28 22:03:22 +08:00
katherinehhh
44e7f48f99
test: main data source e2e test (#3816)
* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: test

* test: test

* refactor: code improve

* test: test
2024-03-28 21:04:53 +08:00
jack zhang
467699cdf9
fix: delete field style improve (#3820) 2024-03-28 16:54:31 +08:00
katherinehhh
9a66301ec7
refactor: default role & default field storage (#3844)
* refactor: default role & default field storage

* refactor: verification

* refactor: verification
2024-03-28 16:47:43 +08:00
katherinehhh
0191070547
refactor: linkage rule fireImmediately (#3847) 2024-03-28 14:46:55 +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
jack zhang
7566a7b357
fix: client internal method (T-3711 and T-3712 and T-3713) (#3839)
* fix: client internal method (T-3711 and T-3712 and T-3712)

* fix: bug
2024-03-27 21:03:51 +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
03a0ba57ff fix: formula select pick wrong field 2024-03-27 17:59:58 +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
wjh
9b405b4b9d fix: 把remoteSelect和Select组件合并到框架 (#499)
Reviewed-on: daoyoucloud/tachycode#499
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-27 16:49:56 +08:00
chenos
cfa6930d70
fix(client): disable the default onSubmit event of the form (#3834) 2024-03-27 16:37:33 +08:00
chenos
d04a60d386
fix: e2e-failed (#3828)
* fix: e2e-failed

* fix: ci

* fix: ci bug

* fix: ci(skip server ci)

* fix: ci [skip ci]

* fix: ci(skip server ci)

* fix: ci

* fix: ci

* fix: remove skip if

---------

Co-authored-by: dream2023 <1098626505@qq.com>
2024-03-27 12:03:00 +08:00
chenos
b1be8381b5 fix(filter-form): htmlType=submit 2024-03-26 19:51:14 +08:00
chenos
339822241f chore(versions): 😊 publish v0.20.0-alpha.17 2024-03-26 17:25:06 +08:00
katherinehhh
59e6b4a757
feat: read pretty input number field support display format config (#3815)
* feat: input number support display format

* feat: input number support display format

* feat: input number support display format

* feat: input number support display format

* feat: input number support display format

* feat: input number support display format

* refactor: local improve

* refactor: local improve

* refactor: code improve

* refactor: locale improve

* test: input-number

* test: input-number

* test: input-number
2024-03-26 17:23:14 +08:00
Zeke Zhang
ac5a82fde3
fix(Table): fix invalid pagination (#3821)
* fix(Table): fix invalid pagination

* test: add test

* fix: unit test bug

---------

Co-authored-by: dream2023 <1098626505@qq.com>
2024-03-26 17:15:34 +08:00
chenos
c4aa8b78c2
chore: add tsdoc (#3788)
* chore: tsdoc

* chore: tsdoc

* fix: error

* chore: code format

* chore: code format
2024-03-26 17:08:45 +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
YANG QIA
088f3977a2
feat(data-vi): support multiple data sources (#3743)
* feat(data-vi): support multiple data sources

* chore: update

* chore: new pr

* chore: update

* chore: merge

* fix: bug

* fix: isDBInstance

* fix: fix T-3624

* fix: fix T-3625

* fix: test

* fix: fix T-3659

* fix: fix T-3660

* fix: backend tests

* fix: acl

* fix: fix T-3680

* fix: build
2024-03-25 14:54:13 +08:00
Junyi
d691e4c7e6
feat(plugin-workflow): support multiple data source in workflow (#3739)
* feat(plugin-workflow): support multiple data source in workflow

* fix(plugin-workflow): fix test cases

* test(plugin-workflow-sql): debug test case

* fix(plugin-workflow): fix collection trigger creation without config

* test(plugin-workflow-sql): debug test case

* fix: workflow e2e test

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* test(plugin-workflow-sql): debug test case

* test: approval e2e

* fix: remove pro-plugins from packages

* refactor(plugin-workflow): support pass collection from props to CollectionBlockInitializer

* test(plugin-workflow): add test case

* fix(plugin-workflow): disable modification of executed workflow

* fix: e2ePageObjectModel

* fix: load data source when data source load failed (#3793)

* chore: console.log

* fix(subTable): fix sorting rule setting (#3795)

* fix: through collection support search (#3800)

* fix(client): visible -> useVisible

* fix(client): fix action designer error occured in custom form (#3801)

* fix(client): fix action designer error occured in custom form

* fix(client): fix from the source

* chore(module): remove submodule

* fix(plugin-workflow): fix client cycling import

* fix(plugin-workflow): fix collection event name

* fix(plugin-workflow): fix undefined ref

---------

Co-authored-by: hongboji <j414562100@qq.com>
Co-authored-by: ChengLei Shao <chareice@live.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
Co-authored-by: katherinehhh <shunai.tang@hand-china.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2024-03-25 14:46:22 +08:00
katherinehhh
5e22103e33
chore: file collection template preset fields should be disabled (#3810) 2024-03-25 11:39:52 +08:00
katherinehhh
66229cc92b
fix: plugin manager keywords (#3809) 2024-03-25 09:51:57 +08:00
katherinehhh
88d1bdbefb
fix: expand action and add new action should support drag & sort (#3808) 2024-03-24 19:44:39 +08:00
chenos
921696f40b
fix: useExpressionScope (#3805) 2024-03-24 12:51:41 +08:00
0249affd47 Merge remote-tracking branch 'origin/main' into merge_from_origin 2024-03-24 01:03:26 +08:00
chenos
71ec7ece6a chore(versions): 😊 publish v0.20.0-alpha.16 2024-03-23 17:54:02 +08:00
jack zhang
b879d11235
fix: hide child when useVisible() is false (#3803) 2024-03-23 11:14:56 +08:00
Junyi
e82a33f1f7
fix(client): fix action designer error occured in custom form (#3801)
* fix(client): fix action designer error occured in custom form

* fix(client): fix from the source
2024-03-23 10:24:51 +08:00
chenos
0d2ed3f8a0 fix(client): visible -> useVisible 2024-03-23 08:12:42 +08:00
katherinehhh
4f0907be1b
fix: through collection support search (#3800) 2024-03-22 23:08:17 +08:00
Zeke Zhang
cef18eb979
fix(subTable): fix sorting rule setting (#3795) 2024-03-22 16:42:34 +08:00
daf93e62c2 Revert "Revert "fix: modal app not found""
This reverts commit f4e75348d7.
2024-03-21 22:18:27 +08:00
f4e75348d7 Revert "fix: modal app not found"
This reverts commit f5a83d48da.
2024-03-21 22:14:32 +08:00
wjh
2b405fbf1a fix: 修改表格表头居中 2024-03-21 20:25:43 +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
f5a83d48da fix: modal app not found 2024-03-20 19:57:54 +08:00
katherinehhh
36ce29eace
fix: first character entered in foreign key input is not displayed (#3770) 2024-03-20 17:27:33 +08:00
chenos
bef9c8ab7b chore(versions): 😊 publish v0.20.0-alpha.15 2024-03-20 14:47:28 +08:00
katherinehhh
77cae4779a
fix: uuid & nanoid should be disabled when editing (#3762) 2024-03-20 09:51:40 +08:00
Zeke Zhang
8e322ae151 test: add e2e for Disassociate 2024-03-20 09:51:06 +08:00
ChengLei Shao
5153ce9ab2
fix: uuid field (#3736)
* fix: uuid test

* chore: uuid test

* fix: test

* fix: uuid field name support edit

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-20 09:39:11 +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
96f90c7024 Merge remote-tracking branch 'origin/main' into merge_from_upstream3 2024-03-19 12:29:09 +08:00
f82dc6a052 refactor: change powered-by 2024-03-19 12:28:27 +08:00
Zeke Zhang
368036923f
fix: fix the disappearing collections when searching (#3750) 2024-03-19 09:00:01 +08:00
katherinehhh
23c6e146e2
fix: configure openSize for table action is only immediately valid for one row (#3752)
* fix: opensize for table action is only immediately  valid for that row

* fix: opensize for table action is only immediately  valid for that row
2024-03-18 19:55:03 +08:00
chenos
c75d38bb05 chore(versions): 😊 publish v0.20.0-alpha.14 2024-03-18 18:29:13 +08:00
katherinehhh
2236ac5be2
refactor: url field support text type as availableTypes (#3751) 2024-03-18 17:58:32 +08:00
Chareice
1660a62399
chore: using text type as url field 2024-03-18 16:00:53 +08:00
chenos
220eafbda5 fix(client): plugin aliases 2024-03-18 15:55:10 +08:00