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
c056eac106
Merge pull request 'fix: 通过区块的类型配置动作' ( #390 ) from fix_filterData into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#390
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 18:01:04 +08:00
3920cb20c3
fix: 通过区块的类型配置动作
2024-03-15 17:53:13 +08:00
d8590a6a95
fix: subtable copy error
2024-03-15 17:34:32 +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
4f73e0a6e4
Merge pull request 'merge_from_upstream' ( #386 ) from merge_from_upstream into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#386
2024-03-15 16:04:47 +08:00
1f5c9fbdf5
Merge remote-tracking branch 'origin/main' into merge_from_upstream
2024-03-15 16:04:04 +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
6c76548c40
Merge pull request 'fix: 合同小结计算实际重量，订单保存避免合同数据不全引发报错' ( #384 ) from fix_summary_component into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#384
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 16:00:07 +08:00
Zeke Zhang
dbc3a96eba
chore: add .yarnrc
2024-03-15 15:49:12 +08:00
jack zhang
04ee7b84ec
feat: add data source filter ( #3724 )
2024-03-15 15:38:33 +08:00
lyx
ecd4d560b2
fix: 合同小结计算理论重量，订单保存避免合同数据不全引发报错
2024-03-15 15:38:13 +08:00
Zeke Zhang
e877e3b5d9
chore: update registry in yarn.lock
2024-03-15 15:30:47 +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
Zeke Zhang
b0705843e5
fix(Table): fix disappearing content after selecting a row ( #3726 )
2024-03-15 14:14:41 +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
bc43e8c780
Merge pull request 'fix_record_direct_problem' ( #380 ) from fix_record_direct_problem into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#380
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-15 12:32:39 +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
Chareice
8be6f9078f
chore: enum type map
2024-03-15 11:37:54 +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
26b1aeacd8
Merge pull request 'merge_from_upstream' ( #378 ) from merge_from_upstream into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#378
2024-03-14 22:24:45 +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
katherinehhh
032352985b
refactor: view collection set name as default title when title is missing ( #3719 )
2024-03-14 21:51:48 +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
df889eb647
Merge pull request 'fix_waybills_recofdpdf_recordsummary' ( #372 ) from fix_waybills_recofdpdf_recordsummary into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#372
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-14 17:02:31 +08:00
