Commit Graph

4273 Commits

Author SHA1 Message Date
a1c8115480 refactor: remove unsed formula plugins 2024-04-08 13:42:23 +08:00
e87024f8d2 Merge pull request 'feat: 更新属性结构appends情况 feat #620' (#621) from hot_collection_tree into dev
Reviewed-on: daoyoucloud/tachycode#621
2024-04-08 12:15:19 +08:00
cdb6247a99 Merge pull request 'feat: 更新提交数据,支持增量提交' (#622) from feat/submit-edit-field-only into dev
Reviewed-on: daoyoucloud/tachycode#622
2024-04-08 12:14:59 +08:00
lyx
9cc10b88ef feat: 合同方案租金产品校验修改,长度相同进行校验 2024-04-08 12:10:51 +08:00
bai.jingfeng
64387242a6 feat: 更新提交数据,支持增量提交 2024-04-07 21:05:51 +08:00
lyx
db2c14293c feat: 更新属性结构appends情况 feat #620 2024-04-07 21:00:47 +08:00
c8917cec52 chore: release new version 2024-04-07 20:20:24 +08:00
97aae004c4 chore: upgrade version 2024-04-07 20:18:01 +08:00
bed28c72ac feat: 更新订单分组区块,重量/金额实现方式 feat #600 (#604)
Reviewed-on: daoyoucloud/tachycode#604
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-07 20:14:51 +08:00
511f282b8c Merge pull request 'fix: 上游跟进,(fix: sort params missing when switch page numbers #3906) 分页时拖拽排序的问题' (#617) from fix/upstream-sort into dev
Reviewed-on: daoyoucloud/tachycode#617
2024-04-07 20:14:12 +08:00
wjh
39b3707deb fix: 修改结算单产品计算逻辑 (#619)
Reviewed-on: daoyoucloud/tachycode#619
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-07 20:12:58 +08:00
bai.jingfeng
c9bbe51500 fix: 上游跟进,(fix: sort params missing when switch page numbers #3906) 2024-04-07 18:59:52 +08:00
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
7106e21504 Merge pull request 'fix: 复制修复' (#614) from fix/action-duplicate into dev
Reviewed-on: daoyoucloud/tachycode#614
2024-04-07 18:39:38 +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
965a568c02 fix: 复制修复 2024-04-07 18:16:10 +08:00
bai.jingfeng
9f12aa8ae5 fix: 上游跟踪,fix- getSourceKeyByAssocation #3947 2024-04-07 17:53:02 +08:00
wjh
90b1beae5e fix: 修改结算单计算逻辑 (#612)
Reviewed-on: daoyoucloud/tachycode#612
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-07 16:28:10 +08:00
38c3e3db8d feat: 支持级联范围过滤
Reviewed-on: daoyoucloud/tachycode#603
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-07 14:59:50 +08:00
9331bf3c6d Merge pull request 'fix: 修改汇总区块不格式化文本类型' (#605) from fix-group into dev
Reviewed-on: daoyoucloud/tachycode#605
2024-04-07 13:28:35 +08:00
3462564fb8 Merge pull request 'fix: 配置字段,显示一对一的关联表的筛选项' (#607) from feat/show-one-belongs into dev
Reviewed-on: daoyoucloud/tachycode#607
2024-04-07 13:28:09 +08:00
wjh
58c9dc0dba fix: 修复更新antd后的导航图标样式异常 2024-04-07 11:42:25 +08:00
bai.jingfeng
7f43de4e23 fix: 配置字段,显示一对一的关联表的筛选项 2024-04-07 11:34:37 +08:00
wjh
a4ab6ff994 fix: 修改汇总区块不格式化文本类型 2024-04-07 10:34:32 +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
93b7abbd30 fix: 修复多标签页标题问题
Reviewed-on: daoyoucloud/tachycode#594
2024-04-03 18:00:51 +08:00
0a98e7e8f2 fix_record_price_pdf (#592)
Reviewed-on: daoyoucloud/tachycode#592
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-03 17:56:41 +08:00
ff9ae1a2f5 fix_record_price_pdf (#587)
Reviewed-on: daoyoucloud/tachycode#587
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-03 13:03:56 +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
eab3f89860 fix: multi app start error 2024-04-02 20:37:37 +08:00
f70de8501b chore: upgrade version 2024-04-02 19:17:40 +08:00
96fa85981a fix: @formily/json-schema import 2024-04-02 18:30:33 +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
lyx
91e734b094 fix: 消息通知点击已读,提示消息为清空 fix #467 2024-04-02 15:02:15 +08:00
bai.jingfeng
dd38283c91 fix: 财务-明细查询,本公司,添加设置数据范围, 同步官方 (#565)
Reviewed-on: daoyoucloud/tachycode#565
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-02 11:46:45 +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
lyx
5955ad18cb feat: 添加logger debug埋点输出 feat #459 2024-04-01 16:53:06 +08:00
45ca27a244 chore: update @types/node version 2024-04-01 14:29:48 +08:00
d1b50a8f31 feat: 将 yarn + learn 的 monorepo 转成 pnpm (#548) (#555)
Reviewed-on: daoyoucloud/tachycode#555
2024-04-01 13:39:44 +08:00
b5b042ba94 Merge pull request 'feat: git revert 005b5a313dee5f73010225e906b307fe05912388' (#551) from feat_revert_datablockrequestprovider into @hera/dev
Reviewed-on: daoyoucloud/tachycode#551
2024-04-01 11:48:52 +08:00
wjh
bc9ac59ac2 fix: 将过滤按钮的过滤条件放到三级 (#550)
Reviewed-on: daoyoucloud/tachycode#550
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-01 11:48:22 +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
98e18a1a3a fix: deps 2024-03-30 06:25:52 +08:00
a5c5df6864 perf: using evaluator to reduce package size 2024-03-30 06:07:51 +08:00
f06518a05c refactor: move menu load and dump function to core/client 2024-03-30 05:28:26 +08:00
7d508d0fc4 feat: remove copied date-picker component, add schema-settings date presets 2024-03-30 05:04:08 +08:00
d675e2815c feat: support date picker modification 2024-03-30 04:07:16 +08:00
53bb505823 refactor: adjusting group block loading methods and folder structure 2024-03-30 03:36:29 +08:00
47e5892c61 fix: group block error 2024-03-30 02:46:48 +08:00
a7067ae99d Merge pull request 'merge_from_upstream' (#544) from merge_from_upstream into @hera/dev
Reviewed-on: daoyoucloud/tachycode#544
2024-03-30 02:25:07 +08:00
e4125ee1df Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-30 02:24:40 +08:00
c8fa534a77 feat: 优化删除提示,找到对应关联数据 (#543)
Reviewed-on: daoyoucloud/tachycode#543
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-30 02:23:07 +08:00
wjh
48b045c4f9 fix: 修改下拉框组件字段默认值 (#539)
Reviewed-on: daoyoucloud/tachycode#539
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:56 +08:00
wjh
1675b39d0e feat: 汇总区块添加表格样式及配置项排序 (#536)
Reviewed-on: daoyoucloud/tachycode#536
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:44 +08:00
Junyi
6d0d21ede2
refactor(plugin-workflow): change to (#3871) 2024-03-29 23:36:49 +08:00
katherinehhh
4adc116386
fix: kanban card modal display abnormal (#3863) 2024-03-29 22:46:06 +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
katherinehhh
fec3662dc9
fix: filterTargetKey only support view collection (#3872) 2024-03-29 18:24:40 +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
5d6a6e6450 feat: add websocket block 2024-03-29 17:09:07 +08:00
1eda5609b7 feat: add inventory order 2024-03-29 16:31:39 +08:00
6d85d2f826 chore(versions): publish @hera/plugin-rental v1.7.2 2024-03-29 16:31:23 +08:00
bai.jingfeng
c2604631a8 feat: 增值税计算,sql,添加状态筛选的功能 2024-03-29 16:05:42 +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
38fdd9c332 fix_invoices_view (#533)
Reviewed-on: daoyoucloud/tachycode#533
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-29 11:37:57 +08:00
bai.jingfeng
ce2282e673 feat: sql,增值税计算,添加注释以及开启开头注释掉的有用代码 2024-03-29 10:38:47 +08:00
chenos
672d1d9a45 fix: using jest-dom instead of vitest-dom 2024-03-29 09:24:40 +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
Junyi
1f59d4bed2
refactor(plugin-workflow): add transaction check from data source (#3857) 2024-03-29 09:09:12 +08:00
Zeke Zhang
29af40f504 style(Help): optimize style 2024-03-29 08:40:16 +08:00
YANG QIA
72c95671ae
fix(data-vi): charts size bug when changing chart type (#3859)
* fix(data-vi): charts size bug when changing chart type

* chore: remove console.log
2024-03-29 08:31:47 +08:00
chenos
0ec3ed3c54
fix(server): commands failed to load properly on Windows (#3858) 2024-03-29 06:46:37 +08:00
74a0d754f5 chore(versions): publish @hera/plugin-rental v1.7.1 2024-03-29 02:17:05 +08:00
bai.jingfeng
d735513479 feat: 增值税计算,sql构建完成 (#527)
Reviewed-on: daoyoucloud/tachycode#527
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-29 02:15:05 +08:00
86fee92f72 fix: build error 2024-03-29 01:47:57 +08:00
09aae19848 chore(version): upgrade plugin-core & plugin-rental 2024-03-29 01:40:15 +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
fb1af9a34a Merge pull request 'fix: 修改小结组件不显示赔偿' (#509) from fix_recordSummary into @hera/dev
Reviewed-on: daoyoucloud/tachycode#509
2024-03-28 17:10:39 +08:00
jack zhang
467699cdf9
fix: delete field style improve (#3820) 2024-03-28 16:54:31 +08:00
YANG QIA
7b9acb73c4
chore: remove add-attach option from bulk update action (#3854) 2024-03-28 16:52:37 +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
wjh
75b3148521 fix: 结算单报错 (#515)
<!-- 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. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#515
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:49:36 +08:00
wjh
08adf2fe40 fix: 图表添加级联选择 (#522)
<!-- 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. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#522
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:47:41 +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
chenos
8a215e2fbe fix(acl): available actions 2024-03-28 14:28:15 +08:00
YANG QIA
8ca94329ce
fix(data-vi): canvas height keeps increasing when filtering/reseting (#3849) 2024-03-28 12:56:25 +08:00
jack zhang
1dfd97cad5
create nocobase app unit test (#3833)
* fix: unit test package bug

* fix: client esm

* fix: nocobase test e2e esm format (T-2824)
2024-03-28 11:08:08 +08:00
chenos
f2d4188ccf feat: update docker config 2024-03-28 10:44:55 +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
chenos
06980fd87d
fix: improve app manager (#3841) 2024-03-27 20:15:13 +08:00
4a25d973c0 fix: setting block filter order error 2024-03-27 20:07:17 +08:00
b563f3727b fix: chart field default value set error 2024-03-27 20:00:07 +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
12142f9654 fix: grouped-table type error 2024-03-27 17:11:02 +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
YANG QIA
996e89fb14
fix(data-vi): charts flickers (#3836) 2024-03-27 15:43:11 +08:00
bai.jingfeng
0eeb44c306 fix: 修复ErrorBoundary,使用react-error-boundary (#510)
<!-- 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. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#510
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-27 14:36:26 +08:00
katherinehhh
e95f4ab123
fix: acl e2e failed (#3835)
* test: acl e2e test

* refactor: test: acle e2e test fix
2024-03-27 14:34:59 +08:00
lyx
5900971df2 feat: rental updata version 1.6.5 2024-03-27 14:27:14 +08:00
lyx
108ff55ad3 feat: 发票项目新增项目关连字段 fix #507 2024-03-27 14:10:38 +08:00
wjh
629fff170f fix: 修改小结组件不显示赔偿 2024-03-27 13:12:52 +08:00
katherinehhh
d3bd0c71dd
chore: menu permissions & plugins setting permissions (#3822)
* chore: menu permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions
2024-03-27 12:03:24 +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
katherinehhh
78697e02be
fix: missing button icon (#3832)
* refactor: action icon

* Revert "refactor: action icon (#3831)"

This reverts commit c8e334d8ab.

* refactor: action icon
2024-03-27 11:37:58 +08:00
katherinehhh
c8e334d8ab
refactor: action icon (#3831) 2024-03-27 11:23:34 +08:00
lyx
ca3c0f4d91 feat: update rental version 2024-03-27 11:15:17 +08:00
wjh
7dfb308503 fix: 修改计价数量报错 (#505)
<!-- 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. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#505
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-27 11:11:14 +08:00
jack zhang
e32666b191
Optimize building tools (#3824)
* fix: build support dir

* fix: add build retry

* fix: vite warning ignore
2024-03-27 07:45:29 +08:00
eb090572c6 feat: 仓库二期,出入库单打印预览,产品范围,计价数量,换算数量
Reviewed-on: daoyoucloud/tachycode#503
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-26 23:09:59 +08:00
bai.jingfeng
6251551ded fix: 修复errorBoundary (#504)
<!-- 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. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#504
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-26 21:50:03 +08:00
bai.jingfeng
f2ad0534fa feat: 增加自定义组件ErrorBoundary, 以及给现有的三个自定义组件,进行错误边界处理 (#501) fix #497
Reviewed-on: daoyoucloud/tachycode#501
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-26 20:07:25 +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
Junyi
b6ae528d80
chore(test): fix agent type (#3819) 2024-03-26 14:51:40 +08:00