Commit Graph

4006 Commits

Author SHA1 Message Date
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
Chareice
8be6f9078f
chore: enum type map 2024-03-15 11:37:54 +08:00
77901e4f3e chore(version): upgrade core & rental 2024-03-14 22:31:36 +08:00
wjh
96d35bb829 feat: 添加自定义文本筛选 (#373)
<!-- 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#373
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
2024-03-14 22:25:22 +08:00
abec9982fb Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-14 22:19:15 +08:00
ab66403507 fix: ant design icon error in mobile 2024-03-14 22:14:11 +08:00
cc09966d63 feat: support add collection to collectionManager 2024-03-14 22:14:11 +08:00
8ccfdf5828 chore(version): upgrade rental 2024-03-14 22:14:11 +08:00
katherinehhh
032352985b
refactor: view collection set name as default title when title is missing (#3719) 2024-03-14 21:51:48 +08:00
wjh
6e77717946 fix: 修改汇总区块NaN 2024-03-14 19:32:01 +08:00
Zeke Zhang
286af35ff8
refactor: add blocks in a unified way (#3668)
* refactor: rename filterMenuItemChildren to filterCollections

* refactor: revert parameters to destructured object

* refactor(Details): unify details block between page and popup

* refactor(Form): refactor(Details): unify form block between page and popup

* refactor: table & list & grid card

* refactor: form

* refactor: association details

* chore: useVisible

* refactor: calendar

* chore: remove relationshipBlocks

* refactor: unify Details schema

* fix: avoid error

* chore: add translate

* chore: add tag to association fields

* fix: add block useChildren and children merge

* test: fix e2e

* test: fix e2e

* fix: fix Calendar

* fix: fix search

* test: add e2e for search

* fix: fix T-3554

* fix: fix T-3551

* feat: add no data for details block

* chore: fix unit test

* chore: fix unit test

* chore: change text

* chore: optimize text

* chore: add translation

* style: fix memu item style

* refactor: rename

* test: fix e2e

* test: fix e2e

---------

Co-authored-by: dream2023 <1098626505@qq.com>
2024-03-14 19:20:02 +08:00
Zeke Zhang
ba1e44c527
feat: support to set data loading mode (#3712)
* feat: add setDataLoadingModeSettingItem

* feat: support to set data loading mode

* chore: add translation

* chore: refresh the block immediately after the configuration has been changed

* feat: the data loading mode should also work for the filter buttons

* feat: support old version

* fix: data scope

* fix: fix known bugs

* fix: add setting for table selector

* test: fix e2e
2024-03-14 18:10:54 +08:00
lyx
b35dbec2fd feat: schemaInitializerManager 2024-03-14 16:55:27 +08:00
lyx
e347a0d17b fix: 工单完成 fix #371 fix #370 2024-03-14 16:35:59 +08:00
lyx
fe268d5f15 fix: 订单pdf报价实际重量/小结报价实际重量/运输单上边距 2024-03-14 16:32:52 +08:00
jack zhang
99358ee796
fix: block template (#3714) 2024-03-14 14:30:02 +08:00
Zeke Zhang
51de34251a
refactor(SchemaInitializers): unify naming style (#3604)
* refactor(SchemaSettings): unify naming style

* refactor(SchemaInitializers): unify naming stle

* refactor: replace CreateFormBlockInitializers to blockInitializers:createForm

* refactor: replace to blockInitializers:customizeCreateForm

* refactor: replace block intializers name

* refactor: replace action initializers name

* refactor: replace field initializers name

* style: fix hover style for column action (T-3297)

* refactor: revert some codes

* chore: update comment

* chore: replace iframeBlockSchemaSettings to blockSettings:iframe

* chore: delete pro-packages

* feat: add CompatibleSchemaInitializer

* test: add unit tests

* chore: add @internal for CompatibleSchemaInitializer

* chore: block

* chore: field

* chore: ations

* fix: build

* chore: typo

* fix: fix unit tests

* test: fix e2e

* chore: remove igone

* refactor: page:addBlock

* refactor: popup:addNew:addBlock

* fix: fix max call stack

* refactor: popup:addRecord:addBlock

* refactor: remove blockInitializers:recordForm

* refactor: popup:tableSelector:addBlock

* refactor: popup:view:addBlock

* refactor: popup:bulkEdit:addBlock & charts:addBlock

* refactor: mobilePage:addBlock

* refactor: popup:snapshot:addBlock

* refactor: popup:workflowManual:configureUserInterface:addBlock

* fix: avoid crashing

* chore: optimize

* refactor: popup:common:addBlock

* refactor: workflowManual:popup:configureUserInterface:addBlock

* refactor: details:configureFields

* refactor: form:configureFields

* refactor: table:configureColumns

* refactor: filterForm:configureFields

* refactor: associationFilterInitializer

* refactor: assignFieldValuesForm:configureFields

* refactor: bulkEditForm:configureFields

* refactor: auditLogsTable:configureColumns

* refactor: chartFilterForm:configureFields

* refactor: kanban:configureItemFields

* refactor: workflowManual:customForm:configureFields

* refactor: detailsWithPaging:configureActions

* refactor: details:configureActions

* refactor: createForm:configureActions

* refactor: editForm:configureActions

* refactor: gridCard:configureActions

* refactor: gridCard:configureItemActions

* refactor: list:configureActions

* refactor: list:configureItemActions

* refactor: table:configureItemActions

* refactor: table:configureActions

* refactor: filterForm:configureActions

* refactor: subTable:configureActions

* refactor: bulkEditForm:configureActions

* refactor: auditLogsTable:configureItemActions

* refactor: auditLogsTable:configureActions

* refactor: calendar:configureActions

* refactor: chartFilterForm:configureActions

* refactor: gantt:configureActions

* refactor: kanban:configureActions

* refactor: map:configureActions

* refactor: workflowManual:form:configureActions

* feat: use 'createForm:configureActions' in page

* feat: use 'details:configureActions' in Calendar

* feat: register deleteEvent initializer in calendar plugin

* fix: fix delete event action

* test: fix e2e

* test: fix e2e

* chore: only run workflow's e2e

* Revert "chore: only run workflow's e2e"

This reverts commit 9e5b4af41e40e8d616007a5ab97291fb2370d88a.

* fix: use isInitializersSame to fix some case
2024-03-14 14:13:11 +08:00
lyx
1d14cd82e8 fix: 新建自动结算合同,多创建数据 2024-03-14 11:32:33 +08:00
jack zhang
ca01bdc306
fix: remove env in colletion delete button (#3682) 2024-03-14 10:35:19 +08:00
83deef45d0 Merge pull request 'feat: 订单打印上边距可调整' (#367) from feat_recordpdf_top_margin into @hera/dev
Reviewed-on: daoyoucloud/tachycode#367
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-14 10:33:29 +08:00
lyx
2125c8ddae feat: 更新数据参数规范 2024-03-14 10:32:18 +08:00
YANG QIA
69ff55ba90
fix(data-vi): update antv version (#3710) 2024-03-13 23:03:15 +08:00
chenos
40a22943b9 chore(versions): 😊 publish v0.20.0-alpha.10 2024-03-13 22:41:12 +08:00
lyx
eb476a95e2 feat: 订单打印上边距可调整 2024-03-13 21:29:43 +08:00
048b7776b0 chore(version): upgrade core & rental 2024-03-13 20:22:48 +08:00
1e9baa0f6b Merge pull request 'feat: 添加子表格复制功能' (#364) from feat_copyTable into @hera/dev
Reviewed-on: daoyoucloud/tachycode#364
2024-03-13 19:28:18 +08:00
72f62d359e feat: support copy after line 2024-03-13 19:27:47 +08:00
katherinehhh
e5c1bef8de
fix(client): size undefined in nanoid (#3708)
* fix(data-source): foreignkey

* fix: size undefined in nanoid
2024-03-13 19:00:28 +08:00
lyx
e14f99341a fix: 编辑直发单,对应生成单单号保持不变 2024-03-13 18:53:44 +08:00
wjh
d64ff60674 feat: 添加子表格复制功能 2024-03-13 17:54:24 +08:00
wjh
aa8ac55c28 feat: 添加子表格复制功能 2024-03-13 17:52:32 +08:00
katherinehhh
0779a4eab3
refactor(radio): radio support multiple field types (#3706)
* style: fieldTitleInput style improve

* refactor: radio support mutiple type

* refactor: code improve
2024-03-13 16:44:17 +08:00
ChengLei Shao
f6590d1331
fix: get async json schema (#3705)
* fix: get async json schema

* fix: test
2024-03-13 16:17:18 +08:00
5a7c78d791 chore(version): upgrade core & rental 2024-03-13 15:29:08 +08:00
7a77536fc1 Merge pull request 'fix: 修改汇总区块NaN,添加自定义组件的理论重量' (#363) from fix_group into @hera/dev
Reviewed-on: daoyoucloud/tachycode#363
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-13 15:26:32 +08:00
katherinehhh
0123a3320b
fix: select fieldnames (#3704) 2024-03-13 15:22:40 +08:00
katherinehhh
61a290117f
fix: field configuration of Kanban interacts with other block (#3689) 2024-03-13 15:21:35 +08:00
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
wjh
5ad280a8b3 fix: 修改汇总区块NaN,添加自定义组件的理论重量 2024-03-13 15:07:24 +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
lyx
bd5bcadd3a fix: 订单pdf单位数据错误 2024-03-13 13:58:37 +08:00
katherinehhh
ff1877ce01
fix: radio (#3701) 2024-03-13 12:59:20 +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
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
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
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
0eea4f4b96 Merge pull request 'feat: update standard interface name' (#342) from feat_interface_name_standard into @hera/dev
Reviewed-on: daoyoucloud/tachycode#342
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-11 19:29:38 +08:00
lyx
54d0942dae fix: eslint --fix 2024-03-11 19:25:50 +08:00
lyx
d2ad2920d1 feat: update standard interface name 2024-03-11 19:25:05 +08:00
0b6025cd65 fix: type change from any to human-made 2024-03-11 19:20:15 +08:00
cca6c649c1 chore: mock records:group api 2024-03-11 19:08:01 +08:00
649a07d581 chore: upgrade hera-core 2024-03-11 17:08:53 +08:00
jack zhang
f9567d711b
fix: inheritance cache bug (#3669) 2024-03-11 16:57:37 +08:00
katherinehhh
ba2467c9bf fix: assign field values modal shuold support maskClosable 2024-03-11 16:52:14 +08:00
Chareice
ef097bd450
fix: acl snippet value 2024-03-11 13:05:37 +08:00
e69e9b9940 fix: resource conflict with nocobase settings 2024-03-11 12:32:06 +08:00
16342247be refactor: remove koa router deps 2024-03-11 10:38:12 +08:00
3ed284f94a Merge pull request 'refactor_server' (#340) from refactor_server into @hera/dev
Reviewed-on: daoyoucloud/tachycode#340
2024-03-11 10:35:14 +08:00
dbf6828741 fix: add oidc server plugin 2024-03-11 10:34:17 +08:00
c0f46dcf87 Merge pull request 'main' (#339) from main into @hera/dev
Reviewed-on: daoyoucloud/tachycode#339
2024-03-11 10:31:45 +08:00
xilesun
6fd06a28c8 chore(versions): 😊 publish v0.20.0-alpha.8 2024-03-11 09:59:08 +08:00
ChengLei Shao
a477facdbf
chore: move collection manager snippets into data source (#3666) 2024-03-10 09:57:14 +08:00
7d35af679f chore: update i18n 2024-03-10 05:54:34 +08:00
a0f9d54046 refactor: replace deprecated method 2024-03-10 05:48:38 +08:00
d06cce2cfa feat: custom filter form add input component 2024-03-10 05:19:27 +08:00
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
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
e7e37b3634
chore(backup-restore): using ctime for Windows compatibility 2024-03-08 20:38:01 +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
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
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
63d1a8d90c chore(versions): 😊 publish v0.20.0-alpha.7 2024-03-08 14:11:35 +08:00
253dc29c31 fix: record pdf data mistake 2024-03-08 13:47:01 +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
d9c8f10688 feat: fix 订单pdf费用sql去掉别名alias 2024-03-08 10:33:46 +08:00
chenos
8b4821e2df chore(versions): 😊 publish v0.20.0-alpha.6 2024-03-08 10:23:26 +08:00
ChengLei Shao
cacaafd05b
fix: parse association field in acl (#3655) 2024-03-08 09:21:27 +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