Commit Graph

4781 Commits

Author SHA1 Message Date
dc7c6a5052 Revert "refactor: linkage rule fireImmediately (#3847)"
This reverts commit 0191070547.
2024-03-29 18:50:42 +08:00
92f31ef92a Revert "fix: template block linkage and association data load failed"
This reverts commit 44c6d89e54.
2024-03-29 18:48:45 +08:00
a2f2f9435f fix: util path 2024-03-29 17:58:56 +08:00
fd656387ea Merge remote-tracking branch 'upstream/main' into @hera/dev 2024-03-29 17:51:25 +08:00
5d6a6e6450 feat: add websocket block 2024-03-29 17:09:07 +08:00
1eda5609b7 feat: add inventory order 2024-03-29 16:31:39 +08:00
6d85d2f826 chore(versions): publish @hera/plugin-rental v1.7.2 2024-03-29 16:31:23 +08:00
9ffe32d599 Merge pull request 'feat: 增值税计算,sql,添加状态筛选的功能' (#540) from feat_value_added_tax_v2 into @hera/dev
Reviewed-on: daoyoucloud/tachycode#540
2024-03-29 16:22:06 +08:00
bai.jingfeng
c2604631a8 feat: 增值税计算,sql,添加状态筛选的功能 2024-03-29 16:05:42 +08:00
jack zhang
005b5a313d
fix: association parent request (#3865)
* fix: association parent request

* fix: bug
2024-03-29 15:59:41 +08:00
Zeke Zhang
d0746b1155
test: add unit test for parseHTML (#3870) 2024-03-29 14:52:20 +08:00
YANG QIA
868a487b2d
fix(data-vi): bug when filtering chart with assocations (#3867)
* fix(data-vi): bug when filtering chart with assocations

* fix: remote select
2024-03-29 14:13:59 +08:00
chenos
11536cb0e0 fix(client): the reference template was deleted by mistake 2024-03-29 12:14:10 +08:00
38fdd9c332 fix_invoices_view (#533)
Reviewed-on: daoyoucloud/tachycode#533
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
2024-03-29 11:37:57 +08:00
f9cd41217d Merge pull request 'feat: sql,增值税计算,添加注释以及开启开头注释掉的有用代码' (#531) from feat_value_added_tax_v2 into @hera/dev
Reviewed-on: daoyoucloud/tachycode#531
2024-03-29 10:40:28 +08:00
bai.jingfeng
ce2282e673 feat: sql,增值税计算,添加注释以及开启开头注释掉的有用代码 2024-03-29 10:38:47 +08:00
chenos
672d1d9a45 fix: using jest-dom instead of vitest-dom 2024-03-29 09:24:40 +08:00
jack zhang
a38e34cf9a
fix: table settings get collectionField (#3837)
* fix: table settings get collectionField

* fix: remove duplicate useCollectionField

* fix: bug

* refactor: tagComponentFieldSettings

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-29 09:12:52 +08:00
Junyi
1f59d4bed2
refactor(plugin-workflow): add transaction check from data source (#3857) 2024-03-29 09:09:12 +08:00
Zeke Zhang
29af40f504 style(Help): optimize style 2024-03-29 08:40:16 +08:00
YANG QIA
72c95671ae
fix(data-vi): charts size bug when changing chart type (#3859)
* fix(data-vi): charts size bug when changing chart type

* chore: remove console.log
2024-03-29 08:31:47 +08:00
chenos
0ec3ed3c54
fix(server): commands failed to load properly on Windows (#3858) 2024-03-29 06:46:37 +08:00
74a0d754f5 chore(versions): publish @hera/plugin-rental v1.7.1 2024-03-29 02:17:05 +08:00
bai.jingfeng
d735513479 feat: 增值税计算,sql构建完成 (#527)
Reviewed-on: daoyoucloud/tachycode#527
Co-authored-by: bai.jingfeng <bai.jingfeng@foxmail.com>
Co-committed-by: bai.jingfeng <bai.jingfeng@foxmail.com>
2024-03-29 02:15:05 +08:00
86fee92f72 fix: build error 2024-03-29 01:47:57 +08:00
09aae19848 chore(version): upgrade plugin-core & plugin-rental 2024-03-29 01:40:15 +08:00
Zeke Zhang
08162e1004
fix(LinkageRules): should work properly after the block is saved as a template (#3855)
* test: add e2e

* chore: optimize e2e

* fix: use context in Form
2024-03-28 22:03:22 +08:00
katherinehhh
44e7f48f99
test: main data source e2e test (#3816)
* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: main data source e2e test

* test: test

* test: test

* refactor: code improve

* test: test
2024-03-28 21:04:53 +08:00
fb1af9a34a Merge pull request 'fix: 修改小结组件不显示赔偿' (#509) from fix_recordSummary into @hera/dev
Reviewed-on: daoyoucloud/tachycode#509
2024-03-28 17:10:39 +08:00
jack zhang
467699cdf9
fix: delete field style improve (#3820) 2024-03-28 16:54:31 +08:00
YANG QIA
7b9acb73c4
chore: remove add-attach option from bulk update action (#3854) 2024-03-28 16:52:37 +08:00
katherinehhh
9a66301ec7
refactor: default role & default field storage (#3844)
* refactor: default role & default field storage

* refactor: verification

* refactor: verification
2024-03-28 16:47:43 +08:00
wjh
75b3148521 fix: 结算单报错 (#515)
<!-- 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#515
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:49:36 +08:00
wjh
08adf2fe40 fix: 图表添加级联选择 (#522)
<!-- 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#522
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-28 14:47:41 +08:00
katherinehhh
0191070547
refactor: linkage rule fireImmediately (#3847) 2024-03-28 14:46:55 +08:00
katherinehhh
e88082232d
fix: reporting error when clicking on the print button for the detail block (#3845) 2024-03-28 14:42:56 +08:00
chenos
8a215e2fbe fix(acl): available actions 2024-03-28 14:28:15 +08:00
YANG QIA
8ca94329ce
fix(data-vi): canvas height keeps increasing when filtering/reseting (#3849) 2024-03-28 12:56:25 +08:00
jack zhang
1dfd97cad5
create nocobase app unit test (#3833)
* fix: unit test package bug

* fix: client esm

* fix: nocobase test e2e esm format (T-2824)
2024-03-28 11:08:08 +08:00
chenos
f2d4188ccf feat: update docker config 2024-03-28 10:44:55 +08:00
Zeke Zhang
2468caeeb9
refactor(DataBlock): details block (#3776)
* refactor: remove useless code related 'TableField'

* refactor: add details block UI schema and hooks

* refactor: update details block schema and create new hook for details block without paging props

* refactor: add useDetailsBlockWithoutPagingDecoratorProps and useDetailsBlockWithPagingDecoratorProps

* test: add unit tests

* chore: fix build

* chore: fix import path for withDynamicSchemaProps

* fix: fix import typo in createDetailsBlockWithoutPagingUISchema test

* chore: fix unit test

* refactor: should not get collection on getting association in UISchema

* chore: fix unit test

* refactor: use x-use-component-props instead of useProps

* chore: fix Pagination

* chore: skip weird tests

* chore: remove weird test

* refactor: update details block initializers and associated schemas

* refactor: rename to useDetailsWithPaginationProps

* refactor: rename to useDetailsWithPaginationDecoratorProps

* refactor: rename to createDetailsWithPaginationUISchema

* chore: fix unit test

* refactor: rename to createDetailsUISchema

* refactor: rename to useDetailsDecoratorProps

* refactor: rename to useDetailsProps

* refactor: rename to 'blockSettings:details'

* chore: fix e2e
2024-03-28 08:48:58 +08:00
eb0ba1c96b fix: yarn.lock 2024-03-27 21:37:25 +08:00
jack zhang
7566a7b357
fix: client internal method (T-3711 and T-3712 and T-3713) (#3839)
* fix: client internal method (T-3711 and T-3712 and T-3712)

* fix: bug
2024-03-27 21:03:51 +08:00
Zeke Zhang
d932546194
refactor(DataBlock): grid card block (#3781)
* refactor: migrate createGridCardBlockSchema to modules

* refactor: add grid-card block hooks and decorator props

* refactor: should not get collection on getting association in UISchema

* refactor: use x-use-component-props instead of useProps

* chore: fix build
2024-03-27 20:56:30 +08:00
Zeke Zhang
d6f38495a7
refactor(DataBlock): filter form (#3785)
* refactor: migrate to modules

* refactor: add useFilterFormBlockProps

* refactor: add useFilterFormBlockDecoratorProps hook

* chore: avoid error

* refactor: use x-use-component-props instead of useProps

* chore: fix unit test

* chore: fix build
2024-03-27 20:52:29 +08:00
chenos
06980fd87d
fix: improve app manager (#3841) 2024-03-27 20:15:13 +08:00
4a25d973c0 fix: setting block filter order error 2024-03-27 20:07:17 +08:00
b563f3727b fix: chart field default value set error 2024-03-27 20:00:07 +08:00
d48ef598f6 Merge pull request 'fix_new_version' (#518) from fix_new_version into @hera/dev
Reviewed-on: daoyoucloud/tachycode#518
2024-03-27 19:27:58 +08:00
86ffb8f4a9 Merge remote-tracking branch 'upstream/main' into fix_new_version 2024-03-27 19:27:21 +08:00