Commit Graph

4403 Commits

Author SHA1 Message Date
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
9c03c9b1f6 Merge pull request 'feat: recodpdf kg不换算吨' (#360) from fix_recordfdf into @hera/dev
Reviewed-on: daoyoucloud/tachycode#360
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 14:43:15 +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
ed1a46283e Merge pull request 'fix: 订单pdf单位数据错误' (#359) from fix_recordfdf into @hera/dev
Reviewed-on: daoyoucloud/tachycode#359
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 14:00:49 +08:00
lyx
bd5bcadd3a fix: 订单pdf单位数据错误 2024-03-13 13:58:37 +08:00
4bd5a1beda Merge pull request 'merge_from_upstream' (#358) from merge_from_upstream into @hera/dev
Reviewed-on: daoyoucloud/tachycode#358
2024-03-13 12:17:53 +08:00
a7049de998 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-13 12:17:01 +08:00
9ee80846fb Merge pull request 'fix: 修改级联组件适配' (#355) from fix_cascade into @hera/dev
Reviewed-on: daoyoucloud/tachycode#355
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 12:12:22 +08:00
wjh
7df5c093b0 fix: 修改级联组件适配 2024-03-13 12:07:50 +08:00
katherinehhh
c7cfeec6a1
feat: add uuid & nanoid & unitTimestamp interface (#3684)
* refactor: select & radio compoent supports multiple type of value

* fix: ridio test

* feat: uuid & nanoid & snowflake interface

* refactor: delete snowflake

* feat: nanoid field type (#3685)

* refactor: add child in inheritance of tree collection (#3676)

* refactor: add child in inheritance of tree collection

* refactor: add child in inheritance of tree collection

* style: style improve

* feat: nanoid field

* chore: nanoid field type map

---------

Co-authored-by: katherinehhh <shunai.tang@hand-china.com>

* chore: nanoid options

* refactor: unixTimestamp

* fix: test

* refactor: unixTimestamp

* refactor: unixTimestamp

* refactor: locale imrove

* refactor: local improve

* refactor: nanoIDInput

* refactor: nanoIDInput

* refactor: nanoIDInput

* refactor: unixTimestamp

* refactor: nanoIDInput

* fix: test

---------

Co-authored-by: ChengLei Shao <chareice@live.com>
2024-03-13 12:07:45 +08:00
wjh
dcf3cf63e3 fix: 修改级联组件适配 2024-03-13 12:04:46 +08:00
Junyi
4015cf1c0d
fix(plugin-workflow): fix duplicated triggering schedule event (#3692) 2024-03-13 11:42:00 +08:00
Junyi
f68b2fb04a
refactor(client): add component to support data source select (#3691) 2024-03-13 10:23:08 +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
2f57f697b5 Revert "Revert "fix: linkage should set undefined""
This reverts commit cf77654834.
2024-03-12 23:15:59 +08:00
cf77654834 Revert "fix: linkage should set undefined"
This reverts commit c0de2384df.
2024-03-12 23:11:04 +08:00
chenos
24b52c98d1 fix: add external deps 2024-03-12 22:30:13 +08:00
95452630b3 chore(version): upgrade rental 2024-03-12 21:59:56 +08:00
2c1aec83d6 Merge pull request 'fix: 小结理论重量更正,报价总金额工单修改,购销单pdf工单修改,订单导入hook停用,出库入筛选基地仓库' (#353) from fix_amount_calc_and_buypdf into @hera/dev
Reviewed-on: daoyoucloud/tachycode#353
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 21:37:35 +08:00
lyx
2245cd84e7 fix: 小结理论重量更正,报价总金额工单修改,购销单pdf工单修改,订单导入hook停用,出库入筛选基地仓库 2024-03-12 21:33:51 +08:00
katherinehhh
b4058ecb1b
fix: incorrect pagination query parameters when batch deleting last page (#3670) 2024-03-12 21:29:47 +08:00
1f6b802b61 chore(version): upgrade core & rental 2024-03-12 21:21:29 +08:00
chenos
a8e37f6224 chore: update changelog 2024-03-12 21:15:55 +08:00
chenos
2e7da6e29b chore(versions): 😊 publish v0.20.0-alpha.9 2024-03-12 21:15:51 +08:00
wjh
e03e68232e fix: 修改级联组件适配 2024-03-12 20:40:58 +08:00
fbfde9f41e Merge pull request 'fix: linkage should set undefined' (#351) from fix_linkage into @hera/dev
Reviewed-on: daoyoucloud/tachycode#351
2024-03-12 20:14:20 +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
c0de2384df fix: linkage should set undefined 2024-03-12 20:09:35 +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
katherinehhh
559cbca396
refactor: add child in inheritance of tree collection (#3676)
* refactor: add child in inheritance of tree collection

* refactor: add child in inheritance of tree collection

* style: style improve
2024-03-12 17:27:35 +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
wjh
847a1fae9a feat: 修改录单跳转问题 2024-03-12 16:08:27 +08:00
0e8d02cc1e Merge pull request 'feat: 添加汇总的提供请求链接地址' (#347) from fix_groupBlock4 into @hera/dev
Reviewed-on: daoyoucloud/tachycode#347
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 16:02:49 +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
ChengLei Shao
37b97c6e52
chore: escape underscore char in include query (#3681) 2024-03-12 14:53:12 +08:00
wjh
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
katherinehhh
4a346a4119
fix: view collection association field foreignkey should be select (#3671) 2024-03-12 09:30:38 +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
ChengLei Shao
3da2a8af92
fix: init scope value when all data is null value (#3674) 2024-03-11 19:37:48 +08:00