Commit Graph

1800 Commits

Author SHA1 Message Date
lyx
29ec447fee chore: version 2024-04-18 15:46:56 +08:00
4b3886b072 fix_contract_no_products_assfees (#759)
Co-authored-by: lyx <2027667395@qq.com>
Co-authored-by: sealday <zhanglin@daoyoucloud.com>
Reviewed-on: daoyoucloud/tachybase#759
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-18 15:36:30 +08:00
78ba43e7f9 chore(version): upgrade @hera/plugin-rental 2024-04-18 14:48:01 +08:00
e230ea5586 feat: 合同费用校验(无产品关联先跳过)clost #756 (#757)
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachybase#757
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-18 14:45:55 +08:00
b4aa7ddea7 chore(version): release v0.21.16 2024-04-18 03:09:15 +08:00
bc167dca1c fix: createAt field error 2024-04-18 03:07:56 +08:00
a5bf64eb93 chore(version): release v0.21.15 2024-04-18 01:33:03 +08:00
c53dedd2b2 chore(version): release v0.21.14 2024-04-18 00:10:10 +08:00
8da9c47a7e feat: 支持设置显示附件数量 (#753)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#753
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-18 00:03:32 +08:00
f3671cf697 feat: to_char 图表时间字段时区问题 close #747 (#750)
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachycode#750
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-17 16:50:51 +08:00
lyx
25418ffbde chore: version 2024-04-16 21:48:28 +08:00
wjh
9d1d490f6e fix: 优化筛选组件文本情况时加2s延迟,轮播图没有数据时添加提示 close #735 (#738)
Reviewed-on: daoyoucloud/tachycode#738
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 21:02:13 +08:00
wjh
0da2e5f890 fix: 修改结算单合并规则的订单数量不对 (#734)
Reviewed-on: daoyoucloud/tachycode#734
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 18:18:20 +08:00
wjh
e0be6a7aba fix: 修复自定义组件下拉框没有自定义显示选项 (#730)
Reviewed-on: daoyoucloud/tachycode#730
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 15:53:13 +08:00
lyx
a20a4df543 chore: rental 2024-04-16 15:03:25 +08:00
c92e1953d3 feat: 运输单分组计算接口 feat #726 (#728)
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachycode#728
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-16 15:01:00 +08:00
lyx
5e215fae7e chore: mobild 2024-04-16 11:07:44 +08:00
wjh
a08b45b498 fix: 修复mobile选择类型不能用的情况 fix #723
Reviewed-on: daoyoucloud/tachycode#725
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-16 11:02:33 +08:00
520b0024d4 chore(version): release v0.21.12 2024-04-16 04:44:41 +08:00
487ec95dc2 fix: multi app start error 2024-04-16 04:42:42 +08:00
2733e513d2 chore(release): release v0.21.11 2024-04-16 04:35:58 +08:00
27d43eee28 fix: 修复数据表自动编码没有提交按钮的bug, 去除布局组件 (#722)
Reviewed-on: daoyoucloud/tachycode#722
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>
2024-04-15 22:59:33 +08:00
wjh
2021230f50 feat: 结算单预览添加订单数量字段 (#716)
Reviewed-on: daoyoucloud/tachycode#716
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-15 19:42:49 +08:00
0e97825b13 fix: 合同结算单结束时间加一天减一毫秒,取当天的结束时间 (#711)
Co-authored-by: lyx <2027667395@qq.com>
Reviewed-on: daoyoucloud/tachycode#711
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-15 17:53:14 +08:00
wjh
2020643371 fix: 处理同名组件选择异常情况,文本切换组件阈值,时间选择具体范围 (#712)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-15 17:40:22 +08:00
bai.jingfeng
a87d95210c refactor: excel 部分重构,优化弹窗体验 (#598)
Reviewed-on: daoyoucloud/tachycode#598
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-15 05:55:39 +08:00
14e282964d chore: 移除多余插件 (#708)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#708
2024-04-15 05:35:49 +08:00
9116a74823 chore(version): release v0.21.7 2024-04-15 05:32:07 +08:00
4784973930 chore: 清理 TachyBase 插件,移除临时的多进程通信代码
Reviewed-on: daoyoucloud/tachycode#707
2024-04-15 05:04:12 +08:00
f64a661e05 chore: 清理部分插件,修复 @tachybase/cli 工具 关联 #704
Reviewed-on: daoyoucloud/tachycode#706
2024-04-15 01:58:18 +08:00
wjh
a1223960e2 feat: 移动端筛选区块二期:支持更多类型 (#702)
Reviewed-on: daoyoucloud/tachycode#702
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-12 22:03:56 +08:00
bb204b8f95 chore(version): release @hera 2024-04-12 17:54:18 +08:00
wjh
122d5ab9ac fix:修改结算单导出Excel名称 (#697) fix #696
<!-- 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#697
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-12 17:49:57 +08:00
wjh
da8b4d0b45 fix: 修改筛选页面自定义筛选不能用 (#698) fix #699
Reviewed-on: daoyoucloud/tachycode#698
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-12 17:49:11 +08:00
7531ed6f74 feat: 运输单pdf付款方公司项目显示顺序调整 feat #694 (#695)
Reviewed-on: daoyoucloud/tachycode#695
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-12 16:38:14 +08:00
47671bb428 chore(version): release @hera 2024-04-12 15:11:31 +08:00
7e87eca642 chore(version): release @hera 2024-04-12 15:09:52 +08:00
3c1b198920 chore(version): release @hera 2024-04-12 15:08:25 +08:00
65693d0359 feat: 支持轮播图设置和跳转
Reviewed-on: daoyoucloud/tachycode#691
2024-04-12 15:04:09 +08:00
dbdb1135bc feat: 费用范围没有考虑直发单,先简单处理掉 feat #687 (#688)
Reviewed-on: daoyoucloud/tachycode#688
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-04-12 13:44:17 +08:00
bai.jingfeng
946b77e9df 配置插件名称: 移动端:定制化,工作流:审批中心 (#678)
Reviewed-on: daoyoucloud/tachycode#678
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-11 11:50:42 +08:00
wjh
f0a0505695 fix: 修复组件移动别的区块后出错 修复单选框点击出错 (#680)
Reviewed-on: daoyoucloud/tachycode#680
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-11 11:50:00 +08:00
b253ffafb6 chore(version): release v0.21.6 2024-04-11 00:06:27 +08:00
d2ba989f56 chore(version): release v0.21.5 2024-04-10 22:20:34 +08:00
wjh
35cddcc80c fix: 调整mobile类型选择组件 (#670)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-10 17:19:31 +08:00
35310f7532 fix: mobile icon build error 2024-04-10 17:08:40 +08:00
6351c1c44f chore(version): release v0.21.4
Reviewed-on: daoyoucloud/tachycode#668
2024-04-10 16:14:26 +08:00
438169cd71 feat: 初步支持审批流程
Reviewed-on: daoyoucloud/tachycode#664
2024-04-10 16:00:42 +08:00
8a2548f480 feat: 移动端支持筛选
Reviewed-on: daoyoucloud/tachycode#638
2024-04-10 15:54:01 +08:00
bai.jingfeng
a5010cd74c feat: 显示界面支持货币取反 (#666)
Reviewed-on: daoyoucloud/tachycode#666
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-04-10 15:32:19 +08:00
33a0b34c07 chore(version): release v0.21.3 2024-04-10 01:28:26 +08:00
311e74e3f7 chore(version): release new version 2024-04-10 01:26:07 +08:00
fe69e14aa6 chore(version): release 0.21.2-alpha.13 2024-04-10 01:07:15 +08:00
464a963316 chore(version): release 0.21.2-alpha.12 2024-04-10 00:37:35 +08:00
wjh
d9e851d1ca fix: 合同结算单打印预览单价计算、费用赔偿计算相关,出入库内容字段报错
Reviewed-on: daoyoucloud/tachycode#663
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-09 22:14:28 +08:00
96d06b5919 chore(version): plugin-rental 2024-04-08 22:13:05 +08:00
wjh
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
wjh
39b3707deb fix: 修改结算单产品计算逻辑 (#619)
Reviewed-on: daoyoucloud/tachycode#619
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-07 20:12:58 +08:00
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
wjh
90b1beae5e fix: 修改结算单计算逻辑 (#612)
Reviewed-on: daoyoucloud/tachycode#612
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-07 16:28:10 +08:00
9331bf3c6d Merge pull request 'fix: 修改汇总区块不格式化文本类型' (#605) from fix-group into dev
Reviewed-on: daoyoucloud/tachycode#605
2024-04-07 13:28:35 +08:00
wjh
58c9dc0dba fix: 修复更新antd后的导航图标样式异常 2024-04-07 11:42:25 +08:00
wjh
a4ab6ff994 fix: 修改汇总区块不格式化文本类型 2024-04-07 10:34:32 +08:00
5db6f51e70 chore: upgrade version 2024-04-06 03:36:20 +08:00
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
wjh
bc9ac59ac2 fix: 将过滤按钮的过滤条件放到三级 (#550)
Reviewed-on: daoyoucloud/tachycode#550
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-04-01 11:48:22 +08:00
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
wjh
48b045c4f9 fix: 修改下拉框组件字段默认值 (#539)
Reviewed-on: daoyoucloud/tachycode#539
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:56 +08:00
wjh
1675b39d0e feat: 汇总区块添加表格样式及配置项排序 (#536)
Reviewed-on: daoyoucloud/tachycode#536
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-30 02:22:44 +08:00
Junyi
6d0d21ede2
refactor(plugin-workflow): change to (#3871) 2024-03-29 23:36:49 +08:00
katherinehhh
4adc116386
fix: kanban card modal display abnormal (#3863) 2024-03-29 22:46:06 +08:00
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
wjh
75b3148521 fix: 结算单报错 (#515)
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#515
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:49:36 +08:00
wjh
08adf2fe40 fix: 图表添加级联选择 (#522)
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

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

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

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

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

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

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

Reviewed-on: daoyoucloud/tachycode#522
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:47:41 +08:00
katherinehhh
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
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
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
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
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
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
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
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
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
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
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
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