Commit Graph

1579 Commits

Author SHA1 Message Date
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
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
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
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
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
katherinehhh
b4058ecb1b
fix: incorrect pagination query parameters when batch deleting last page (#3670) 2024-03-12 21:29:47 +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
c0de2384df fix: linkage should set undefined 2024-03-12 20:09:35 +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
katherinehhh
4a346a4119
fix: view collection association field foreignkey should be select (#3671) 2024-03-12 09:30:38 +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
e69e9b9940 fix: resource conflict with nocobase settings 2024-03-11 12:32:06 +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
44c6d89e54 fix: template block linkage and association data load failed 2024-03-10 04:20:59 +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
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
chenos
63d1a8d90c chore(versions): 😊 publish v0.20.0-alpha.7 2024-03-08 14:11:35 +08:00
katherinehhh
db045c61d2
fix: view collection interface missing (#3658) 2024-03-08 12:00:59 +08:00
jack zhang
2fc13c180c
fix: getCollection bug (#3656) 2024-03-08 11:18:32 +08:00
chenos
8b4821e2df chore(versions): 😊 publish v0.20.0-alpha.6 2024-03-08 10:23:26 +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
chenos
0f1115b058 fix(create-action): invalid save mode 2024-03-06 23:05:16 +08:00
katherinehhh
d82ed8058c
style: flexWrap in actionBar (#3635) 2024-03-06 21:32:32 +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
0d327bb539
fix(ActionLink): fix hover style (#3629) 2024-03-06 14:58:08 +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
jack zhang
d3627c5ba9
fix: sidebar menu text overflow (#3626) 2024-03-06 14:37:13 +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
Zeke Zhang
202fcef17c
fix: fix hover style for sub table (#3623)
* Revert "style(TableColumn): fix style of mouse hover (#3597)"

This reverts commit 488616f7fe.

* fix: fix hover style for sub table

* fix: style

* Revert "fix: style"

This reverts commit 33901c4ff96458b17f0f68839f726f520370e622.

* fix: style
2024-03-06 00:29:30 +08:00
chenos
0fc382d298 chore(versions): 😊 publish v0.20.0-alpha.5 2024-03-06 00:20:06 +08:00
chenos
e82179ff61 fix(select): fieldNames are missing the value parameter 2024-03-05 23:58:56 +08:00
Zeke Zhang
5ca1827e7e
fix(save-record): differentiate between creation and updating based on record.isNew (#3620) 2024-03-05 21:22:24 +08:00
katherinehhh
951aece70c
refactor: useFormItemInitializerFields (#3621) 2024-03-05 20:56:40 +08:00
katherinehhh
96832e6113
fix: collection without filterTargetKey should not be able to add block (#3614)
* fix: collection without filterTargetKey should not be  able to add block

* refactor: locale improve
2024-03-05 20:56:05 +08:00
Zeke Zhang
a37195eb4f
fix: should display settings after field deleted (#3606) 2024-03-05 19:30:59 +08:00
Zeke Zhang
e10899b271
fix(Table): fix Fixed Block bug (#3601)
* fix(Table): fix Fixed Block bug

* test: unskip e2e

* chore: remove comment

* Revert "fix(Table): fix Fixed Block bug"

This reverts commit 7e7e22c6d32fe3d63f73f54d90dd9d7aee965231.

* fix(Table): fix Fixed Block bug

* refactor: remove useless code

* fix: empty page

* chore: increase timeout
2024-03-05 16:27:17 +08:00
jack zhang
3b30070f2d
fix: data-block parent request with data-source (#3605) 2024-03-05 13:00:50 +08:00
jack zhang
b1a49f0d06
fix: remove temp doc (#3603)
* fix: remove temp doc

* refactor: moment => dayjs

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-05 12:34:20 +08:00
chenos
e7cc6cca54 chore(versions): 😊 publish v0.20.0-alpha.4 2024-03-05 09:08:53 +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
jack zhang
61c24ac2fd
fix: create-nocobase-app + yarn dev error (#3599) 2024-03-04 21:36:22 +08:00
katherinehhh
f619c4e6c0
fix: chinaRegions association fieldName (#3600)
* fix: chinaRegions association fieldName

* fix: useAssociatedFormItemInitializerFields fieldName
2024-03-04 19:00:29 +08:00
katherinehhh
09985ed8bc
fix: field hidden with linkage rule should clear value (#3576) 2024-03-04 17:28:33 +08:00
Junyi
87ed436f8c
fix(client): fix mistaken changed api (#3598) 2024-03-04 16:45:10 +08:00
Zeke Zhang
488616f7fe
style(TableColumn): fix style of mouse hover (#3597) 2024-03-04 15:45:53 +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
jack zhang
2140df071d
fix: plugin settings auth bug (#3585) 2024-02-29 17:49:11 +08:00
Zeke Zhang
288bb04458
fix(LinkageRules): fix linkage rules with nested conditions (#3578)
* fix(LinkageRules): fix linkage rules with nested conditions

* test: add e2e
2024-02-28 12:13:48 +08:00
chenos
9520b2431e chore(versions): 😊 publish v0.19.0-alpha.9 2024-02-28 09:20:38 +08:00
katherinehhh
fc5e67d96b
fix: dataSource in select readPretty is missing (#3574) 2024-02-27 10:57:51 +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
katherinehhh
0e728ca5a5
fix: datatime format support preview (#3572) 2024-02-26 17:00:18 +08:00
katherinehhh
e6719763f6
refactor: the default openSize of dialog should be middle (#3569) 2024-02-25 17:36:16 +08:00
katherinehhh
5bf7acdf66
style: plugin manager style improve (#3568) 2024-02-25 13:14:34 +08:00
Zeke Zhang
4373e6da88
feat(Help): switch to the Chinese page when using Chinese (#3567) 2024-02-24 11:50:06 +08:00
katherinehhh
3d1f73fcaf
refactor: fixedBlockDesignerItem (#3550) 2024-02-23 22:14:57 +08:00
Zeke Zhang
6262409184
style: set size of icon button (#3560) 2024-02-23 11:29:17 +08:00
Zeke Zhang
5edb8ca85d
chore: fix e2e (#3557)
* chore: change testid of Help

* test: fix e2e
2024-02-23 09:30:28 +08:00
Zeke Zhang
d02d24b484
feat: adjust of menu in upper right corner of page (#3548)
* feat: adjust of menu in upper right corner of page

* fix: uncomment

* chore: change License link

* chore: optimize text color

* chore: optimize text color

* test: fix e2e
2024-02-23 00:08:03 +08:00
chenos
83e2d64da9
chore: optimize plugin description (#3552) 2024-02-22 23:13:31 +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
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
Junyi
14b6c5a628
fix(client): fix filter default value (#3544) 2024-02-21 21:24:43 +08:00
chenos
a736847a0f chore(versions): 😊 publish v0.19.0-alpha.8 2024-02-21 12:59:16 +08:00
Zeke Zhang
b61cedecb2
fix(LinkageRules): fix appends (#3537)
* fix(LinkageRules): fix appends

* fix: fix nested rules (T-3152)
2024-02-21 12:22:52 +08:00
Zeke Zhang
bb46697e71
fix(LinkageRules): avoid to change observable object (#3538) 2024-02-21 11:22:47 +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
chenos
8cb1942926 chore(versions): 😊 publish v0.19.0-alpha.7 2024-02-20 18:44:20 +08:00
Zeke Zhang
a18103baa0
refactor(Linkage): optimize the parsing of expression variables (#3519) 2024-02-19 18:08:14 +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
katherinehhh
c0b8fa27ec
fix: detail block should not support pageSizeChanger (#3515)
* fix: detail block should not support pageSizeChanger

* style: delete collection
2024-02-18 14:14:18 +08:00
Zeke Zhang
28eae4a85b
fix(subTable): should clear form value after submit (#3508)
* fix(subTable): should clear form value after submit

* test: add test
2024-02-16 08:48:37 +08:00
Zeke Zhang
b232586f7b
style(PinnedPluginList): fix hover background color (#3501) 2024-02-08 08:47:33 +08:00
chenos
d8bbdc9648 chore(versions): 😊 publish v0.19.0-alpha.6 2024-02-07 20:11:19 +08:00
katherinehhh
ea35d103ac
fix: sub-table should not support action column (#3497)
* fix: sub-table should not support action column

* fix: sub-table should not support action column
2024-02-07 15:43:07 +08:00
Zeke Zhang
626823b4b5 Revert "fix(upload): fix upload url for relationship blocks"
This reverts commit bb83face08.
2024-02-07 13:13:57 +08:00
Zeke Zhang
bb83face08 fix(upload): fix upload url for relationship blocks 2024-02-07 13:12:14 +08:00
katherinehhh
a059b27d13
refactor: plugin manager keywords (#3490) 2024-02-05 14:37:07 +08:00
S.Feng
f1a3c17522
style(lang): add zh-tw (#3446) 2024-02-03 20:22:17 +08:00
chenos
6c9520e0a2
fix: layout of plugin settings icons (#3478) 2024-02-03 19:41:26 +08:00
Zeke Zhang
33edd78531
style: fix color of more button and scrollbar style (#3486)
* style(header): fix color of more button

* style: fix scrollbar style
2024-02-03 10:21:21 +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
Zeke Zhang
e7a28035c2
fix(defaultValue): should not use defaultValue in filter blocks (#3472) 2024-01-31 13:20:15 +08:00
katherinehhh
89bf75871f
fix: attachment field set as single and doesn't display re-uploaded attachments after deleted (#3469) 2024-01-31 09:08:35 +08:00
chenos
8765208016 chore(versions): 😊 publish v0.19.0-alpha.5 2024-01-30 17:11:37 +08:00
Zeke Zhang
bdaa2197a7
refactor: remove SharedFilterProvider (#3424) 2024-01-30 14:17:44 +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
Zeke Zhang
3c4000fdad
fix(CascadeSelect): should change value when deleting value (#3440)
* fix(CascadeSelect): should change value when deleting value

* fix: cascadeSelect should support clear option

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-01-29 19:00:25 +08:00
katherinehhh
a52816cc86
fix: filter form block failed to connect templat block (#3457) 2024-01-29 17:04:21 +08:00
katherinehhh
dad6072abb
refactor: bulk edit action set changeTo as default value (#3455) 2024-01-29 16:56:05 +08:00
Zeke Zhang
2fc1604d78
style: fix side menu text overflow style (#3450) 2024-01-28 12:40:39 +08:00
Zeke Zhang
ec67f5fbc1
feat: support to add filter blocks for relationship blocks (#3436)
* refactor: use props to make more extensible

* feat: support to add filter blocks for relationship blocks

* test: fix error

* test: fix error
2024-01-28 09:22:53 +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
2c90c0c6c3
feat(core): add message handling on success (#3435)
* feat(core): add message handling on success

* fix(core): fix nullable body messages
2024-01-25 22:56:14 +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
Zeke Zhang
a771e4ff1f
fix: should load association data of sub details (#3432)
* test: add test

* fix: should load association data of sub details
2024-01-25 14:50:25 +08:00
katherinehhh
10e0f6ec1f
refactor: configuration mode, buttons without permission should be displayed, but cannot be clicked (#3421) 2024-01-23 15:33:48 +08:00
katherinehhh
5a09774cf6
refactor: permission sholud passed without setting x-acl action (#3410) 2024-01-22 14:40:04 +08:00
chenos
1260934d2b fix(client): cannot read properties of null (reading 'removeEventListener')
at http://localhost:13000/p. index.f739617tasyncis:118:3551
2024-01-20 14:48:17 +08:00
katherinehhh
1fa4d48869
fix: attachment deletion and re upload do not display (#3405) 2024-01-18 19:10:44 +08:00
katherinehhh
fe260d0371
refactor: parent inherited collection support enable child collection in add new action (#3398)
* refactor: parent inherited collectionsholud enable child collection in add new

* fix: useisDetailBlock

* fix: useIsDetailBlock

* fix: useIsDetailBlock

* fix: useIsDetailBlock
2024-01-18 09:46:27 +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
katherinehhh
8d06b73c48
fix: varibales as & &Iteration is not correct in record picker (#3399) 2024-01-17 11:16:19 +08:00
katherinehhh
d3704f6807
fix: assciation field in sub-table should support enable link when readOnly or readPrety (#3390) 2024-01-16 15:58:18 +08:00
katherinehhh
bc927af640
refactor: local translate (#3396) 2024-01-16 11:31:03 +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
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
1adaa53c2b
feat: supports the WS_PATH environment variable (#3384) 2024-01-13 18:05:22 +08:00
Zeke Zhang
f466e6ec95 test(e2e): increase the number of retries for error-prone tests 2024-01-12 17:14:18 +08:00
katherinehhh
dfb4421484
fix: table column sort params should support cancel sort (#3372)
* fix: sort params

* fix: sort params
2024-01-12 09:50:17 +08:00
Zeke Zhang
29a09b1ceb
fix(TableSelectorProvider): parse filter param (#3366)
* fix(TableSelectorProvider): parse filter param

* fix: avoid duplicate loading of data
2024-01-11 16:22:06 +08:00
katherinehhh
4d44c6e24e
fix: useDesigner Designer should has default toolbar (#3365)
* fix: useDesigner Designer should has default toolbar

* test: e2e schemaSeting for linkage rule

* test: e2e schemaSeting for linkage rule

* test: e2e schemaSeting for linkage rule
2024-01-11 11:21:18 +08:00
chenos
2f8b0e75f8 feat: optimize translation 2024-01-11 10:06:44 +08:00
katherinehhh
77ef27d524
fix: linkage rules support multi-level association value calculation and assignment (#3359) 2024-01-10 17:01:20 +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
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
chenos
38c19818d3 chore(versions): 😊 publish v0.19.0-alpha.3 2024-01-09 18:32:09 +08:00
chenos
f2de05bea0 fix(client): hide gmt property 2024-01-09 18:12:34 +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
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
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
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