Commit Graph

3962 Commits

Author SHA1 Message Date
lyx
4bd98be813 Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into feat_record_check_vehicles 2024-03-19 13:25:52 +08:00
lyx
d8a24dce40 feat: 订单车牌号校验 2024-03-19 13:20:51 +08:00
1d8a97bdc0 Merge pull request 'fix: add schema item max stack exceeded' (#422) from fix_max_stack into @hera/dev
Reviewed-on: daoyoucloud/tachycode#422
2024-03-19 13:11:39 +08:00
a44c582b1d fix: add schema item max stack exceeded 2024-03-19 13:09:14 +08:00
8a0fb826f6 Merge pull request 'merge_from_upstream3' (#421) from merge_from_upstream3 into @hera/dev
Reviewed-on: daoyoucloud/tachycode#421
2024-03-19 12:29:49 +08:00
96f90c7024 Merge remote-tracking branch 'origin/main' into merge_from_upstream3 2024-03-19 12:29:09 +08:00
f82dc6a052 refactor: change powered-by 2024-03-19 12:28:27 +08:00
wjh
60a37c58c4 fix: 修改订单查询显示的理论重量逻辑 (#420)
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 12:02:10 +08:00
d3c3322fd4 refactor: clean plugin-core index 2024-03-19 12:01:14 +08:00
wjh
f4be99e802 feat: 添加自定义组件可以修改数据来源和组件,修复筛选框清空和重置后的查询问题 (#418)
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->

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

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

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

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

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

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

Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#418
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-19 11:52:33 +08:00
Chareice
02742c3c76
chore: plugin command error wrap raw error object 2024-03-19 11:01:41 +08:00
ChengLei Shao
6665aca695
fix: app stopped status (#3723) 2024-03-19 09:24:01 +08:00
Zeke Zhang
368036923f
fix: fix the disappearing collections when searching (#3750) 2024-03-19 09:00:01 +08:00
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
katherinehhh
23c6e146e2
fix: configure openSize for table action is only immediately valid for one row (#3752)
* fix: opensize for table action is only immediately  valid for that row

* fix: opensize for table action is only immediately  valid for that row
2024-03-18 19:55:03 +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
chenos
2b1c32b34c fix(data-source-manager): resource prefix 2024-03-18 18:28:35 +08:00
katherinehhh
2236ac5be2
refactor: url field support text type as availableTypes (#3751) 2024-03-18 17:58:32 +08:00
Chareice
1660a62399
chore: using text type as url field 2024-03-18 16:00:53 +08:00
chenos
220eafbda5 fix(client): plugin aliases 2024-03-18 15:55:10 +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
ChengLei Shao
a81fa5b8e0
chore: system logger with error stack (#3747) 2024-03-18 14:32:37 +08:00
wjh
5b4fbea13f fix: 修改自动补全筛选失效问题 2024-03-18 14:13:58 +08:00
Zeke Zhang
aa1823cd73
chore: adapt to plugin-custom-brand (#3740)
* chore: adapt to plugin-custom-brand

* chore: add parseHTML

* chore: adapt to plugin-custom-brand
2024-03-18 13:22:18 +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
3b619682ee fix(field-interface): nested filterable 2024-03-18 09:56:28 +08:00
chenos
db9ff337e5 chore(versions): 😊 publish v0.20.0-alpha.13 2024-03-17 23:34:26 +08:00
chenos
729a8dce81 fix: env variables have been modified 2024-03-17 23:33:22 +08:00
dbd5622f27 feat: support tachycode issue feedback 2024-03-17 23:30:55 +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
7e32842a6d
fix: collections undefined inuseCollectionState (#3741) 2024-03-17 22:16:11 +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
katherinehhh
483f45765d
refactor: colDivider style improve for draging overing (#3709)
* refactor: colDivider style improve for draging overing

* refactor: stle improve

* style: grid.Col style improve
2024-03-17 16:35:59 +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
katherinehhh
4cf560b177
fix(acl): invalid action permission judgment (#3735)
* fix: x-acl-action is missing in action schema

* fix: useACLRoleContext

* fix: useACLRoleContext

* fix: useACLRoleContext
2024-03-17 09:26:35 +08:00
Chareice
820352f280
fix: console command 2024-03-17 09:20:14 +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
c191f149f9 fix: yarn dev error 2024-03-16 22:44: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
Zeke Zhang
126f60c959
fix(variables): fix varaibles for table selector (#3725)
* fix(variables): fix varaibles for table selector

* test: add e2e

* chore: fix build

* fix: should not display current record in create form

* fix: fix known bugs

* test: fix e2e
2024-03-15 22:56:35 +08:00
Chareice
1cdbe0de96
chore: upgrade dotenv version 2024-03-15 21:48:43 +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
wjh
7f856cffb0 fix: 修改自动补全筛选失效问题 2024-03-15 20:15:46 +08:00
Thiago Rodrigues
8801ba625f
fixing timezone header when it is negative value (#3732) 2024-03-15 19:40:27 +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
wjh
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
wjh
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
wjh
65a4281ad5 fix: 修改过滤自定义数据范围变量 2024-03-15 17:13:50 +08:00
wjh
a6bd972beb fix: 修改自定义筛选框数据范围问题 2024-03-15 16:37:14 +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
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
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
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