diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 66d1f55..d2c9223 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -525,7 +525,7 @@ const local: App.I18n.Schema = { form: { groupName: 'Please enter group name', token: 'Please enter Token', - groupStatus: 'Group status', + groupStatus: 'Please select group status', description: 'Please enter description', idGeneratorMode: 'Please select ID generator mode', groupPartition: 'Please select Group partition', diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index 3eb66ab..b81cfc4 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -378,9 +378,15 @@ declare namespace Api { /** groupConfig search params */ type GroupConfigSearchParams = CommonType.RecordNullable< - Pick & CommonSearchParams + Pick & CommonSearchParams >; + /** export groupConfig */ + type ExportGroupConfig = Common.CommonRecord<{ + groupIds: string[]; + }> & + CommonType.RecordNullable>; + type GroupConfigRequestVO = { groupName: string; groupStatus: GroupStatusType; diff --git a/src/views/group/index.vue b/src/views/group/index.vue index 768e8f8..d4c3142 100644 --- a/src/views/group/index.vue +++ b/src/views/group/index.vue @@ -161,8 +161,16 @@ function edit(id: string) { handleEdit(id); } +function body(): Api.GroupConfig.ExportGroupConfig { + return { + groupName: searchParams.groupName, + groupStatus: searchParams.groupStatus, + groupIds: checkedRowKeys.value + }; +} + function handleExport() { - downloadFetch('/group/export', checkedRowKeys.value, $t('page.groupConfig.title')); + downloadFetch('/group/export', body(), $t('page.groupConfig.title')); } diff --git a/src/views/group/modules/group-operate-drawer.vue b/src/views/group/modules/group-operate-drawer.vue index 80c8654..88d8cf4 100644 --- a/src/views/group/modules/group-operate-drawer.vue +++ b/src/views/group/modules/group-operate-drawer.vue @@ -66,15 +66,6 @@ type RuleKey = Extract< 'groupName' | 'token' | 'groupStatus' | 'idGeneratorMode' | 'initScene' | 'groupPartition' >; -// const rules: Record = { -// groupName: defaultRequiredRule, -// token: defaultRequiredRule, -// groupStatus: defaultRequiredRule, -// idGeneratorMode: defaultRequiredRule, -// initScene: defaultRequiredRule, -// groupPartition: defaultRequiredRule -// }; - const rules = { groupName: [ defaultRequiredRule, diff --git a/src/views/group/modules/group-search.vue b/src/views/group/modules/group-search.vue index b585bd6..0b12033 100644 --- a/src/views/group/modules/group-search.vue +++ b/src/views/group/modules/group-search.vue @@ -1,5 +1,7 @@