Commit Graph

4679 Commits

Author SHA1 Message Date
wjh
629fff170f fix: 修改小结组件不显示赔偿 2024-03-27 13:12:52 +08:00
404a7b663b Merge pull request 'feat: update rental version' (#506) from feat_update_rental_version into @hera/dev
Reviewed-on: daoyoucloud/tachycode#506
2024-03-27 11:16:02 +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
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
31ab773e4c Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev 2024-03-25 21:44:57 +08:00
bai.jingfeng
4a295a216f feat:自定义筛选组件,优化用户输入跟踪,在筛选项顶部添加一个用户的原始输入 (#491)
Reviewed-on: daoyoucloud/tachycode#491
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-25 21:34:08 +08:00
5134a3fce0 Merge pull request 'fix: 修改数据表设置权限时小结出不来的问题' (#492) from fix_records into @hera/dev
Reviewed-on: daoyoucloud/tachycode#492
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-25 21:33:53 +08:00
wjh
f3782baebd fix: 修改数据表设置权限时小结出不来的问题 2024-03-25 21:32:18 +08:00
ca4c3e6d20 chore: upgrade plugin-core 2024-03-25 20:40:41 +08:00
cba46cc29c fix: association cascader can not filter 2024-03-25 20:40:08 +08:00
80a53806bd fix: association-cascader should use fieldnames 2024-03-25 18:25:55 +08:00
c5e0301e3d chore: upgrade plugin-rental 2024-03-25 18:01:57 +08:00
wjh
9f23211ccd fix: 优化汇总组件的金额符号根据系统语言变化 (#488)
Reviewed-on: daoyoucloud/tachycode#488
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:58:08 +08:00
78e1aeb4f2 chore: upgrade plugin-core & plugin-rental 2024-03-25 17:57:11 +08:00
629b334422 Merge pull request 'refactor: remove x-compoent-custom' (#490) from fix_name_error into @hera/dev
Reviewed-on: daoyoucloud/tachycode#490
2024-03-25 17:56:15 +08:00
6d55556254 Merge pull request 'fix: 产品赔偿费用无计算结果 fix #481' (#489) from fix_product_fee_count into @hera/dev
Reviewed-on: daoyoucloud/tachycode#489
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-25 17:53:44 +08:00
301ae1e83a refactor: remove x-compoent-custom 2024-03-25 17:49:52 +08:00
lyx
91f273660d fix: 产品赔偿费用无计算结果 fix #481 2024-03-25 17:39:48 +08:00
wjh
aa2542b706 fix: 优化自定义筛选组件和逻辑 (#486)
<!-- 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. -->

Co-authored-by: sealday <sealday@gmail.com>
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Reviewed-on: daoyoucloud/tachycode#486
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:24:21 +08:00
wjh
610fee7035 fix: 修改合同编号为合同编码 (#483)
Reviewed-on: daoyoucloud/tachycode#483
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-25 17:21:22 +08:00
1bf79e6a58 Merge pull request 'merge_from_origin' (#474) from merge_from_origin into @hera/dev
Reviewed-on: daoyoucloud/tachycode#474
2024-03-24 01:04:09 +08:00
0249affd47 Merge remote-tracking branch 'origin/main' into merge_from_origin 2024-03-24 01:03:26 +08:00
2ddbe8e596 fix: pdf双列备注信息展示重复 (#471) fix #472
Reviewed-on: daoyoucloud/tachycode#471
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-23 22:29:03 +08:00
katherinehhh
fbed0201aa
fix: field permission all fields should be displayed (#3799) 2024-03-23 18:41:57 +08:00
chenos
35a6514993 chore: update changelog 2024-03-23 17:55:17 +08:00
chenos
71ec7ece6a chore(versions): 😊 publish v0.20.0-alpha.16 2024-03-23 17:54:02 +08:00
katherinehhh
00dc004601
refactor: view collection support filterTargetKey config (#3767)
* refactor: view collection support filterTargetkey config

* refactor: locale improve

* refactor: locale improve
2024-03-23 12:17:13 +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
Chareice
428bf79298
chore: console.log 2024-03-22 13:59:39 +08:00
ChengLei Shao
4e145a8868
fix: load data source when data source load failed (#3793) 2024-03-22 12:20:12 +08:00
1ae578fe10 Merge pull request 'fix_record_create_err' (#465) from fix_record_create_err into @hera/dev
Reviewed-on: daoyoucloud/tachycode#465
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-22 11:26:26 +08:00
lyx
8368ca0f62 feat: 恢复不必要的判断写法,valuse不可能为空,不必要打问号 2024-03-22 11:24:27 +08:00
lyx
44259e8260 feat: rental upversions 2024-03-22 10:54:59 +08:00
lyx
697cd62e7c fix: create error because waybill 2024-03-22 10:50:08 +08:00
1ddd858536 refactor: rename filter-form 2024-03-22 04:34:29 +08:00
930e077e68 refactor: reorganize files and fix association field config visible problem 2024-03-22 03:38:19 +08:00
f6646f5825 Merge pull request 'merge_from_upstream' (#463) from merge_from_upstream into @hera/dev
Reviewed-on: daoyoucloud/tachycode#463
2024-03-22 03:20:43 +08:00
b04d475085 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-22 03:20:18 +08:00
25e41e479e refactor: try reduce 2024-03-22 03:15:43 +08:00
e8497f8f8e feat: association cascader support filter 2024-03-22 02:54:13 +08:00
436088d7b9 feat: support association-cascader filter form item 2024-03-22 02:36:54 +08:00
5489c9e569 chore(version): upgrade plugin-rental 2024-03-21 23:43:50 +08:00
daf93e62c2 Revert "Revert "fix: modal app not found""
This reverts commit f4e75348d7.
2024-03-21 22:18:27 +08:00