From c6ece1d7430c9788a5390d48ae2165880bed4480 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 26 Apr 2024 19:38:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E7=BB=84=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=8A=98=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts                    |   4 +-
 src/locales/langs/zh-cn.ts                    |   4 +-
 src/typings/app.d.ts                          |   3 +-
 .../group/modules/group-operate-drawer.vue    | 155 +++++++++---------
 4 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 3d2a0ea..e5ec23d 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -475,7 +475,9 @@ const local: App.I18n.Schema = {
         description: 'Please enter description',
         idGeneratorMode: 'Please select ID generator mode',
         groupPartition: 'Please select Group partition',
-        initScene: 'Initialized scene'
+        initScene: 'Initialized scene',
+        collapseCommon: 'Common config',
+        collapseRetry: 'Retry config'
       },
       idMode: {
         idWorker: 'Id Workder',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index caa67f9..6c4e55e 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -471,7 +471,9 @@ const local: App.I18n.Schema = {
         description: '描述',
         idGeneratorMode: 'ID生成模式',
         groupPartition: '分区',
-        initScene: '初始化场景'
+        initScene: '初始化场景',
+        collapseCommon: '通用配置',
+        collapseRetry: '重试配置'
       },
       idMode: {
         idWorker: '雪花算法',
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 3536689..1c2cb2e 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -633,7 +633,8 @@ declare namespace App {
             groupPartition: string;
             idGeneratorMode: string;
             initScene: string;
-            // bucketIndex: string;
+            collapseCommon: string;
+            collapseRetry: string;
           };
           idMode: {
             idWorker: string;
diff --git a/src/views/group/modules/group-operate-drawer.vue b/src/views/group/modules/group-operate-drawer.vue
index 4d95f3b..c70295c 100644
--- a/src/views/group/modules/group-operate-drawer.vue
+++ b/src/views/group/modules/group-operate-drawer.vue
@@ -158,83 +158,88 @@ watch(visible, () => {
 <template>
   <OperateDrawer v-model="visible" :title="title" @submitted="handleSubmit">
     <NForm ref="formRef" :model="model" :rules="rules">
-      <NFormItem :label="$t('page.groupConfig.groupName')" path="groupName">
-        <NInput
-          v-model:value="model.groupName"
-          :maxlength="64"
-          show-count
-          :placeholder="$t('page.groupConfig.form.groupName')"
-          :disabled="props.operateType === 'edit'"
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.groupConfig.groupStatus')" path="groupStatus">
-        <NRadioGroup v-model:value="model.groupStatus" name="groupStatus">
-          <NSpace>
-            <NRadio
-              v-for="item in groupConfigStatusOptions"
-              :key="item.value"
-              :value="item.value"
-              :label="$t(item.label)"
+      <NCollapse :default-expanded-names="['1', '2']">
+        <NCollapseItem title="通用配置" name="1">
+          <NFormItem :label="$t('page.groupConfig.groupName')" path="groupName">
+            <NInput
+              v-model:value="model.groupName"
+              :maxlength="64"
+              show-count
+              :placeholder="$t('page.groupConfig.form.groupName')"
+              :disabled="props.operateType === 'edit'"
             />
-          </NSpace>
-        </NRadioGroup>
-      </NFormItem>
-      <NFormItem :label="$t('page.groupConfig.token')" path="token">
-        <NInputGroup>
-          <NInput
-            v-model:value="model.token"
-            :maxlength="64"
-            :placeholder="$t('page.groupConfig.form.token')"
-            :disabled="props.operateType === 'edit'"
-          />
-          <NTooltip trigger="hover">
-            <template #trigger>
-              <NButton type="default" ghost :disabled="props.operateType === 'edit'" @click="setToken">
-                <icon-ic-round-refresh class="text-icon" />
-              </NButton>
-            </template>
-            {{ $t('page.groupConfig.generateToken') }}
-          </NTooltip>
-        </NInputGroup>
-      </NFormItem>
-      <NFormItem :label="$t('page.groupConfig.description')" path="description">
-        <NInput
-          v-model:value="model.description"
-          type="textarea"
-          :maxlength="256"
-          show-count
-          :placeholder="$t('page.groupConfig.form.description')"
-          clearable
-          round
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.groupConfig.idGeneratorMode')" path="idGeneratorMode">
-        <NSelect
-          v-model:value="model.idGeneratorMode"
-          :placeholder="$t('page.groupConfig.form.idGeneratorMode')"
-          :options="translateOptions(groupConfigIdModeOptions)"
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.groupConfig.initScene')" path="initScene">
-        <NRadioGroup v-model:value="model.initScene" name="initScene">
-          <NSpace>
-            <NRadio
-              v-for="item in groupConfigYesOrNoOptions"
-              :key="item.value"
-              :value="item.value"
-              :label="$t(item.label)"
+          </NFormItem>
+          <NFormItem :label="$t('page.groupConfig.groupStatus')" path="groupStatus">
+            <NRadioGroup v-model:value="model.groupStatus" name="groupStatus">
+              <NSpace>
+                <NRadio
+                  v-for="item in groupConfigStatusOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="$t(item.label)"
+                />
+              </NSpace>
+            </NRadioGroup>
+          </NFormItem>
+          <NFormItem :label="$t('page.groupConfig.token')" path="token">
+            <NInputGroup>
+              <NInput
+                v-model:value="model.token"
+                :maxlength="64"
+                :placeholder="$t('page.groupConfig.form.token')"
+                :disabled="props.operateType === 'edit'"
+              />
+              <NTooltip trigger="hover">
+                <template #trigger>
+                  <NButton type="default" ghost :disabled="props.operateType === 'edit'" @click="setToken">
+                    <icon-ic-round-refresh class="text-icon" />
+                  </NButton>
+                </template>
+                {{ $t('page.groupConfig.generateToken') }}
+              </NTooltip>
+            </NInputGroup>
+          </NFormItem>
+          <NFormItem :label="$t('page.groupConfig.description')" path="description">
+            <NInput
+              v-model:value="model.description"
+              type="textarea"
+              :maxlength="256"
+              show-count
+              :placeholder="$t('page.groupConfig.form.description')"
+              clearable
+              round
             />
-          </NSpace>
-        </NRadioGroup>
-      </NFormItem>
-
-      <NFormItem :label="$t('page.groupConfig.groupPartition')" path="groupPartition">
-        <NSelect
-          v-model:value="model.groupPartition"
-          :placeholder="$t('page.groupConfig.form.groupPartition')"
-          :options="translateOptions2(partitionList)"
-        />
-      </NFormItem>
+          </NFormItem>
+        </NCollapseItem>
+        <NCollapseItem title="重试配置" name="2">
+          <NFormItem :label="$t('page.groupConfig.idGeneratorMode')" path="idGeneratorMode">
+            <NSelect
+              v-model:value="model.idGeneratorMode"
+              :placeholder="$t('page.groupConfig.form.idGeneratorMode')"
+              :options="translateOptions(groupConfigIdModeOptions)"
+            />
+          </NFormItem>
+          <NFormItem :label="$t('page.groupConfig.initScene')" path="initScene">
+            <NRadioGroup v-model:value="model.initScene" name="initScene">
+              <NSpace>
+                <NRadio
+                  v-for="item in groupConfigYesOrNoOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="$t(item.label)"
+                />
+              </NSpace>
+            </NRadioGroup>
+          </NFormItem>
+          <NFormItem :label="$t('page.groupConfig.groupPartition')" path="groupPartition">
+            <NSelect
+              v-model:value="model.groupPartition"
+              :placeholder="$t('page.groupConfig.form.groupPartition')"
+              :options="translateOptions2(partitionList)"
+            />
+          </NFormItem>
+        </NCollapseItem>
+      </NCollapse>
     </NForm>
     <template #footer>
       <NSpace :size="16">