Commit Graph

1914 Commits

Author SHA1 Message Date
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
ChengLei Shao
a477facdbf
chore: move collection manager snippets into data source (#3666) 2024-03-10 09:57:14 +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
ChengLei Shao
46daba1e6e
fix: infer postgres field (#3663) 2024-03-09 10:08:32 +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
ChengLei Shao
cacaafd05b
fix: parse association field in acl (#3655) 2024-03-08 09:21:27 +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
chenos
2e3dd1250c fix(acl): create action aliases 2024-03-06 22:56:43 +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
26432ec84c chore(e2e): reduce timeout 2024-03-05 16:32:30 +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
e5a380ff39 fix: import 2024-03-03 23:35:13 +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