Commit Graph

495 Commits

Author SHA1 Message Date
12142f9654 fix: grouped-table type error 2024-03-27 17:11:02 +08:00
f364b40e79 Merge remote-tracking branch 'upstream/main' into merge_from_upstream 2024-03-27 17:03:22 +08:00
YANG QIA
996e89fb14
fix(data-vi): charts flickers (#3836) 2024-03-27 15:43:11 +08:00
katherinehhh
e95f4ab123
fix: acl e2e failed (#3835)
* test: acl e2e test

* refactor: test: acle e2e test fix
2024-03-27 14:34:59 +08:00
katherinehhh
d3bd0c71dd
chore: menu permissions & plugins setting permissions (#3822)
* chore: menu permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions
2024-03-27 12:03:24 +08:00
katherinehhh
78697e02be
fix: missing button icon (#3832)
* refactor: action icon

* Revert "refactor: action icon (#3831)"

This reverts commit c8e334d8ab.

* refactor: action icon
2024-03-27 11:37:58 +08:00
katherinehhh
c8e334d8ab
refactor: action icon (#3831) 2024-03-27 11:23:34 +08:00
chenos
339822241f chore(versions): 😊 publish v0.20.0-alpha.17 2024-03-26 17:25:06 +08:00
chenos
c4aa8b78c2
chore: add tsdoc (#3788)
* chore: tsdoc

* chore: tsdoc

* fix: error

* chore: code format

* chore: code format
2024-03-26 17:08:45 +08:00
Junyi
080e491a0d
fix(plugin-workflow-manual): fix schema migration (#3814) 2024-03-25 21:57:58 +08:00
Zeke Zhang
1c32983c00
refactor(DataBlock): table block (#3748)
* refactor: remove useless code

* chore: remove useless code

* feat: add createTableBlockSchema

* refactor: use createTableBlockUISchema

* refactor: extract useTableBlockParams

* refactor: extract useTableBlockSourceId

* refactor: compat

* refactor: fix typo in createTableBlockUISchema file

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

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

* chore: fix unit tests

* fix: fix errors

* refactor: refactor data block source ID hooks
2024-03-25 17:35:57 +08:00
Zeke Zhang
0269a1ff7d
fix(Details): block template (#3807)
* fix: add 'Details' in condition

* fix: block template
2024-03-25 16:25:41 +08:00
YANG QIA
088f3977a2
feat(data-vi): support multiple data sources (#3743)
* feat(data-vi): support multiple data sources

* chore: update

* chore: new pr

* chore: update

* chore: merge

* fix: bug

* fix: isDBInstance

* fix: fix T-3624

* fix: fix T-3625

* fix: test

* fix: fix T-3659

* fix: fix T-3660

* fix: backend tests

* fix: acl

* fix: fix T-3680

* fix: build
2024-03-25 14:54:13 +08:00
Junyi
d691e4c7e6
feat(plugin-workflow): support multiple data source in workflow (#3739)
* feat(plugin-workflow): support multiple data source in workflow

* fix(plugin-workflow): fix test cases

* test(plugin-workflow-sql): debug test case

* fix(plugin-workflow): fix collection trigger creation without config

* test(plugin-workflow-sql): debug test case

* fix: workflow e2e test

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* chore(ci): disable console intercept in vitest

* test(plugin-workflow-sql): debug test case

* test: approval e2e

* fix: remove pro-plugins from packages

* refactor(plugin-workflow): support pass collection from props to CollectionBlockInitializer

* test(plugin-workflow): add test case

* fix(plugin-workflow): disable modification of executed workflow

* fix: e2ePageObjectModel

* fix: load data source when data source load failed (#3793)

* chore: console.log

* fix(subTable): fix sorting rule setting (#3795)

* fix: through collection support search (#3800)

* fix(client): visible -> useVisible

* fix(client): fix action designer error occured in custom form (#3801)

* fix(client): fix action designer error occured in custom form

* fix(client): fix from the source

* chore(module): remove submodule

* fix(plugin-workflow): fix client cycling import

* fix(plugin-workflow): fix collection event name

* fix(plugin-workflow): fix undefined ref

---------

Co-authored-by: hongboji <j414562100@qq.com>
Co-authored-by: ChengLei Shao <chareice@live.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
Co-authored-by: katherinehhh <shunai.tang@hand-china.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2024-03-25 14:46:22 +08:00
katherinehhh
5e22103e33
chore: file collection template preset fields should be disabled (#3810) 2024-03-25 11:39:52 +08:00
Junyi
e9e116e476
fix(plugin-workflow): remove string template in condition calculation (#3688) 2024-03-25 11:34:14 +08:00
jack zhang
00cf5fa02c
fix: refresh collection name when update (#3797) 2024-03-25 11:30:38 +08:00
jack zhang
570e5c1354
fix: reload when data source click refresh (#3804) 2024-03-25 11:28:54 +08:00
chenos
0dc0d329f8 fix: description 2024-03-25 09:48:08 +08:00
ChengLei Shao
e410dece22
fix: create attachments middleware (#3794) 2024-03-24 19:08:53 +08:00
0249affd47 Merge remote-tracking branch 'origin/main' into merge_from_origin 2024-03-24 01:03:26 +08:00
katherinehhh
fbed0201aa
fix: field permission all fields should be displayed (#3799) 2024-03-23 18:41:57 +08:00
chenos
71ec7ece6a chore(versions): 😊 publish v0.20.0-alpha.16 2024-03-23 17:54:02 +08:00
katherinehhh
00dc004601
refactor: view collection support filterTargetKey config (#3767)
* refactor: view collection support filterTargetkey config

* refactor: locale improve

* refactor: locale improve
2024-03-23 12:17:13 +08:00
ChengLei Shao
4e145a8868
fix: load data source when data source load failed (#3793) 2024-03-22 12:20:12 +08:00
b04d475085 Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-22 03:20:18 +08:00
YANG QIA
9354e25d74
fix(acl): role menu loading status (#3787) 2024-03-21 21:09:24 +08:00
YANG QIA
49759c1ebf
fix(acl): bug when adding users to roles (#3783)
* fix(acl): bug when adding users to roles

* fix: bug
2024-03-21 20:44:06 +08:00
de89814eba Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-21 18:40:03 +08:00
YANG QIA
49d3401379
fix(acl): role menu list only displays one page (#3775)
* fix(acl): role menu list only displays one page

* chore: remove log
2024-03-21 14:30:49 +08:00
Junyi
9b27fa955a
feat(plugin-user): add model method desensitize() to filter hidden field (#3768)
* feat(plugin-user): add model method desensitize() to filter hidden field

* fix(plugin-workflow-action-trigger): fix user fields in context
2024-03-20 23:22:22 +08:00
Junyi
cebb013482
fix(plugin-file-manager): fix storage locale on file template table header (#3769) 2024-03-20 22:25:39 +08:00
chenos
bef9c8ab7b chore(versions): 😊 publish v0.20.0-alpha.15 2024-03-20 14:47:28 +08:00
YANG QIA
6a1be0fcd5
fix(auth): sso auth bug when deploying with subpath (#3764) 2024-03-20 14:46:22 +08:00
ChengLei Shao
a2ae4f7b70
chore: load roles after start (#3763) 2024-03-20 14:40:11 +08:00
ChengLei Shao
5153ce9ab2
fix: uuid field (#3736)
* fix: uuid test

* chore: uuid test

* fix: test

* fix: uuid field name support edit

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-03-20 09:39:11 +08:00
ChengLei Shao
599a1aa0c6
chore: merge sub app database options (#3640) 2024-03-19 20:34:13 +08:00
YANG QIA
b6d17853d8
fix(acl): bug of user filtering when adding them to roles (#3754)
* fix(acl): bug of user filtering when adding them to roles

* chore: add tests
2024-03-19 17:53:13 +08:00
326dcee3d7 fix: handle added ctx 2024-03-19 17:04:56 +08:00
96f90c7024 Merge remote-tracking branch 'origin/main' into merge_from_upstream3 2024-03-19 12:29:09 +08:00
f82dc6a052 refactor: change powered-by 2024-03-19 12:28:27 +08:00
chenos
c75d38bb05 chore(versions): 😊 publish v0.20.0-alpha.14 2024-03-18 18:29:13 +08:00
YANG QIA
3942b7cb94
fix(data-vi): tooltip bug of pie chart (#3745) 2024-03-18 12:33:03 +08:00
chenos
db9ff337e5 chore(versions): 😊 publish v0.20.0-alpha.13 2024-03-17 23:34:26 +08:00
chenos
df153527a7 fix(acl): unable to associate users 2024-03-17 23:30:32 +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
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
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
abec9982fb Merge remote-tracking branch 'origin/main' into merge_from_upstream 2024-03-14 22:19:15 +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
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
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
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
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
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
chenos
2e7da6e29b chore(versions): 😊 publish v0.20.0-alpha.9 2024-03-12 21:15:51 +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
Chareice
023096b1a9
fix: pagination error in roles collections resourcer 2024-03-12 15:15:24 +08:00
jack zhang
de6e8469d3
fix: data source add field refresh(T-3253) (#3645) 2024-03-12 15:13:56 +08:00
ChengLei Shao
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
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
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
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
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
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
Chareice
e7e37b3634
chore(backup-restore): using ctime for Windows compatibility 2024-03-08 20:38:01 +08:00
Junyi
0bb0396754
fix(plugin-workflow): fix migration (#3654) 2024-03-08 17:29:35 +08:00
chenos
63d1a8d90c chore(versions): 😊 publish v0.20.0-alpha.7 2024-03-08 14:11:35 +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
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