Commit Graph

4465 Commits

Author SHA1 Message Date
Chareice
e7e37b3634
chore(backup-restore): using ctime for Windows compatibility 2024-03-08 20:38:01 +08:00
e2dbb30e9f Merge pull request 'fix: record summary' (#334) from fix_record_summary into @hera/dev
Reviewed-on: daoyoucloud/tachycode#334
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 20:02:06 +08:00
2f442f1f83 fix: record summary 2024-03-08 19:59:33 +08:00
2931eaf68b chore(version): upgrade rental 2024-03-08 18:06:33 +08:00
1f8172e572 Merge pull request 'fix: record import' (#332) from fix_record_import_fee_category into @hera/dev
Reviewed-on: daoyoucloud/tachycode#332
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 18:06:06 +08:00
928afba633 fix: record import 2024-03-08 18:02:18 +08:00
Junyi
0bb0396754
fix(plugin-workflow): fix migration (#3654) 2024-03-08 17:29:35 +08:00
7378e30939 chore(version): upgrade rental 2024-03-08 16:43:03 +08:00
03b3e997f3 Merge pull request 'fix: record import wrong type' (#331) from fix_record_import_type_scripts into @hera/dev
Reviewed-on: daoyoucloud/tachycode#331
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 16:42:45 +08:00
ad98ad63f1 fix: record import wrong type 2024-03-08 16:40:51 +08:00
40a30b12d8 chore(version): upgrade rental 2024-03-08 16:10:39 +08:00
chenos
02dcb752cb chore: update changelog 2024-03-08 14:11:38 +08:00
chenos
63d1a8d90c chore(versions): 😊 publish v0.20.0-alpha.7 2024-03-08 14:11:35 +08:00
f92d60ad8f Merge pull request 'fix: record pdf data mistake' (#330) from fix_record_pdf_print into @hera/dev
Reviewed-on: daoyoucloud/tachycode#330
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 13:49:03 +08:00
253dc29c31 fix: record pdf data mistake 2024-03-08 13:47:01 +08:00
YANG QIA
8dbae24489
chore(ci): change branch of pro image 2024-03-08 13:38:41 +08:00
b135025d50 chore(version): upgrade rental 2024-03-08 12:17:06 +08:00
9a8987895c fix: 修复明细没有过滤筛选条件的问题 close #327 2024-03-08 12:16:13 +08:00
katherinehhh
db045c61d2
fix: view collection interface missing (#3658) 2024-03-08 12:00:59 +08:00
33ed1e07b9 Merge pull request 'fix_record_import_typebuying_price_item' (#326) from fix_record_import_typebuying_price_item into @hera/dev
Reviewed-on: daoyoucloud/tachycode#326
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 11:47:44 +08:00
c7b45440a0 feat: fix#325 2024-03-08 11:45:18 +08:00
105c657f01 chore(version): upgrade rental 2024-03-08 11:33:06 +08:00
jack zhang
2fc13c180c
fix: getCollection bug (#3656) 2024-03-08 11:18:32 +08:00
44e550a0eb feat: fix 购销单导入定价产品确定到规格 2024-03-08 11:16:14 +08:00
1527b0ab7c Merge pull request 'feat: fix 订单pdf费用sql去掉别名alias' (#321) from fix_pdf_record_fee_sql_alias into @hera/dev
Reviewed-on: daoyoucloud/tachycode#321
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-08 10:36:00 +08:00
d9c8f10688 feat: fix 订单pdf费用sql去掉别名alias 2024-03-08 10:33:46 +08:00
chenos
12ba7cd9d0 chore: update changelog 2024-03-08 10:23:29 +08:00
chenos
8b4821e2df chore(versions): 😊 publish v0.20.0-alpha.6 2024-03-08 10:23:26 +08:00
Zeke Zhang
108875600c chore: update yarn.lock 2024-03-08 10:12:24 +08:00
ChengLei Shao
cacaafd05b
fix: parse association field in acl (#3655) 2024-03-08 09:21:27 +08:00
e14bbac59f fix: update yarn.lock 2024-03-07 22:27:38 +08:00
58e2fd6ea6 Revert "fix: add displayName (#3628)"
This reverts commit 454d1d34ed.
2024-03-07 22:21:16 +08:00
804e253203 style: valuation item adapt to single line 2024-03-07 21:21:17 +08:00
37fa7feac0 chore: migrate to new hera 2024-03-07 20:55:41 +08:00
aab43d17d0 合并对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. -->

# 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: wjh <wwwjh0710@163.com>
Co-authored-by: 吕延祥 <2256334253@qq.com>
Reviewed-on: daoyoucloud/nocobase#317
2024-03-07 20:45:00 +08:00
YANG QIA
0ddc3d3f5f
chore: update menu name of plugin-localization (#3653) 2024-03-07 20:08:33 +08:00
YANG QIA
f9eb2699f2
chore(pm): set plugin-sms-auth as local plugin, close T-3323 (#3652) 2024-03-07 19:59:51 +08:00
katherinehhh
16581a547c
fix(cascadeSelect): cassadeSelect does not dislay data in edit form (#3649) 2024-03-07 19:22:34 +08:00
YANG QIA
263ee28c72
fix(db): through scope in eager loading & fix(acl): filter reset issue (#3636)
* fix(database): through scope in eager loading

* chore: update

* fix: role users filter

* chore: update
2024-03-07 13:38:17 +08:00
katherinehhh
30b4ed77a1
fix: dateTime format configured in table is invalid (#3630)
* fix: datetime format configured in the table is invalid

* test: date display format

* refactor: default timeformat

* test: datetime display format
2024-03-07 10:48:49 +08:00
katherinehhh
4bbce06d5e
fix: data source permission role update (#3643) 2024-03-07 10:16:48 +08:00
Zeke Zhang
d427dc6ea1 fix: avoid crashing 2024-03-07 08:39:07 +08:00
chenos
0f1115b058 fix(create-action): invalid save mode 2024-03-06 23:05:16 +08:00
chenos
2e3dd1250c fix(acl): create action aliases 2024-03-06 22:56:43 +08:00
chenos
ed224cfa13 fix(file-manager): update target 2024-03-06 22:39:39 +08:00
katherinehhh
d82ed8058c
style: flexWrap in actionBar (#3635) 2024-03-06 21:32:32 +08:00
Chareice
1c0654001f
chore: data source list enabled api 2024-03-06 18:48:30 +08:00
jack zhang
454d1d34ed
fix: add displayName (#3628)
* fix: context add displayName

* fix: observer add displayName

* fix: memo component add displayName

* fix: forwordRef component add displayName
2024-03-06 18:22:31 +08:00
chenos
bccde967cc fix: app version 2024-03-06 18:10:24 +08:00
Zeke Zhang
0ae81f0c2a
fix(customRequestAction): should not support setting icons and colours (#3632)
* test: add e2e

* fix(customRequest): should not support setting icons and colours
2024-03-06 17:13:06 +08:00