Commit Graph

1590 Commits

Author SHA1 Message Date
fb91a230fb Merge pull request 'fix: 修改自动补全重置后筛选失效问题' (#402) from fix_multipleSelect into @hera/dev
Reviewed-on: daoyoucloud/tachycode#402
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-18 15:07:29 +08:00
wjh
5b4fbea13f fix: 修改自动补全筛选失效问题 2024-03-18 14:13:58 +08:00
YANG QIA
3942b7cb94
fix(data-vi): tooltip bug of pie chart (#3745) 2024-03-18 12:33:03 +08:00
e73338815e refactor: fields 2024-03-18 11:48:43 +08:00
240accc39e refactor: group components 2024-03-18 11:45:23 +08:00
4ec92ea1e5 refactor: remove multiple action designer 2024-03-18 11:18:09 +08:00
85ba307506 Merge remote-tracking branch 'hera/@hera/dev' into feat_drawer_in_page 2024-03-18 11:07:10 +08:00
8d580b72b2 refactor: remove error-fallback and __builtins__ from plugin-core 2024-03-18 10:48:28 +08:00
chenos
db9ff337e5 chore(versions): 😊 publish v0.20.0-alpha.13 2024-03-17 23:34:26 +08:00
7de2f749b1 refactor: pages import styles 2024-03-17 23:30:55 +08:00
a5145e64f7 refactor: remove page 2024-03-17 23:30:55 +08:00
chenos
df153527a7 fix(acl): unable to associate users 2024-03-17 23:30:32 +08:00
2af767c7ef refactor: migrate popover(drawer) to core/client 2024-03-17 23:30:24 +08:00
f40fb6684f Merge remote-tracking branch 'origin/main' into merge_from_upstream_2 2024-03-17 23:29:16 +08:00
katherinehhh
93091a92f7
test(acl):column action acl e2e (#3738)
* test: acl e2e test support new data block

* test: acl e2e test support new data block

* test: acl e2e test support new data block

* test: acl e2e test support new data block
2024-03-17 17:29:23 +08:00
4919a372bd fix: plugin-mobile version error 2024-03-17 17:26:57 +08:00
YANG QIA
3be6b7c0c6
fix(data-vi): association fields transform bug (#3737)
* fix(data-vi): association fields transform bug

* fix: bug
2024-03-17 15:16:06 +08:00
d07932e9eb Merge remote-tracking branch 'origin/main' into merge_from_upstream_1 2024-03-17 04:28:06 +08:00
cd62e83403 add mobile plugin and other refactors (#396)
Co-authored-by: sealday <sealday@gmail.com>
Reviewed-on: daoyoucloud/tachycode#396
2024-03-17 04:20:33 +08:00
chenos
c1be864124 chore(versions): 😊 publish v0.20.0-alpha.12 2024-03-16 23:18:19 +08:00
YANG QIA
542fb65b50
fix: compatibility of @ant-design/plots 2.x (#3734)
* fix: compatibility of @ant-design/plots 2.x

* fix: dual-axes chart bug

* fix: auto infer bug
2024-03-16 23:04:57 +08:00
chenos
15ef81854e chore(versions): 😊 publish v0.20.0-alpha.11 2024-03-16 20:05:34 +08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a7049de998 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-13 12:17:01 +08:00
Junyi
4015cf1c0d
fix(plugin-workflow): fix duplicated triggering schedule event (#3692) 2024-03-13 11:42:00 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ed224cfa13 fix(file-manager): update target 2024-03-06 22:39:39 +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
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
Junyi
b5ae9343b5
fix(workflow-action-trigger): change plugin name (#3631)
* fix(plugin-workflow-action-trigger): fix migration

* fix(plugin-workflow): fix useless migration logic
2024-03-06 16:36:35 +08:00
katherinehhh
f9d1e9f0bc
fix: graph collection postions data missing (#3627) 2024-03-06 15:25:20 +08:00
Junyi
c2b121cda6
feat(plugin-workflow-form-trigger): add trigger button to all single record action bar (#3563)
* feat(plugin-workflow-form-trigger): add trigger button to all single record actionbar

* fix(plugin-workflow-form-trigger): fix button style and triggering

* fix(plugin-workflow): fix unused hook ref in workflow

* fix(plugin-workflow-form-trigger): fix button style

* refactor(plugin-workflow-action-trigger): change plugin name

* fix(plugin-workflow-action-trigger): fix unmigrated stuff

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case

* fix(presets): fix package name

* fix(plugin-workflow-action-trigger): fix e2e test and migration

* fix(plugin-workflow-action-trigger): fix migration

* fix(plugin-workflow-action-trigger): fix migration

* fix(plugin-workflow-action-trigger): fix migration

* feat(plugin-workflow-action-trigger): add destroy to trigger

* fix(plugin-workflow-action-trigger): fix appends select

* fix(plugin-workflow-action-trigger): remove support for destroy action

* fix(plugin-workflow-action-trigger): fix collection check

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case

* fix(plugin-workflow-action-trigger): fix test case
2024-03-06 14:42:20 +08:00
katherinehhh
bcb445644c
fix(acl-plugin-setting): pluginPermissions for snippets check (#3622)
* refactor:  pluginPermissions for snippets check

* fix: bug

* fix: bug
2024-03-06 14:11:08 +08:00
Zeke Zhang
d56268730b
fix(subTable): fix changing title field invalid (#3625)
* test: add e2e

* fix: fieldNames change in sub-table should take effect in real time

* fix: fieldNames change in sub-table should take effect in real time

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-06 14:10:31 +08:00
chenos
0fc382d298 chore(versions): 😊 publish v0.20.0-alpha.5 2024-03-06 00:20:06 +08:00
chenos
516619bb04 fix(file-manager): missing attachments 2024-03-05 22:54:20 +08:00
Junyi
8e16bab213
fix(plugin-workflow): fix schedule repeat logic (#3612)
* fix(plugin-workflow): fix schedule repeat logic

* fix(plugin-workflow): fix test case
2024-03-05 21:08:46 +08:00
Zeke Zhang
5a72e41a9d
fix(kanban): fix block (#3619) 2024-03-05 20:55:27 +08:00
Chareice
c07767e753
fix: data source collection unique index 2024-03-05 20:52:00 +08:00
katherinehhh
c5dd034452
fix: role name is error in role configure (#3618) 2024-03-05 18:19:53 +08:00
katherinehhh
d708c93b22
fix: bulkEditFormItemSettings collection undefined (#3616) 2024-03-05 17:39:43 +08:00
katherinehhh
03e47a04ea
fix: calender failed to change view for week (#3602) 2024-03-05 16:34:10 +08:00
ChengLei Shao
89ad88857d
chore: remove data source (#3610) 2024-03-05 15:58:45 +08:00
katherinehhh
3acc574877
test: acl test (#3609) 2024-03-05 15:13:28 +08:00
jack zhang
44f1ef1416
fix: not exists data sourec (#3608) 2024-03-05 14:56:24 +08:00
chenos
e7cc6cca54 chore(versions): 😊 publish v0.20.0-alpha.4 2024-03-05 09:08:53 +08:00
chenos
9bd0f4faff chore(data-source-manager): improve translation 2024-03-05 09:01:29 +08:00
chenos
bc9260ac52 chore: improve translation 2024-03-04 23:33:19 +08:00
chenos
e377f3a57c fix: update plugin package.json 2024-03-04 23:02:29 +08:00
chenos
ff9acd6d69 chore(versions): 😊 publish v0.20.0-alpha.3 2024-03-04 21:37:43 +08:00
Chareice
c1c4d93dce
fix: data source collection dump rules 2024-03-04 20:44:00 +08:00
Chareice
56d4d240a1
fix: remove backup file 2024-03-04 17:46:58 +08:00
Junyi
87ed436f8c
fix(client): fix mistaken changed api (#3598) 2024-03-04 16:45:10 +08:00
chenos
32b15cb108 chore(versions): 😊 publish v0.20.0-alpha.2 2024-03-03 23:37:37 +08:00
chenos
29e10f365f chore(versions): 😊 publish v0.20.0-alpha.1 2024-03-03 23:08:21 +08:00
katherinehhh
af6113c8ef
feat: support for multiple data sources (#3418)
* refactor: collectionName display with tablePrefix

* fix: bug

* fix: schema toolbar no ddata source (T-3182)

* fix: unit test bug

* fix: useAssociationNames support data source

* chore(RecordProvider_deprecated): add collectionName

* fix: deprecated

* refactor: default value

* refactor: default value

* fix: fastRefresh=false

* style: fix action link style (T-3228)

* fix: should not diaplay Save mode for some Action (T-3217)

* chore: remove group title (T-3194)

* fix: extend collections bug

* chore: transaction

* fix: filter block only current data source (T-3226)

* fix: fix filter block in drawer (T-3224)

* fix: avoid error when editing field (T-3232)

* fix: primary key name in postgres

* chore: test

* chore: test

* refactor: forgin key support select and input

* fix: doc bug

* fix: change duplllicte divier name

* feat: throughScope

* fix: bug

* refactor: local improve

* fix: fix parent record of Add child in tree table (T-3235)

* fix: block template filter by dataSource(T-3234)

* chore: change table primary key

* refactor: index for primarykey & unique

* chore: test

* fix: should not display filter blocks option if no association field (T-3242)

* fix: dataSourceKey

* refactor: sourcekey & forginkey & targetkey limit type

* fix: bug

* chore: test

* fix: upload action

* fix: unit test

* fix: useSourceIdFromParentRecord

* fix: permissions

* fix: oho association field should has default fieldnames

* fix: useSourceIdFromParentRecord

* fix: tableSelectorProvider collection undefined

* fix: bug

* chore: validate association keys

* fix: apply mixin bug

* fix: getPrimaryKey

* fix: bug T-3253

* fix:  collection unit test

* chore: validate association keys

* fix: create collection

* fix: getCollection in TableBlockProvider

* refactor: association key in data source manager

* fix: improve doc

* fix(relationshipBlocks): fix sourceId (T-3257,T-3264)

* fix: plugin acl test

* chore: correct field options

* fix: dataScope resource

* fix: improve doc

* fix: appVersion = '<0.20.0-alpha.1'

* refactor: fieldNames

* refactor: primarykey & unique & autoIncrement shuld not support edit in third dataSource

* fix: bug

* fix: gantt block params tree

* fix: style

* fix: wording & icon

* fix: bug

* fix: roles cache

* refactor: calender & express & file collection support preset fields

* fix: decode uri

* refactor: migrate files [wip] (#3584)

* refactor: migrate blockSettings:table

* refactor: migrate fieldSettings:TableColumn

* refactor: migrate TableBlockInitializer

* fix: fix import path

* refactor: migrate TableActionInitailizers

* refactor: migrate TableColumnInitializers

* refactor: migrate TableActionColumnInitializers

* refactor: migrate TableColumnSchemaToolbar

* refactor: migrate TableSelectorInitializer

* refactor: migrate blockSettings:tableSelector

* refactor(tableSelector): migrate e2e

* refactor(form): migrate e2e

* refactor: migrate FormBlockInitializer

* refactor: migrate CreateFormBlockInitializer

* refactor: migrate RecordFormBlockInitializer

* refactor: migrate blockSettings:createForm

* refactor: rename file name

* refactor: migrate blockSettings:editForm

* refactor: migrate FormActionInitailizers

* refactor: move to a new file

* refactor: migrate formItemInitializers

* refactor: migrate FormItemSchemaToolbar

* refactor: migrate fieldSettings:FormItem

* chore: fix build

* fix: fix weird path error

* fix: rename formActionInitializers

* fix: create collection field

* refactor: throughCollection

* fix: datasources get permission

* fix: throughCollection

* fix: throughCollection

* fix: register initializer components

* refactor: targetkey & source key must be unique

* refactor: targetkey & source key must be unique index

* fix(customRequest): avoid error when clicking button

* chore: error message when add multiple primary keys

* fix: target key in hasMany

* fix: default value should not support edit in outside dataSource

* fix: test

* fix: update associations (#3586)

* fix: source key

* fix: addAccessor

* fix: updateAssociations

* fix: bugs

* fix: remove test.only

* refactor: migrate RecordReadPrettyFormBlockInitializer

* refactor: migrate singleDataDetailsBlockSettings

* fix(users): filter bug

* refactor: migrate readPrettyFormActionInitializers

* refactor: migrate readPrettyFormItemInitializers

* refactor: migrate DetailsBlockInitializer

* refactor: migrate multiDataDetailsBlockSettings

* feat: validate association key pairs

* chore: default title

* refactor: migrate detailsActionInitializers

* refactor: migrate e2e

* refactor: migrate ListBlockInitializer

* refactor: migrate listBlockSettings

* refactor: migrate listActionInitializers

* refactor: migrate listItemActionInitializers

* fix: create collection

* fix: remove fieldsHistoryRepository.createMany

* test(e2e): fix error message for roles.name

* fix: sync indexes in postgres

* chore: test

* test: acl test

* test(e2e): fix sort error

* refactor: remove useless code

* test: kanban e2e

* fix: load user

* fix: test

* test: fix unit tests

* fix: db.sync

* test: updateRole

* fix: test

* fix: settings and initializer performance improve

* fix: update role resources

* fix: add block

* fix: fix T-3308

* test: fix e2e

* test(e2e): skip fix block

* chore: skip test in sqlite

* fix: change initializer menu key

* test(collectionManager): fix e2e

* refactor: sort field availableTypes

* fix: client core performance optimization

* refactor(GridCard): migrate e2e

* refactor: migrate GridCard

* fix: bug

* refactor: migrate utils

* refactor: migrate filter-form

* fix: change Record to CollectionRecord

* chore: acl migration

* chore: acl migration

* chore: migration of acl

* refactor: migrate Collapse

* chore: error message

* fix: update associations

* chore: update collection search to be case-insensitive

* refactor: migrate Markdown

* fix(WorkflowTodos): x-toolbar typo

* feat: admin change password

* feat: check foreign key && target key value in update associations

* chore: dataSource permission

* refactor: dataSource permission

* fix: acl support data source permission

* fix: fix T-3307

* chore: test

* refactor: locale improve

* chore: locale

* chore: sqlite test config

* chore: create user with roles test

* chore: test

* test: fix mock data to avoid duplication

* chore: test

* fix: load table with tablePrefix

* chore: move action in datasource

* chore: number field to sort field type

* test: optimize dropdown

* chore: upgrade @playwright/test to v1.42.1

* fix: fix invalid path for Windows

* test: fix e2e

* chore: kanban Sort field

* fix: kanban

* fix: kanban

* refactor: create sort in kanban

* refactor: create sort field in kanban

* refactor: locale improve

* refactor: locale improve

* fix: sync with null default value

* refactor: collectionFieldInterfaceSelect

* fix: move action

* fix: update associations

* fix: test case

* chore: test

* test: optimize e2e

* feat: remvoe Duplicate for single details block (T-3195)

* fix(fieldNames): should use primaryKey as default value (T-3322, T-3319)

* fix: use filterTargetKey as fieldNNames.value

* test: fix e2e

* test: fix e2e

* test(kanban): fix e2e

* test(blockTemplate): should clear template at end of test

* refactor: migrate fields

* refactor: migrate actions

* refactor: migrate menu

* refactor: migrate page

* refactor(SchemaSettings): unify naming style

* fix: scopeKeyOptions undefined

* refactor(SchemaInitializers): unify naming stle

* fix(bi): chart filter fields

* chore: acl snippets

* 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

* fix: revert record deprected

* fix: remove pro-plugins

* fix: bug

* chore: replace iframeBlockSchemaSettings to blockSettings:iframe

* Revert "refactor: revert some codes"

This reverts commit 991021ceaeecc5d27113a51e501a4abd439edcd2.

* Revert "refactor: replace field initializers name"

This reverts commit b47b808d06305741b56302e3dad1dd256658fad4.

* Revert "refactor: replace action initializers name"

This reverts commit eab1b6e3d986d1c3dc80d75fa6230fa948e3a33e.

* Revert "refactor: replace block intializers name"

This reverts commit 50ab9da177f344d037184a17746cb1d0e037a826.

* Revert "refactor: replace to blockInitializers:customizeCreateForm"

This reverts commit 77b9f59bb14d944fd8c42006e899861196589748.

* Revert "refactor: replace CreateFormBlockInitializers to blockInitializers:createForm"

This reverts commit e9a38b0b4d9fabc571b7d9cdc8929914f5e2a367.

* Revert "refactor(SchemaInitializers): unify naming stle"

This reverts commit 542390899fa84d212a8dbbe7f77e0f19befa6ae8.

* Revert "refactor(SchemaSettings): unify naming style"

This reverts commit 8566735922c4a157efccdb3830deaedeb08c6f6a.

* Revert "chore: replace iframeBlockSchemaSettings to blockSettings:iframe"

This reverts commit 884f6df92fdc860a50500025f132904e9528002f.

* refactor: create sorting field in kanban

* refactor: create sorting field in kanban

* fix: style

* fix: bug

* fix(SideMenu): fix the problem of invalid add menu (T-3331)

* fix: translation

* feat: client en-US docs

---------

Co-authored-by: xilesun <2013xile@gmail.com>
Co-authored-by: dream2023 <1098626505@qq.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Chareice <chareice@live.com>
2024-03-03 23:06:24 +08:00
Junyi
41a8344be9
fix(plugin-workflow): fix off static schedule trigger (#3595)
* fix(plugin-workflow): fix off static schedule trigger

* test(plugin-workflow): add test case
2024-03-02 14:23:55 +08:00
Junyi
7c79e58df9
fix(plugin-workflow): fix interval number greater then 32-bits integer (#3592) 2024-03-01 17:49:45 +08:00
katherinehhh
43597a4529
fix: formula field should trriger onchange when value change (#3573) 2024-02-28 15:54:01 +08:00
chenos
9520b2431e chore(versions): 😊 publish v0.19.0-alpha.9 2024-02-28 09:20:38 +08:00
chenos
89de8dc113
fix: upload action (#3577)
* fix: upload action

* fix: useSourceIdFromParentRecord
2024-02-28 08:49:35 +08:00
katherinehhh
28222fce99
fix: actions schema key should be uid (#3570)
* fix: actions in table column should be uid

* fix: actins name in form block

* fix: actions schema key should be uid

* fix: actions schema key should be uid
2024-02-26 21:26:02 +08:00
Junyi
88b281277c
refactor(plugin-workflow): refactor schedule trigger implementation (#3562)
* refactor(plugin-workflow): refactor schedule trigger implementation

* fix(plugin-workflow): fix test case

* fix(plugin-workflow): fix cleanup on app stop
2024-02-25 22:36:20 +08:00
Zeke Zhang
3a0f942270 test: fix e2e 2024-02-23 15:18:17 +08:00
ChengLei Shao
aa2117f654
fix: lazy loading belongs to association (#3559)
* chore: lazy loading belongs to association

* chore: test

* chore: console.log
2024-02-23 15:12:57 +08:00
Zeke Zhang
5409b78f9f chore: fix auth e2e 2024-02-23 10:12:05 +08:00
chenos
83e2d64da9
chore: optimize plugin description (#3552) 2024-02-22 23:13:31 +08:00
YANG QIA
9655b58190
chore: update plugin descriptions (#3556) 2024-02-22 22:19:14 +08:00
Junyi
9d064ba97f
docs(plugin-workflow): adjust plugin description (#3553) 2024-02-22 17:39:25 +08:00
Junyi
adccdece7c
docs(plugin-snapshot-field): adjust description (#3551) 2024-02-22 13:41:36 +08:00
Junyi
c6615441bd
feat(core): add string template engine to evaluators (#3546)
* feat(core): add string template engine to evaluators

* refactor(plugin-workflow): simplify api

* Revert "refactor(plugin-workflow): simplify api"

This reverts commit 6ff2bb922016a66b5c5f013ea9836755f9da711e.

* fix(plugin-workflow): fix test case

* refactor(core): adjust variable regular expression
2024-02-22 11:27:10 +08:00
Junyi
85ab125bb0
docs(plugin-workflow-loop): fix description (#3549) 2024-02-22 11:05:23 +08:00
YANG QIA
a341896378
chore: update plugin names and descriptions (#3547)
* chore: update plugin names and descriptions

* chore: update
2024-02-22 09:29:30 +08:00
katherinehhh
f2dc49c7c0
refactor: formula field should not trigger form value change (#3518)
* refactor: formula field should not trigger form value change

* style: list block style improve
2024-02-22 08:25:23 +08:00
ChengLei Shao
85af594004
chore: limit restore dialect (#3534) 2024-02-21 23:18:58 +08:00
katherinehhh
bdc90155c4
refactor: iframe block support in RecordFormBlockInitializers (#3541) 2024-02-21 16:53:10 +08:00
chenos
a736847a0f chore(versions): 😊 publish v0.19.0-alpha.8 2024-02-21 12:59:16 +08:00
katherinehhh
65d1b41165
fix: clicking on field assignment does not display field configuration for the first time (#3484)
* fix: clicking on field assignment does not result in field configuration for the first time

* fix: fix AssignedFieldValues
2024-02-21 11:02:31 +08:00
katherinehhh
83a61cdad9
refactor: display title (#3535) 2024-02-20 20:26:05 +08:00
chenos
8cb1942926 chore(versions): 😊 publish v0.19.0-alpha.7 2024-02-20 18:44:20 +08:00
chenos
985a06a675 fix(plugin-auth): export BasicAuth 2024-02-20 16:07:51 +08:00
chenos
5b86ee393f
chore: optimize environmental variables (#3528) 2024-02-20 10:35:24 +08:00
YANG QIA
041f146d7c
fix(bi): parse issue of date variables (#3520) 2024-02-19 20:14:45 +08:00
Junyi
c02e759830
fix(core): refactor evaluate to support dash in key path (#3517)
* fix(core): refactor evaluate to support dash in key path

* fix(core): fix evaluate expression from date variable

* fix(plugin-workflow): fix test case

* fix(client): fix pre-replace logic
2024-02-19 17:07:19 +08:00
Zeke Zhang
0d8604ee2c chore(plugin-theme-editor): update description 2024-02-18 19:41:45 +08:00
Zeke Zhang
93bbd9dd9a chore(plugin-file-manager): update description 2024-02-18 19:41:13 +08:00
Junyi
202edc8c15
fix: fields locales (#3511) 2024-02-16 09:30:10 +08:00
Junyi
1978d66ccd
docs(plugin-workflow): fix keyword (#3498) 2024-02-07 22:38:13 +08:00
chenos
d8bbdc9648 chore(versions): 😊 publish v0.19.0-alpha.6 2024-02-07 20:11:19 +08:00
chenos
c0988d9fc6 feat: update package.json 2024-02-05 21:10:48 +08:00
katherinehhh
a059b27d13
refactor: plugin manager keywords (#3490) 2024-02-05 14:37:07 +08:00
Junyi
ed35a35837
fix(plugin-workflow-form-trigger): fix locale (#3488) 2024-02-04 21:20:19 +08:00
Junyi
dcd732db89
fix(plugin-workflow): fix revision with new properties (#3487) 2024-02-04 09:49:18 +08:00
Junyi
407f887584
fix(plugin-workflow): fix processor options to pass any context (#3483) 2024-02-02 21:11:08 +08:00
Junyi
74a0254d5c
refactor(plugin-workflow): optimize hint on binding workflow (#3480)
* refactor(plugin-workflow): optimize hint on binding workflow

* fix(plugin-workflow-form-trigger): fix action triggerable check for form trigger
2024-02-02 14:49:27 +08:00
katherinehhh
44a70107af
refactor: plugin manager optimize & support keywords (#3467)
* refactor: plugin manager refactor

* refactor: plugin manager keywords

* refactor: plugin manager keywords

* refactor: disabled plugin support seccend confirm

* refactor: plugin manager

* refactor: plugin manager

* refactor: plugin manager

* refactor: plugin manager

* refactor: plugin manager

* refactor: plugin manager

* fix: styles

* fix: 4

* refactor: plugin manger sort by display name

* refactor: plugin manger homepage

* refactor: plugin manger keyword

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-02-02 12:02:18 +08:00
Junyi
4d4a70b2f4
refactor(plugin-workflow): support any context in processor as options (#3473)
* refactor(plugin-workflow): support any context in processor as options

* fix(plugin-workflow): fix collection trigger

* fix(plugin-workflow): fix collection trigger and instructions

* fix(plugin-workflow): fix bind workflow configuration on button

* fix(plugin-workflow): fix e2e test cases
2024-02-02 10:32:27 +08:00
hongboji
cd09649e1c
test: parallel branch node e2e (#3471)
* test: add parallel branch node e2e

* test: parallel branch node e2e
2024-02-01 17:49:07 +08:00
chenos
8765208016 chore(versions): 😊 publish v0.19.0-alpha.5 2024-01-30 17:11:37 +08:00
Junyi
644039ba53
fix(client): fix variable textarea ime state under edge (#3458)
* fix(client): fix variable textarea ime state under edge

* test(plugin-workflow): adjust delay for typing in test case

* test(plugin-workflow): adjust delay for typing in test case
2024-01-30 09:34:31 +08:00
katherinehhh
dad6072abb
refactor: bulk edit action set changeTo as default value (#3455) 2024-01-29 16:56:05 +08:00
ChengLei Shao
535d14b0bb
fix: load sql collection with source field (#3456)
* chore: load view

* chore: load sql collection
2024-01-29 16:40:57 +08:00
hongboji
1cad202745
test: Workflow manual node e2e (#3451)
* test: workflow manual node e2e

* fix: datablocks

* fix: timeout-minutes

* fix: datablocks&createRecordForm

* fix: createRecordForm
2024-01-29 15:59:07 +08:00
Junyi
ad065431fb
fix(plugin-workflow): fix end logic when success (#3453) 2024-01-29 14:04:37 +08:00
Junyi
fae544d1b1
fix(plugin-workflow): fix collection cycling triggering (#3448)
* fix(plugin-workflow): fix collection cycling triggering

* fix(plugin-workflow-test): fix test trigger

* fix(plugin-workflow): fix sqlite transaction triggering
2024-01-27 22:46:19 +08:00
Junyi
f7b62ed42b
fix(plugin-workflow): fix sql transaction and locale (#3444)
* fix(plugin-workflow): fix sql transaction and locale

* fix(plugin-workflow): fix locale
2024-01-27 09:37:40 +08:00
chenos
65020f69d4 chore(versions): 😊 publish v0.19.0-alpha.4 2024-01-26 21:16:57 +08:00
Junyi
804e282241
fix(client): fix cron locale when DOM and DOW both present (#3442) 2024-01-26 18:09:21 +08:00
Junyi
dada993d80
fix(plugin-workflow): fix sync collection trigger transaction (#3437) 2024-01-26 11:08:45 +08:00
Junyi
4b8915b616
refactor(plugin-workflow): add sync option for trigger (#3383)
* refactor(plugin-workflow): add sync option for trigger

* feat(plugin-workflow-request): support sync call in request

* fix(plugin-workflow-request): fix request async call

* refactor(plugin-workflow): add method to check if workflow is sync

* fix(plugin-workflow): fix useAvailable in nodes

* fix(plugin-workflow): fix node.isAvailable check

* test(plugin-workflow): limit mysql version to pass test

* fix(plugin-workflow-delay): fix test case

* fix(plugin-workflow-delay): fix test case

* feat(plugin-workflow): add sync field for workflow

* refactor(plugin-workflow): adjust end node logic

* fix(plugin-workflow): support sync mode in form trigger

* feat(plugin-workflow): add end instruction

* fix(plugin-workflow-form-trigger): fix test cases

* fix(plugin-workflow): fix transaction for sync event
2024-01-25 22:10:03 +08:00
seonghookim
be7a4845ab
feat: add Korean translation (#3428)
* ko_KR 国际化

* fix: ko

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-01-25 22:07:22 +08:00
Junyi
fb11c82b79
feat(plugin-workflow): add cancel action for execution (#3425)
* feat(plugin-workflow): add cancel action for execution

* feat(plugin-workflow): add cancel button in execution canvas

* fix(plugin-workflow-manual): fix canceled execution actions
2024-01-24 21:09:48 +08:00
Junyi
3b60ba2cf8
test: mysql version bug (#3412)
* test(plugin-workflow): limit mysql version to pass test

* fix(plugin-workflow-delay): fix test case

* fix(plugin-workflow-delay): fix test case
2024-01-20 20:59:49 +08:00
chenos
8217ebfb1b
feat: improve plugin manager process (#3386)
* feat: improve plugin manager process

* fix: skip help error

* fix: ipc check

* fix: improve remove

* fix: refresh

* fix: remove dir

* fix: improve code

* fix: update yarn.lock

* fix: e2e error

* fix: migration

* fix: pm create

* Revert "fix: migration"

This reverts commit 8f8fe04436ac96798259fb6debd88fffcb613560.

* fix: remove sample-hello
2024-01-18 00:33:15 +08:00
Junyi
a4b9544944
Fix/plugin workflow migration (#3404)
* fix(plugin-workflow): fix migration

* fix(plugin-workflow): add job.nodeKey when saving
2024-01-17 20:09:24 +08:00
Junyi
6f72451d27
fix(plugin-workflow-manual): fix value block in todo block (#3400) 2024-01-17 00:06:40 +08:00
YANG QIA
8530da7c23
fix: fix T-2916 (#3393) 2024-01-15 23:46:29 +08:00
katherinehhh
6fb5af993e
refactor(sub-table): sub-table support selection of existing records (#3311)
* refactor: sub-table support selection of existing records

* refactor: local improve

* refactor: sub-table support select existing records

* refactor: create action support updateAssociationValues

* refactor:  sub-table

* fix: omit foreignKey

* refactor: record picker omit foreignKey

* test: manyToMany

* test: subform: basic fields

* test: table column & sub-table in edit form
2024-01-15 17:46:55 +08:00
YANG QIA
dc71a77d8c
fix(auth): redirect URL after signing in by SSO sucessfully (#3387)
* fix: fix T-2900

* fix: saml
2024-01-14 22:26:13 +08:00
Dunqing
8ab69500c7
fix(custom-request): permission issues (#3306)
* fix(custom-request-plugin): cannot see custom request action in non-root role when acl doesn't set

* fix: list all roles

* feat: display all roles

* feat: support

* fix: remove unused code

* fix: options is null

* fix: translation

* fix: migration error

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-01-13 18:13:18 +08:00
chenos
c44f459756 fix: migration error 2024-01-13 09:47:35 +08:00
chenos
57a2bac72a fix(api-doc): invalid headers 2024-01-12 09:14:27 +08:00
YANG QIA
1871fdd895
fix: fix T-2909 (#3373) 2024-01-11 19:29:25 +08:00
katherinehhh
c9901d1681
fix: graph collection auto layout reporting error (#3370) 2024-01-11 16:51:32 +08:00
katherinehhh
80b71c4a7b
test: collection selector test (#3371)
* test: collection selector test

* test: collection selector test
2024-01-11 16:51:22 +08:00
katherinehhh
b650d30996
Revert "test: collection selector test" (#3369) 2024-01-11 16:20:00 +08:00
katherinehhh
5903541f43
test: collection selector test (#3368) 2024-01-11 15:44:55 +08:00
katherinehhh
f38e4bcaa8
refactor: local impeove (#3367) 2024-01-11 15:19:44 +08:00
YANG QIA
7d29c717eb
feat(oidc): add advanced options (#3364)
* fix(oidc): params issue

* fix: test

* fix: exchangeBody

* feat: add advanced settings

* fix: locale

* fix: bug

* feat: allow to set state token manually
2024-01-11 11:27:40 +08:00
katherinehhh
79735a372b
fix: linkage rule only support action with context record (#3355) 2024-01-10 17:00:44 +08:00
Zeke Zhang
7534e12029
fix(header): avoid affecting the colours of other menus (#3357)
* fix: avoid affecting the colours of other menus

* Revert "Revert "fix(theme): fix color of header menu (#3354)""

This reverts commit 3a06893463.
2024-01-10 16:52:02 +08:00
hongboji
6eff76ffa2
fix: compute node random data even error (#3346)
* fix: compute node random data even error

* fix: expression edit box error

* fix: expression edit box error
2024-01-10 15:17:21 +08:00
Zeke Zhang
3a06893463 Revert "fix(theme): fix color of header menu (#3354)"
This reverts commit 70633840da.
2024-01-10 11:33:23 +08:00
Zeke Zhang
70633840da
fix(theme): fix color of header menu (#3354) 2024-01-10 09:15:41 +08:00
ChengLei Shao
0ce0ca6441
fix: dump with sql collection (#3350)
* chore: dump with sql collection

* fix: dump with view that not exists in database

* fix: test

* fix: test

* fix: test

* fix: test
2024-01-09 22:19:43 +08:00
chenos
38c19818d3 chore(versions): 😊 publish v0.19.0-alpha.3 2024-01-09 18:32:09 +08:00
katherinehhh
6d68515275
fix: collection field update reporting error (#3352) 2024-01-09 16:51:46 +08:00
by
effff269dc
fix: filter form drop-down selection to add data range (#3321)
* fix: filter form drop-down selection to add data range

* refactor: use existing code directly

* test: add tests

---------

Co-authored-by: zhangboya3 <zhangboya3@xiaomi.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-01-09 12:21:16 +08:00
chenos
2070f2046d chore(versions): 😊 publish v0.19.0-alpha.2 2024-01-09 09:13:16 +08:00
chenos
c39d3398ae chore(versions): 😊 publish v0.19.0-alpha.1 2024-01-08 19:32:54 +08:00
chenos
eed36c3bba fix: test error 2024-01-08 19:28:26 +08:00
chenos
7779cd79ac
refactor: optimize the command line (#3339)
* fix: perform load action on boot main app

* feat: add dataType option in collection duplicator

* chore: reset optional dumpable config

* chore: dump command

* chore: dump & restore command

* chore: delay restore

* fix: dump test

* chore: restore command

* chore: dump command action

* chore: dumpable collection api

* chore: client collection option

* feat: backup& restore client

* chore: content disposition header in dump response

* chore: download backup field

* feat: collection origin option

* fix: test

* chore: collection manager collection origin

* chore: upload  backup field

* chore: upload restore file

* chore: upload restore file

* fix: test

* chore: backup and restore support learn more

* refactor: upload restore file

* refactor: upload restore file

* fix: test

* fix: test

* chore: dumpable collection with title

* chore: pg only test

* chore: test

* fix: test

* chore: test sleep

* style: locale improve

* refactor: download backup file

* refactor: start restore

* fix: restore key name

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* chore: unify duplicator option

* fix: dump empty collection

* chore: test

* chore: test

* style: style improve

* refactor: locale improve

* chore: dumpalbe collection orders

* style: style improve

* style: style improve

* style: icon adjust

* chore: nginx body size

* chore: get file status

* feat: run dump task

* feat: download api

* chore: backup files resourcer

* feat: restore destroy api

* chore: backup files resoucer

* feat: list backup files action

* chore: get collection meta from dumped file

* fix: dump file name

* fix: test

* chore: backup and restore ui

* chore: swagger api for backup & restore

* chore: api doc

* chore: api doc

* chore: api doc

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* fix: restore values

* style: style improve

* fix: download field respontype

* fix: restore form local file

* refactor: local improve

* refactor: delete backup file

* fix: in progress status

* refactor: locale improve

* refactor: locale improve

* refactor: style improve

* refactor: style improve

* refactor: style improve

* test: dump collection table attribute

* chore: dump collection with table attributes

* chore: test

* chore: create new table in restore

* fix: import error

* chore: restore table from backup file

* chore: sync collection after restore collections

* fix: restore json data

* style: style improve

* chore: restore with fields

* chore: test

* fix: test

* fix: test with underscored

* style: style improve

* fix: lock file state

* chore: add test file

* refactor: backup & restore plugin

* fix: mysql test

* chore: skip import view collection

* chore: restore collection with inherits topo order

* fix: import

* style: style improve

* fix: restore sequence fields

* fix: themeConfig collection duplicator option

* fix: restore with dialectOnly meta

* fix: throw error

* fix: restore

* fix: import backup file created in postgres into mysql

* fix: repeated items in inherits

* chore: upgrade after restore

* feat: check database env before restore

* feat: handle autoincr val in postgres

* chore: sqlite & mysql queryInterface

* chore: test

* fix: test

* chore: test

* fix: build

* fix: pg test

* fix: restore with date field

* chore: theme-config collection

* chore: chage import collections method to support collection origin

* chore: fallback get autoincr value in mysql

* fix: dataType normalize

* chore: delay restore

* chore: test

* fix: build

* feat: collectin onDump

* feat: collection onDump interface

* chore: dump with view collection

* chore: sync in restore

* refactor: locale improve

* refactor: code improve

* fix: test

* fix: data sync

* chore: rename backup & restore plugin

* chore: skip test

* style: style improve

* style: style improve

* style: style improve

* style: style improve

* chore: import version check

* chore: backup file dir

* chore: build

* fix: bugs

* fix: error

* fix: pageSize

* fix: import origin

* fix: improve code

* fix: remove namespace

* chore: dump rules config

* fix: dump custom collection

* chore: version

* fix: test

* fix: test

* fix: test

* fix: test

* chore: test

* fix: load custom collection

* fix: client

* fix: translation

* chore: code

* fix: bug

* fix:  support shared option

* fix: roles collection dumpRules

* chore: test

* fix: define collections

* chore: collection group

* fix: translation

* fix: translation

* fix: restore options

* chore: restore command

* refactor: optimize the command line

* chore: dump error

* fix: test error

* fix:  test error

* fix: test error

* fix: test error

* fix: test error

* fix: skip cli test cases

* fix: test error

* fix: too many open files

* fix: update migration version

* fix: migrations

* fix: upgrade

* fix: error

* fix: migration error

* fix: upgrade

* fix: test error

* fix: timeout

* fix: width

* feat: auto load collections

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: ipc error

* fix: test error

---------

Co-authored-by: Chareice <chareice@live.com>
Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-01-08 19:05:14 +08:00
ChengLei Shao
fa97d0a642
feat: application backup and restore (#3268)
* fix: perform load action on boot main app

* feat: add dataType option in collection duplicator

* chore: reset optional dumpable config

* chore: dump command

* chore: dump & restore command

* chore: delay restore

* fix: dump test

* chore: restore command

* chore: dump command action

* chore: dumpable collection api

* chore: client collection option

* feat: backup& restore client

* chore: content disposition header in dump response

* chore: download backup field

* feat: collection origin option

* fix: test

* chore: collection manager collection origin

* chore: upload  backup field

* chore: upload restore file

* chore: upload restore file

* fix: test

* chore: backup and restore support learn more

* refactor: upload restore file

* refactor: upload restore file

* fix: test

* fix: test

* chore: dumpable collection with title

* chore: pg only test

* chore: test

* fix: test

* chore: test sleep

* style: locale improve

* refactor: download backup file

* refactor: start restore

* fix: restore key name

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* chore: unify duplicator option

* fix: dump empty collection

* chore: test

* chore: test

* style: style improve

* refactor: locale improve

* chore: dumpalbe collection orders

* style: style improve

* style: style improve

* style: icon adjust

* chore: nginx body size

* chore: get file status

* feat: run dump task

* feat: download api

* chore: backup files resourcer

* feat: restore destroy api

* chore: backup files resoucer

* feat: list backup files action

* chore: get collection meta from dumped file

* fix: dump file name

* fix: test

* chore: backup and restore ui

* chore: swagger api for backup & restore

* chore: api doc

* chore: api doc

* chore: api doc

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* fix: restore values

* style: style improve

* fix: download field respontype

* fix: restore form local file

* refactor: local improve

* refactor: delete backup file

* fix: in progress status

* refactor: locale improve

* refactor: locale improve

* refactor: style improve

* refactor: style improve

* refactor: style improve

* test: dump collection table attribute

* chore: dump collection with table attributes

* chore: test

* chore: create new table in restore

* fix: import error

* chore: restore table from backup file

* chore: sync collection after restore collections

* fix: restore json data

* style: style improve

* chore: restore with fields

* chore: test

* fix: test

* fix: test with underscored

* style: style improve

* fix: lock file state

* chore: add test file

* refactor: backup & restore plugin

* fix: mysql test

* chore: skip import view collection

* chore: restore collection with inherits topo order

* fix: import

* style: style improve

* fix: restore sequence fields

* fix: themeConfig collection duplicator option

* fix: restore with dialectOnly meta

* fix: throw error

* fix: restore

* fix: import backup file created in postgres into mysql

* fix: repeated items in inherits

* chore: upgrade after restore

* feat: check database env before restore

* feat: handle autoincr val in postgres

* chore: sqlite & mysql queryInterface

* chore: test

* fix: test

* chore: test

* fix: build

* fix: pg test

* fix: restore with date field

* chore: theme-config collection

* chore: chage import collections method to support collection origin

* chore: fallback get autoincr value in mysql

* fix: dataType normalize

* chore: delay restore

* chore: test

* fix: build

* feat: collectin onDump

* feat: collection onDump interface

* chore: dump with view collection

* chore: sync in restore

* refactor: locale improve

* refactor: code improve

* fix: test

* fix: data sync

* chore: rename backup & restore plugin

* chore: skip test

* style: style improve

* style: style improve

* style: style improve

* style: style improve

* chore: import version check

* chore: backup file dir

* chore: build

* fix: bugs

* fix: error

* fix: pageSize

* fix: import origin

* fix: improve code

* fix: remove namespace

* chore: dump rules config

* fix: dump custom collection

* chore: version

* fix: test

* fix: test

* fix: test

* fix: test

* chore: test

* fix: load custom collection

* fix: client

* fix: translation

* chore: code

* fix: bug

* fix:  support shared option

* fix: roles collection dumpRules

* chore: test

* fix: define collections

* chore: collection group

* fix: translation

* fix: translation

* fix: restore options

* chore: restore command

* chore: dump error

* fix: too many open files

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2024-01-08 18:59:56 +08:00
hongboji
56b1234c1c
fix: workflow e2e concurrency errors (#3345)
* fix: workflow e2e concurrency errors

* fix: edit Collection event name
2024-01-08 14:05:35 +08:00
hongboji
3c87755e6c
test: workflow aggregate node e2e (#3342) 2024-01-07 19:52:01 +08:00
hongboji
908944ce62
test: workflow sql node e2e (#3341) 2024-01-07 17:09:32 +08:00
Zeke Zhang
d85aaa36e3
fix(z-index): avoid obscuring the pop-up and upgrade antd to v5.12.8 (#3337)
* fix(z-index): avoid obscuring the pop-up

* test: optimize

* chore: fix build

* test: fix errors
2024-01-06 18:32:25 +08:00
Junyi
05078faf1a
refactor(plugin-workflow): add trigger title for workflow which is different with title (#3333) 2024-01-06 11:17:28 +08:00
Zeke Zhang
2ab9f8625e
chore(e2e): make parallelism mode more stable (#3294)
* chore: make parallelism mode more stable

* refactor: optimize e2e tests

* test: make test more stable

* chore: change concurrency to 4 from 2

* refactor: inline variable

* test: fix error

* test: avoid error

* test: avoid error

* test: avoid error

* chore(e2e): remove --stop-on-error on CI runs

* Revert "refactor: inline variable"

This reverts commit 454bb04613f6f394f2f27db6808295261487c963.

* test: make more stable

* chore: adjust timeout

* chore: update config

* test: make test more stable

* chore: update yarn.lock

* Revert "chore: update yarn.lock"

This reverts commit 1bb7a661d181050e647450d5d8b2cfd67bd128b1.

* test(workflow): increase local timeout

* test: optimize

* test: more stable

* test: fix errors

* test: more stable

* chore: increase retries to 2 in CI
2024-01-06 06:37:23 +08:00
Junyi
b9398d1cd4
fix(plugin-workflow-manual): adjust locale and column (#3331) 2024-01-05 21:48:21 +08:00
YANG QIA
33c690b877
fix: fix T-2879 (#3330) 2024-01-05 20:12:30 +08:00
katherinehhh
c102655317
refactor: gantt tooltip hover (#3328) 2024-01-05 14:30:45 +08:00