Commit Graph

4483 Commits

Author SHA1 Message Date
c56ce13a0d chore(version): upgrade rental 2024-03-10 04:36:36 +08:00
44c6d89e54 fix: template block linkage and association data load failed 2024-03-10 04:20:59 +08:00
afc79d633f Merge branch '@hera/main' into @hera/dev 2024-03-10 04:13:18 +08:00
2d991ba7cf 合并对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. -->

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

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

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

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

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

<!-- 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-10 04:06:04 +08:00
350c0ac1f4 Revert "Revert "fix: add displayName (#3628)""
This reverts commit 58e2fd6ea6.
2024-03-10 03:06:57 +08:00
Zeke Zhang
9e88972ba6
fix(Form): retain field's default value after submitting the form (#3665)
* fix(Form): should not be clear default value after submit

* test: make e2e more stable
2024-03-09 18:59:56 +08:00
ChengLei Shao
ca0f1b5c05
chore: test (#3664) 2024-03-09 17:45:19 +08:00
Zeke Zhang
eae5a87ebd chore: update yarn.lock 2024-03-09 15:22:43 +08:00
YANG QIA
dd5b026ee9
fix(auth): cas service validate issue (#3661) 2024-03-09 11:13:09 +08:00
ChengLei Shao
46daba1e6e
fix: infer postgres field (#3663) 2024-03-09 10:08:32 +08:00
fbe0c14920 perf: optimize record summary 2024-03-09 02:56:27 +08:00
71c84a00de chore(version): upgrade rental 2024-03-09 00:09:10 +08:00
47a5a504fe perf: optimize custom components and scope 2024-03-09 00:08:19 +08:00
dbcd884526 perf: optimize valuation item 2024-03-08 23:29:42 +08:00
366312418a chore(version): upgrade rental 2024-03-08 21:06:35 +08:00
Junyi
677eb152e0
fix(plugin-workflow-action-trigger): fix appends loading (#3659)
* fix(plugin-workflow-action-trigger): fix appends loading

* fix(plugin-workflow-action-trigger): fix test case
2024-03-08 21:06:10 +08:00
a7bd0695ce perf: optimize count and weight item 2024-03-08 21:05:56 +08:00
Chareice
4b1a33912e
fix: using root user in mysql app 2024-03-08 20:51:51 +08:00
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