Commit Graph

4149 Commits

Author SHA1 Message Date
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
jack zhang
36372c9614
fix: embed plugin need hooks and e2e change (#3727) 2024-03-26 14:32:52 +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
b690a3afd1 chore(e2e): update retries in defineConfig 2024-03-26 11:37:27 +08:00
Junyi
080e491a0d
fix(plugin-workflow-manual): fix schema migration (#3814) 2024-03-25 21:57:58 +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
wjh
f3782baebd fix: 修改数据表设置权限时小结出不来的问题 2024-03-25 21:32:18 +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
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
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
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
Zeke Zhang
0269a1ff7d
fix(Details): block template (#3807)
* fix: add 'Details' in condition

* fix: block template
2024-03-25 16:25:41 +08:00
ChengLei Shao
2195a31f5b
chore: cascade can replace set null action (#3812) 2024-03-25 16:02:52 +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
Zeke Zhang
f2828cd8b0
chore: add options for matching and ignoring test files in e2e and p-test commands (#3811) 2024-03-25 12:29:44 +08:00
katherinehhh
5e22103e33
chore: file collection template preset fields should be disabled (#3810) 2024-03-25 11:39:52 +08:00
Junyi
e9e116e476
fix(plugin-workflow): remove string template in condition calculation (#3688) 2024-03-25 11:34:14 +08:00
jack zhang
00cf5fa02c
fix: refresh collection name when update (#3797) 2024-03-25 11:30:38 +08:00
jack zhang
570e5c1354
fix: reload when data source click refresh (#3804) 2024-03-25 11:28:54 +08:00
katherinehhh
66229cc92b
fix: plugin manager keywords (#3809) 2024-03-25 09:51:57 +08:00
chenos
0dc0d329f8 fix: description 2024-03-25 09:48:08 +08:00
chenos
aa6e753b35 fix: update the locale file requires a reboot 2024-03-25 09:46:45 +08:00
katherinehhh
88d1bdbefb
fix: expand action and add new action should support drag & sort (#3808) 2024-03-24 19:44:39 +08:00
ChengLei Shao
e410dece22
fix: create attachments middleware (#3794) 2024-03-24 19:08:53 +08:00
chenos
921696f40b
fix: useExpressionScope (#3805) 2024-03-24 12:51:41 +08:00
ChengLei Shao
5ee278557d
chore: set default association reference on delete action to no action (#3722)
* chore: tmp commit

* chore: build association reference

* fix: test
2024-03-24 09:37:52 +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
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
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
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
f4e75348d7 Revert "fix: modal app not found"
This reverts commit f5a83d48da.
2024-03-21 22:14:32 +08:00
e07ee53db7 refactor: remove after success 2024-03-21 22:04:48 +08:00
eddb3230c6 refactor: remove unused codes 2024-03-21 21:44:44 +08:00
YANG QIA
9354e25d74
fix(acl): role menu loading status (#3787) 2024-03-21 21:09:24 +08:00
wjh
2620acbba7 feat: 添加组件默认值 (#461)
Reviewed-on: daoyoucloud/tachycode#461
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-21 20:48:45 +08:00
YANG QIA
49759c1ebf
fix(acl): bug when adding users to roles (#3783)
* fix(acl): bug when adding users to roles

* fix: bug
2024-03-21 20:44:06 +08:00
8041ef5b6f Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev 2024-03-21 20:39:17 +08:00
68025facb4 refactor: remove unused codes, move blocks to /schema-initializer/blocks 2024-03-21 20:38:26 +08:00
wjh
2b405fbf1a fix: 修改表格表头居中 2024-03-21 20:25:43 +08:00
59d2af69c3 chore: migrate to new dump rule 2024-03-21 19:50:45 +08:00
lyx
92bc2bfe53 fix: 直发单中录运输单报错 fix #455 2024-03-21 19:06:36 +08:00
lyx
dae8445d5f fix: 直发单运输单录入失败 2024-03-21 19:00:15 +08:00
d766eb481a Merge pull request 'merge_from_upstream' (#457) from merge_from_upstream into @hera/dev
Reviewed-on: daoyoucloud/tachycode#457
2024-03-21 18:40:33 +08:00
de89814eba Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-21 18:40:03 +08:00
6f61b08f81 feat_view_invoices_sql (#454)
Reviewed-on: daoyoucloud/tachycode#454
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-21 17:44:55 +08:00
katherinehhh
f385c34c72
fix: filter does not allow passing empty objects (#3780) 2024-03-21 16:32:51 +08:00
18e929a275 fix: excel scroll bugs 2024-03-21 16:08:32 +08:00
YANG QIA
49d3401379
fix(acl): role menu list only displays one page (#3775)
* fix(acl): role menu list only displays one page

* chore: remove log
2024-03-21 14:30:49 +08:00
6dab16e437 chore(version): upgrade plugin-rental 2024-03-20 23:24:35 +08:00
Junyi
9b27fa955a
feat(plugin-user): add model method desensitize() to filter hidden field (#3768)
* feat(plugin-user): add model method desensitize() to filter hidden field

* fix(plugin-workflow-action-trigger): fix user fields in context
2024-03-20 23:22:22 +08:00
Junyi
cebb013482
fix(plugin-file-manager): fix storage locale on file template table header (#3769) 2024-03-20 22:25:39 +08:00
f5a83d48da fix: modal app not found 2024-03-20 19:57:54 +08:00
e307b11006 fix_record_fee_print (#443)
Reviewed-on: daoyoucloud/tachycode#443
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-20 19:20:26 +08:00
70d8b2cfef feat: support unused number 2024-03-20 18:57:38 +08:00
23e387caf2 feat: support api 2024-03-20 18:48:42 +08:00
bc2544ed34 feat: add unused records block 2024-03-20 18:23:30 +08:00
katherinehhh
36ce29eace
fix: first character entered in foreign key input is not displayed (#3770) 2024-03-20 17:27:33 +08:00
7813ace40c chore(version): upgrade plugin-rental 2024-03-20 16:43:38 +08:00
fa5135ce33 Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev 2024-03-20 16:42:51 +08:00
65f62675d3 fix_record_fee_print (#440)
Reviewed-on: daoyoucloud/tachycode#440
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-20 16:41:20 +08:00
fc1b890937 chore(version): upgrade plugin-core & plugin-rental 2024-03-20 15:20:09 +08:00
chenos
bef9c8ab7b chore(versions): 😊 publish v0.20.0-alpha.15 2024-03-20 14:47:28 +08:00
YANG QIA
6a1be0fcd5
fix(auth): sso auth bug when deploying with subpath (#3764) 2024-03-20 14:46:22 +08:00
ChengLei Shao
a2ae4f7b70
chore: load roles after start (#3763) 2024-03-20 14:40:11 +08:00
lyx
b9c31eade2 fix: 订单费用pdf部分失效 2024-03-20 14:31:26 +08:00
5df5fb5be6 feat: 移植 x-spreadsheet (#437)
Reviewed-on: daoyoucloud/tachycode#437
2024-03-20 12:29:24 +08:00
wjh
db104c20ce feat: 添加自定义组件下拉框类型 (#436)
Reviewed-on: daoyoucloud/tachycode#436
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-20 12:02:41 +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
YANG QIA
751bd73175
fix(logger): output error cause info (#3760)
* fix(logger): output error cause info

* fix: typo
2024-03-20 09:50:04 +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
lyx
0c60f426e3 feat: 合同方案租金/费用项,基础表的校验 2024-03-19 20:50:54 +08:00
ChengLei Shao
599a1aa0c6
chore: merge sub app database options (#3640) 2024-03-19 20:34:13 +08:00
23fe420cf0 feat: record group weight and allprice (#431)
Reviewed-on: daoyoucloud/tachycode#431
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-19 19:06:47 +08:00
486b51f2aa Merge pull request 'feat: 添加自定义组件文本类型' (#432) from fix_filterCustom into @hera/dev
Reviewed-on: daoyoucloud/tachycode#432
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-19 18:58:56 +08:00
wjh
c0fde83b33 feat: 添加自定义组件文本类型 2024-03-19 18:30:05 +08:00
YANG QIA
b6d17853d8
fix(acl): bug of user filtering when adding them to roles (#3754)
* fix(acl): bug of user filtering when adding them to roles

* chore: add tests
2024-03-19 17:53:13 +08:00
lyx
82e1355c39 feat: 新版发票视图 2024-03-19 17:22:10 +08:00
bd39b36d65 Merge pull request 'fix: handle added ctx' (#428) from fix_charts_build into @hera/dev
Reviewed-on: daoyoucloud/tachycode#428
2024-03-19 17:05:56 +08:00
326dcee3d7 fix: handle added ctx 2024-03-19 17:04:56 +08:00
629eb576f1 Merge pull request 'fix: 修改自定义筛选为字段内容本身' (#425) from fix_filterCuston into @hera/dev
Reviewed-on: daoyoucloud/tachycode#425
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-19 15:41:23 +08:00
wjh
2b1871526c fix: 修改自定义筛选为字段内容本身 2024-03-19 15:30:06 +08:00
lyx
cd69f62768 feat: 车牌号校验 2024-03-19 15:08:18 +08:00
lyx
200a58f370 feat: 车牌号带有’挂‘字样处理 2024-03-19 14:43:42 +08:00
lyx
4bd98be813 Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into feat_record_check_vehicles 2024-03-19 13:25:52 +08:00
lyx
d8a24dce40 feat: 订单车牌号校验 2024-03-19 13:20:51 +08:00
1d8a97bdc0 Merge pull request 'fix: add schema item max stack exceeded' (#422) from fix_max_stack into @hera/dev
Reviewed-on: daoyoucloud/tachycode#422
2024-03-19 13:11:39 +08:00
a44c582b1d fix: add schema item max stack exceeded 2024-03-19 13:09:14 +08:00
8a0fb826f6 Merge pull request 'merge_from_upstream3' (#421) from merge_from_upstream3 into @hera/dev
Reviewed-on: daoyoucloud/tachycode#421
2024-03-19 12:29:49 +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
wjh
60a37c58c4 fix: 修改订单查询显示的理论重量逻辑 (#420)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 12:02:10 +08:00
d3c3322fd4 refactor: clean plugin-core index 2024-03-19 12:01:14 +08:00
wjh
f4be99e802 feat: 添加自定义组件可以修改数据来源和组件,修复筛选框清空和重置后的查询问题 (#418)
<!-- 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>
Reviewed-on: daoyoucloud/tachycode#418
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 11:52:33 +08:00
Chareice
02742c3c76
chore: plugin command error wrap raw error object 2024-03-19 11:01:41 +08:00
ChengLei Shao
6665aca695
fix: app stopped status (#3723) 2024-03-19 09:24:01 +08:00
Zeke Zhang
368036923f
fix: fix the disappearing collections when searching (#3750) 2024-03-19 09:00:01 +08:00