96d06b5919
chore(version): plugin-rental
2024-04-08 22:13:05 +08:00
4c8698c6ed
fix: 修改结算单产品计算逻辑 ( #630 )
...
Reviewed-on: daoyoucloud/tachycode#630
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-08 17:45:14 +08:00
bai.jingfeng
799603f9f2
refactor: 跟踪上游,(refactor: change useProps to x-use-component-props ( #3853 )) ( #629 )
...
Reviewed-on: daoyoucloud/tachycode#629
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-08 17:09:14 +08:00
0add483693
chore(version): fix sort
2024-04-08 15:58:36 +08:00
5d45a4b34c
Merge pull request 'feat: 合同方案租金表添加修改校验' ( #625 ) from fix_contract_plan_lease_save_check into dev
...
Reviewed-on: daoyoucloud/tachycode#625
2024-04-08 15:50:57 +08:00
lyx
e47446cc24
feat: 合同方案租金表添加修改校验
2024-04-08 15:49:52 +08:00
4e902fc9e0
fix: source id & subtable sort
...
Reviewed-on: daoyoucloud/tachycode#624
2024-04-08 15:47:48 +08:00
96fe4c107e
fix: delete residual packages
2024-04-08 14:09:44 +08:00
ab66334682
chore: upgrade version
2024-04-08 14:01:17 +08:00
a1c8115480
refactor: remove unsed formula plugins
2024-04-08 13:42:23 +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
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
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
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
bai.jingfeng
965a568c02
fix: 复制修复
2024-04-07 18:16:10 +08:00
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
9331bf3c6d
Merge pull request 'fix: 修改汇总区块不格式化文本类型' ( #605 ) from fix-group into dev
...
Reviewed-on: daoyoucloud/tachycode#605
2024-04-07 13:28:35 +08:00
58c9dc0dba
fix: 修复更新antd后的导航图标样式异常
2024-04-07 11:42:25 +08:00
a4ab6ff994
fix: 修改汇总区块不格式化文本类型
2024-04-07 10:34:32 +08:00
5db6f51e70
chore: upgrade version
2024-04-06 03:36:20 +08:00
b752e1afe0
feat: optimize block add menu
2024-04-03 20:02:39 +08:00
732a2673a0
chore: upgrade version
2024-04-03 19:40:05 +08:00
bai.jingfeng
2544dab6be
fix: 数据关联表引用自己的情况不显示内容-同步官方, 发布后需要重新配置区块
2024-04-03 18:37:12 +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
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
d1b50a8f31
feat: 将 yarn + learn 的 monorepo 转成 pnpm ( #548 ) ( #555 )
...
Reviewed-on: daoyoucloud/tachycode#555
2024-04-01 13:39:44 +08:00
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
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
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
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
katherinehhh
fec3662dc9
fix: filterTargetKey only support view collection ( #3872 )
2024-03-29 18:24:40 +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
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
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
Junyi
1f59d4bed2
refactor(plugin-workflow): add transaction check from data source ( #3857 )
2024-03-29 09:09:12 +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
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
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
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
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
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
e88082232d
fix: reporting error when clicking on the print button for the detail block ( #3845 )
2024-03-28 14:42:56 +08:00
YANG QIA
8ca94329ce
fix(data-vi): canvas height keeps increasing when filtering/reseting ( #3849 )
2024-03-28 12:56:25 +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
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
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
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
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
katherinehhh
78697e02be
fix: missing button icon ( #3832 )
...
* refactor: action icon
* Revert "refactor: action icon (#3831 )"
This reverts commit c8e334d8ab
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
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
chenos
339822241f
chore(versions): 😊 publish v0.20.0-alpha.17
2024-03-26 17:25:06 +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
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
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
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
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
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
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
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
chenos
0dc0d329f8
fix: description
2024-03-25 09:48:08 +08:00
ChengLei Shao
e410dece22
fix: create attachments middleware ( #3794 )
2024-03-24 19:08:53 +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
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
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
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
68025facb4
refactor: remove unused codes, move blocks to /schema-initializer/blocks
2024-03-21 20:38:26 +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
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
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
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
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
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
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
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
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
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
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
e5baa89cac
chore(version): upgrade plugin-core & plugin-rental
2024-03-18 22:32:24 +08:00
lyx
0bb968d8c9
fix: path amend
2024-03-18 20:03:44 +08:00
lyx
415ef98ca6
fix: 报价总金额结算组件编辑报错修复（待重构）购销单pdf打印名称更正，pdf报价金额修复，购销列表总金额修复
2024-03-18 19:53:09 +08:00
992dde950c
Merge pull request 'feat: 合同方案区间校验' ( #405 ) from feat_contract_plain_timet_check into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#405
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-18 18:38:19 +08:00
chenos
c75d38bb05
chore(versions): 😊 publish v0.20.0-alpha.14
2024-03-18 18:29:13 +08:00
lyx
c0c8cbab87
feat: 合同方案区间校验
2024-03-18 15:53:28 +08:00
fb91a230fb
Merge pull request 'fix: 修改自动补全重置后筛选失效问题' ( #402 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#402
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-18 15:07:29 +08:00
5b4fbea13f
fix: 修改自动补全筛选失效问题
2024-03-18 14:13:58 +08:00
YANG QIA
3942b7cb94
fix(data-vi): tooltip bug of pie chart ( #3745 )
2024-03-18 12:33:03 +08:00
e73338815e
refactor: fields
2024-03-18 11:48:43 +08:00
240accc39e
refactor: group components
2024-03-18 11:45:23 +08:00
4ec92ea1e5
refactor: remove multiple action designer
2024-03-18 11:18:09 +08:00
85ba307506
Merge remote-tracking branch 'hera/@hera/dev' into feat_drawer_in_page
2024-03-18 11:07:10 +08:00
8d580b72b2
refactor: remove error-fallback and __builtins__ from plugin-core
2024-03-18 10:48:28 +08:00
chenos
db9ff337e5
chore(versions): 😊 publish v0.20.0-alpha.13
2024-03-17 23:34:26 +08:00
7de2f749b1
refactor: pages import styles
2024-03-17 23:30:55 +08:00
a5145e64f7
refactor: remove page
2024-03-17 23:30:55 +08:00
chenos
df153527a7
fix(acl): unable to associate users
2024-03-17 23:30:32 +08:00
2af767c7ef
refactor: migrate popover(drawer) to core/client
2024-03-17 23:30:24 +08:00
f40fb6684f
Merge remote-tracking branch 'origin/main' into merge_from_upstream_2
2024-03-17 23:29:16 +08:00
katherinehhh
93091a92f7
test(acl):column action acl e2e ( #3738 )
...
* test: acl e2e test support new data block
* test: acl e2e test support new data block
* test: acl e2e test support new data block
* test: acl e2e test support new data block
2024-03-17 17:29:23 +08:00
4919a372bd
fix: plugin-mobile version error
2024-03-17 17:26:57 +08:00
YANG QIA
3be6b7c0c6
fix(data-vi): association fields transform bug ( #3737 )
...
* fix(data-vi): association fields transform bug
* fix: bug
2024-03-17 15:16:06 +08:00
d07932e9eb
Merge remote-tracking branch 'origin/main' into merge_from_upstream_1
2024-03-17 04:28:06 +08:00
cd62e83403
add mobile plugin and other refactors ( #396 )
...
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#396
2024-03-17 04:20:33 +08:00
chenos
c1be864124
chore(versions): 😊 publish v0.20.0-alpha.12
2024-03-16 23:18:19 +08:00
YANG QIA
542fb65b50
fix: compatibility of @ant-design/plots 2.x ( #3734 )
...
* fix: compatibility of @ant-design/plots 2.x
* fix: dual-axes chart bug
* fix: auto infer bug
2024-03-16 23:04:57 +08:00
chenos
15ef81854e
chore(versions): 😊 publish v0.20.0-alpha.11
2024-03-16 20:05:34 +08:00
chenos
b359f9eac6
feat: supports subdirectory deployment ( #3731 )
...
* feat: supports subdirectory deployment
* feat: auto publicPath
* fix: buildIndexHtml
* fix: format
* fix: regexp
* fix: test error
* fix: nocobase.conf
* fix: path
* fix: nocobase.conf
* fix: bugs
* fix: resourcer prefix
* fix: cas
2024-03-16 20:01:34 +08:00
24471c7fbe
chore: upgrade plugin-rental
2024-03-16 00:51:12 +08:00
25e170aada
fix: delete logic error
2024-03-16 00:48:07 +08:00
b8b9e844cd
chore: upgrade plugin-core & plugin-rental
2024-03-15 20:45:16 +08:00
4b212084f8
fix: post data error
2024-03-15 20:40:05 +08:00
edac378ae9
Merge pull request 'feat: 汇总后端计算' ( #395 ) from feat_group_backend into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#395
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 20:29:02 +08:00
ee82c00a64
Merge pull request 'fix: 修改自动补全筛选失效问题' ( #394 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#394
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 20:23:01 +08:00
lyx
12fcff604b
feat: 汇总后端计算
2024-03-15 20:21:33 +08:00
7f856cffb0
fix: 修改自动补全筛选失效问题
2024-03-15 20:15:46 +08:00
fd5c5cf5de
chore: upgrade plugin-audit-logs
2024-03-15 19:27:31 +08:00
99e866eae4
chore: upgrade plugin-core & plugin-rental & plugin-audit-logs
2024-03-15 19:24:34 +08:00
bf091d0247
Merge pull request 'audit_logs_i18n' ( #393 ) from audit_logs_i18n into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#393
2024-03-15 19:20:13 +08:00
e5038e2e96
fix: i18n
2024-03-15 19:19:32 +08:00
ebd35abeb0
chore: update i18n
2024-03-15 19:15:05 +08:00
759f51dae8
Merge pull request 'fix: 修改多选下拉框数据问题' ( #392 ) from fix_multipleSelect into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#392
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 19:13:40 +08:00
c544ae80f1
fix: 修改多选下拉框数据问题
2024-03-15 19:06:15 +08:00
ece1e59c9a
chore: clean codes
2024-03-15 18:58:29 +08:00
3e23aaa894
chore: clean auditlogs codes
2024-03-15 18:47:48 +08:00
30f84b7ca3
Merge pull request 'fix: audit logs loads error' ( #391 ) from fix_audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#391
2024-03-15 18:34:33 +08:00
227e2dbf47
fix: audit logs loads error
2024-03-15 18:33:28 +08:00
3920cb20c3
fix: 通过区块的类型配置动作
2024-03-15 17:53:13 +08:00
9af29e3e5c
Merge pull request 'fix: 修改过滤自定义数据范围变量' ( #388 ) from fix_filterData into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#388
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 17:28:59 +08:00
0d9f13f596
Merge pull request 'fix: 修改自定义筛选框数据范围问题' ( #387 ) from fix_customFilter into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#387
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 17:28:49 +08:00
65a4281ad5
fix: 修改过滤自定义数据范围变量
2024-03-15 17:13:50 +08:00
a6bd972beb
fix: 修改自定义筛选框数据范围问题
2024-03-15 16:37:14 +08:00
e2a1a570e8
Merge pull request 'fix: tval import error' ( #385 ) from audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#385
2024-03-15 16:00:47 +08:00
lyx
ecd4d560b2
fix: 合同小结计算理论重量，订单保存避免合同数据不全引发报错
2024-03-15 15:38:13 +08:00
c5a1299912
fix: tval import error
2024-03-15 15:06:19 +08:00
ccabd6a849
Merge pull request 'chore: using plugin locale' ( #383 ) from audit_logs into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#383
2024-03-15 15:03:08 +08:00
bca3a324e4
chore: using plugin locale
2024-03-15 15:02:23 +08:00
8f1b7693a8
Merge pull request 'fix_record_direct_problem' ( #382 ) from fix_record_direct_problem into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#382
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 13:54:00 +08:00
ac1e9abf77
chore: migrate audit logs plugin
2024-03-15 13:45:15 +08:00
lyx
9a44893c83
fix: 其他订单报错问题
2024-03-15 13:39:40 +08:00
lyx
74bc59a62b
fix: 无车辆信息时报错
2024-03-15 13:29:04 +08:00
83f01305cb
chore(veresion): upgrade plugin-rental
2024-03-15 12:36:03 +08:00
lyx
a64f3b9e46
feat: 关闭失误打开的注释
2024-03-15 12:30:16 +08:00
lyx
22391c10c2
fix: record direct problem
2024-03-15 12:28:32 +08:00
77901e4f3e
chore(version): upgrade core & rental
2024-03-14 22:31:36 +08:00
96d35bb829
feat: 添加自定义文本筛选 ( #373 )
...
<!-- 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#373
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-14 22:25:22 +08:00
abec9982fb
Merge remote-tracking branch 'origin/main' into merge_from_upstream
2024-03-14 22:19:15 +08:00
ab66403507
fix: ant design icon error in mobile
2024-03-14 22:14:11 +08:00
cc09966d63
feat: support add collection to collectionManager
2024-03-14 22:14:11 +08:00
8ccfdf5828
chore(version): upgrade rental
2024-03-14 22:14:11 +08:00
6e77717946
fix: 修改汇总区块NaN
2024-03-14 19:32:01 +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
lyx
b35dbec2fd
feat: schemaInitializerManager
2024-03-14 16:55:27 +08:00
lyx
e347a0d17b
fix: 工单完成 fix #371 fix #370
2024-03-14 16:35:59 +08:00
lyx
fe268d5f15
fix: 订单pdf报价实际重量/小结报价实际重量/运输单上边距
2024-03-14 16:32:52 +08:00
Zeke Zhang
51de34251a
refactor(SchemaInitializers): unify naming style ( #3604 )
...
* refactor(SchemaSettings): unify naming style
* refactor(SchemaInitializers): unify naming stle
* refactor: replace CreateFormBlockInitializers to blockInitializers:createForm
* refactor: replace to blockInitializers:customizeCreateForm
* refactor: replace block intializers name
* refactor: replace action initializers name
* refactor: replace field initializers name
* style: fix hover style for column action (T-3297)
* refactor: revert some codes
* chore: update comment
* chore: replace iframeBlockSchemaSettings to blockSettings:iframe
* chore: delete pro-packages
* feat: add CompatibleSchemaInitializer
* test: add unit tests
* chore: add @internal for CompatibleSchemaInitializer
* chore: block
* chore: field
* chore: ations
* fix: build
* chore: typo
* fix: fix unit tests
* test: fix e2e
* chore: remove igone
* refactor: page:addBlock
* refactor: popup:addNew:addBlock
* fix: fix max call stack
* refactor: popup:addRecord:addBlock
* refactor: remove blockInitializers:recordForm
* refactor: popup:tableSelector:addBlock
* refactor: popup:view:addBlock
* refactor: popup:bulkEdit:addBlock & charts:addBlock
* refactor: mobilePage:addBlock
* refactor: popup:snapshot:addBlock
* refactor: popup:workflowManual:configureUserInterface:addBlock
* fix: avoid crashing
* chore: optimize
* refactor: popup:common:addBlock
* refactor: workflowManual:popup:configureUserInterface:addBlock
* refactor: details:configureFields
* refactor: form:configureFields
* refactor: table:configureColumns
* refactor: filterForm:configureFields
* refactor: associationFilterInitializer
* refactor: assignFieldValuesForm:configureFields
* refactor: bulkEditForm:configureFields
* refactor: auditLogsTable:configureColumns
* refactor: chartFilterForm:configureFields
* refactor: kanban:configureItemFields
* refactor: workflowManual:customForm:configureFields
* refactor: detailsWithPaging:configureActions
* refactor: details:configureActions
* refactor: createForm:configureActions
* refactor: editForm:configureActions
* refactor: gridCard:configureActions
* refactor: gridCard:configureItemActions
* refactor: list:configureActions
* refactor: list:configureItemActions
* refactor: table:configureItemActions
* refactor: table:configureActions
* refactor: filterForm:configureActions
* refactor: subTable:configureActions
* refactor: bulkEditForm:configureActions
* refactor: auditLogsTable:configureItemActions
* refactor: auditLogsTable:configureActions
* refactor: calendar:configureActions
* refactor: chartFilterForm:configureActions
* refactor: gantt:configureActions
* refactor: kanban:configureActions
* refactor: map:configureActions
* refactor: workflowManual:form:configureActions
* feat: use 'createForm:configureActions' in page
* feat: use 'details:configureActions' in Calendar
* feat: register deleteEvent initializer in calendar plugin
* fix: fix delete event action
* test: fix e2e
* test: fix e2e
* chore: only run workflow's e2e
* Revert "chore: only run workflow's e2e"
This reverts commit 9e5b4af41e40e8d616007a5ab97291fb2370d88a.
* fix: use isInitializersSame to fix some case
2024-03-14 14:13:11 +08:00
lyx
1d14cd82e8
fix: 新建自动结算合同，多创建数据
2024-03-14 11:32:33 +08:00
83deef45d0
Merge pull request 'feat: 订单打印上边距可调整' ( #367 ) from feat_recordpdf_top_margin into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#367
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-14 10:33:29 +08:00
lyx
2125c8ddae
feat: 更新数据参数规范
2024-03-14 10:32:18 +08:00
YANG QIA
69ff55ba90
fix(data-vi): update antv version ( #3710 )
2024-03-13 23:03:15 +08:00
chenos
40a22943b9
chore(versions): 😊 publish v0.20.0-alpha.10
2024-03-13 22:41:12 +08:00
lyx
eb476a95e2
feat: 订单打印上边距可调整
2024-03-13 21:29:43 +08:00
048b7776b0
chore(version): upgrade core & rental
2024-03-13 20:22:48 +08:00
katherinehhh
e5c1bef8de
fix(client): size undefined in nanoid ( #3708 )
...
* fix(data-source): foreignkey
* fix: size undefined in nanoid
2024-03-13 19:00:28 +08:00
lyx
e14f99341a
fix: 编辑直发单，对应生成单单号保持不变
2024-03-13 18:53:44 +08:00
katherinehhh
0779a4eab3
refactor(radio): radio support multiple field types ( #3706 )
...
* style: fieldTitleInput style improve
* refactor: radio support mutiple type
* refactor: code improve
2024-03-13 16:44:17 +08:00
ChengLei Shao
f6590d1331
fix: get async json schema ( #3705 )
...
* fix: get async json schema
* fix: test
2024-03-13 16:17:18 +08:00
5a7c78d791
chore(version): upgrade core & rental
2024-03-13 15:29:08 +08:00
7a77536fc1
Merge pull request 'fix: 修改汇总区块NaN，添加自定义组件的理论重量' ( #363 ) from fix_group into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#363
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 15:26:32 +08:00
12fe07e197
update ( #362 )
...
<!-- 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#362
2024-03-13 15:11:31 +08:00
5e2d8e871f
Merge pull request 'chore(version): upgrade core & rental' ( #361 ) from update into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#361
2024-03-13 15:09:45 +08:00
5ad280a8b3
fix: 修改汇总区块NaN，添加自定义组件的理论重量
2024-03-13 15:07:24 +08:00
lyx
2099be026a
feat: recodpdf kg不换算吨
2024-03-13 14:29:21 +08:00
65f3f838c6
chore(version): upgrade core & rental
2024-03-13 14:01:13 +08:00
lyx
bd5bcadd3a
fix: 订单pdf单位数据错误
2024-03-13 13:58:37 +08:00
a7049de998
Merge remote-tracking branch 'origin/main' into merge_from_upstream
2024-03-13 12:17:01 +08:00
Junyi
4015cf1c0d
fix(plugin-workflow): fix duplicated triggering schedule event ( #3692 )
2024-03-13 11:42:00 +08:00
Zeke Zhang
d904d13c52
fix(Form): should be created instead of updated when clicking submit ( #3687 )
...
* fix(Form): should be created instead of updated when clicking submit
* test: add e2e
* test: optimize e2e
2024-03-13 10:13:02 +08:00
58ac16a9b6
chore(version): upgrade rental
2024-03-12 23:20:21 +08:00
fa0d01fd47
fix: stack overflow
2024-03-12 23:19:36 +08:00
95452630b3
chore(version): upgrade rental
2024-03-12 21:59:56 +08:00
lyx
2245cd84e7
fix: 小结理论重量更正，报价总金额工单修改，购销单pdf工单修改，订单导入hook停用，出库入筛选基地仓库
2024-03-12 21:33:51 +08:00
1f6b802b61
chore(version): upgrade core & rental
2024-03-12 21:21:29 +08:00
chenos
2e7da6e29b
chore(versions): 😊 publish v0.20.0-alpha.9
2024-03-12 21:15:51 +08:00
02fbf868a5
Merge pull request 'feat: 小结完成，recordhook小调整' ( #350 ) from feat_record_summary into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#350
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 20:13:00 +08:00
lyx
52a17ca60c
feat: 小结完成
2024-03-12 20:07:27 +08:00
ae8d1a47b0
fix: undefined promises throw error
2024-03-12 20:03:34 +08:00
1737a0f83b
Merge pull request 'main' ( #349 ) from main into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#349
2024-03-12 20:00:15 +08:00
71ccf55d77
Merge pull request 'feat: 修改录单跳转问题' ( #348 ) from fix_recordNavigate into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#348
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 16:41:50 +08:00
847a1fae9a
feat: 修改录单跳转问题
2024-03-12 16:08:27 +08:00
Chareice
023096b1a9
fix: pagination error in roles collections resourcer
2024-03-12 15:15:24 +08:00
jack zhang
de6e8469d3
fix: data source add field refresh(T-3253) ( #3645 )
2024-03-12 15:13:56 +08:00
07068febbd
feat: 添加汇总的提供请求链接地址
2024-03-12 14:29:15 +08:00
ChengLei Shao
94cbbf93b8
fix: upgrade app after restore ( #3680 )
2024-03-12 11:34:22 +08:00
ChengLei Shao
cdf9f4818f
fix: acl should return true when resource allowed ( #3675 )
...
* fix: acl should return true when resource allowed
* chore: test
2024-03-12 09:08:15 +08:00
f98a4305f3
feat: add tab search block
2024-03-12 04:32:16 +08:00
f7872aa16e
feat: add notice bar and swiper block
2024-03-12 03:45:44 +08:00
92bec8c5f5
fix: after refactor path error
2024-03-11 21:17:34 +08:00
0eea4f4b96
Merge pull request 'feat: update standard interface name' ( #342 ) from feat_interface_name_standard into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#342
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-11 19:29:38 +08:00
lyx
54d0942dae
fix: eslint --fix
2024-03-11 19:25:50 +08:00
lyx
d2ad2920d1
feat: update standard interface name
2024-03-11 19:25:05 +08:00
0b6025cd65
fix: type change from any to human-made
2024-03-11 19:20:15 +08:00
cca6c649c1
chore: mock records:group api
2024-03-11 19:08:01 +08:00
649a07d581
chore: upgrade hera-core
2024-03-11 17:08:53 +08:00
katherinehhh
ba2467c9bf
fix: assign field values modal shuold support maskClosable
2024-03-11 16:52:14 +08:00
Chareice
ef097bd450
fix: acl snippet value
2024-03-11 13:05:37 +08:00
e69e9b9940
fix: resource conflict with nocobase settings
2024-03-11 12:32:06 +08:00
16342247be
refactor: remove koa router deps
2024-03-11 10:38:12 +08:00
3ed284f94a
Merge pull request 'refactor_server' ( #340 ) from refactor_server into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#340
2024-03-11 10:35:14 +08:00
dbf6828741
fix: add oidc server plugin
2024-03-11 10:34:17 +08:00
c0f46dcf87
Merge pull request 'main' ( #339 ) from main into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#339
2024-03-11 10:31:45 +08:00
xilesun
6fd06a28c8
chore(versions): 😊 publish v0.20.0-alpha.8
2024-03-11 09:59:08 +08:00
ChengLei Shao
a477facdbf
chore: move collection manager snippets into data source ( #3666 )
2024-03-10 09:57:14 +08:00
7d35af679f
chore: update i18n
2024-03-10 05:54:34 +08:00
a0f9d54046
refactor: replace deprecated method
2024-03-10 05:48:38 +08:00
d06cce2cfa
feat: custom filter form add input component
2024-03-10 05:19:27 +08:00
c56ce13a0d
chore(version): upgrade rental
2024-03-10 04:36:36 +08:00
afc79d633f
Merge branch '@hera/main' into @hera/dev
2024-03-10 04:13:18 +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
350c0ac1f4
Revert "Revert "fix: add displayName ( #3628 )""
...
This reverts commit 58e2fd6ea6
2024-03-10 03:06:57 +08:00
ChengLei Shao
ca0f1b5c05
chore: test ( #3664 )
2024-03-09 17:45:19 +08:00
YANG QIA
dd5b026ee9
fix(auth): cas service validate issue ( #3661 )
2024-03-09 11:13:09 +08:00
fbe0c14920
perf: optimize record summary
2024-03-09 02:56:27 +08:00
71c84a00de
chore(version): upgrade rental
2024-03-09 00:09:10 +08:00
47a5a504fe
perf: optimize custom components and scope
2024-03-09 00:08:19 +08:00
dbcd884526
perf: optimize valuation item
2024-03-08 23:29:42 +08:00
366312418a
chore(version): upgrade rental
2024-03-08 21:06:35 +08:00
Junyi
677eb152e0
fix(plugin-workflow-action-trigger): fix appends loading ( #3659 )
...
* fix(plugin-workflow-action-trigger): fix appends loading
* fix(plugin-workflow-action-trigger): fix test case
2024-03-08 21:06:10 +08:00
a7bd0695ce
perf: optimize count and weight item
2024-03-08 21:05:56 +08:00
