From e3570480913a00d4846d8feaa7d58c519e04bc1a Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Mon, 30 Sep 2024 11:47:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92-=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=97=81=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../featureCase/detail/executeSubmit.vue      |   9 +-
 .../detail/featureCase/detail/index.vue       | 103 +++++++++---------
 .../views/test-plan/testPlan/locale/en-US.ts  |   1 +
 .../views/test-plan/testPlan/locale/zh-CN.ts  |   1 +
 4 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executeSubmit.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executeSubmit.vue
index 000c31304f..05160da092 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executeSubmit.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executeSubmit.vue
@@ -10,9 +10,12 @@
       <slot name="headerRight"></slot>
     </template>
   </ExecuteForm>
-  <a-button type="primary" class="mt-[12px]" :loading="submitLoading" @click="() => submit()">
-    {{ t('caseManagement.caseReview.commitResult') }}
-  </a-button>
+  <div class="mt-[12px] flex items-center">
+    <a-button type="primary" :loading="submitLoading" @click="() => submit()">
+      {{ t('caseManagement.caseReview.commitResult') }}
+    </a-button>
+    <slot name="commitRight"></slot>
+  </div>
   <a-modal
     v-model:visible="modalVisible"
     :title="t('testPlan.featureCase.startExecution')"
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
index dd92fc3817..e9a6c1270a 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/index.vue
@@ -128,7 +128,7 @@
                       <div class="flex items-center">
                         <a-switch v-model:model-value="autoNext" size="small" />
                         <div class="mx-[8px]">{{ t('caseManagement.caseReview.autoNext') }}</div>
-                        <a-tooltip position="top">
+                        <a-tooltip position="tr">
                           <template #content>
                             <div>{{ t('testPlan.featureCase.autoNextTip1') }}</div>
                             <div>{{ t('testPlan.featureCase.autoNextTip2') }}</div>
@@ -138,60 +138,59 @@
                             size="16"
                           />
                         </a-tooltip>
-                        <MsTag type="danger" theme="light" size="medium" class="ml-4">
-                          <MsIcon type="icon-icon_defect" class="!text-[14px] text-[rgb(var(--danger-6))]" size="16" />
-                          <span class="ml-1 text-[rgb(var(--danger-6))]"> {{ t('testPlan.featureCase.bug') }}</span>
-                          <span class="ml-1 text-[rgb(var(--danger-6))]">{{ caseDetail.bugListCount }}</span>
-                        </MsTag>
-                        <a-dropdown @select="handleSelect">
-                          <a-button
-                            v-if="hasAllPermission(['PROJECT_BUG:READ', 'PROJECT_TEST_PLAN:READ+EXECUTE'])"
-                            type="outline"
-                            size="small"
-                            class="ml-1"
-                          >
-                            <template #icon> <icon-plus class="text-[12px]" /> </template>
-                          </a-button>
-                          <template #content>
-                            <a-doption
-                              v-permission="['PROJECT_BUG:READ+ADD']"
-                              :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
-                              value="new"
-                              >{{ t('common.newCreate') }}</a-doption
-                            >
-                            <a-doption
-                              v-if="createdBugCount > 0 && hasAnyPermission(['PROJECT_BUG:READ'])"
-                              :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
-                              value="link"
-                              >{{ t('common.associated') }}</a-doption
-                            >
-                            <a-popover v-else title="" position="left">
-                              <a-doption
-                                v-if="createdBugCount < 1 && hasAnyPermission(['PROJECT_BUG:READ'])"
-                                :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
-                                value="link"
-                                >{{ t('common.associated') }}</a-doption
-                              >
-                              <template #content>
-                                <div class="flex items-center text-[14px]">
-                                  <span class="text-[var(--color-text-4)]">{{
-                                    t('testPlan.featureCase.noBugDataTooltip')
-                                  }}</span>
-                                  <MsButton
-                                    :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
-                                    type="text"
-                                    @click="handleSelect('new')"
-                                  >
-                                    {{ t('testPlan.featureCase.noBugDataNewBug') }}
-                                  </MsButton>
-                                </div>
-                              </template>
-                            </a-popover>
-                          </template>
-                        </a-dropdown>
                       </div>
                     </div>
                   </template>
+                  <template #commitRight>
+                    <a-dropdown @select="handleSelect">
+                      <a-button
+                        v-if="hasAllPermission(['PROJECT_BUG:READ', 'PROJECT_TEST_PLAN:READ+EXECUTE'])"
+                        type="outline"
+                        class="ml-[12px]"
+                      >
+                        <template #icon> <MsIcon type="icon-icon_add_outlined"></MsIcon> </template>
+                        {{ t('testPlan.featureCase.addBug') }}
+                      </a-button>
+                      <template #content>
+                        <a-doption
+                          v-permission="['PROJECT_BUG:READ+ADD']"
+                          :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
+                          value="new"
+                        >
+                          {{ t('testPlan.featureCase.noBugDataNewBug') }}
+                        </a-doption>
+                        <a-doption
+                          v-if="createdBugCount > 0 && hasAnyPermission(['PROJECT_BUG:READ'])"
+                          :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
+                          value="link"
+                        >
+                          {{ t('caseManagement.featureCase.linkDefect') }}
+                        </a-doption>
+                        <a-popover v-else title="" position="left">
+                          <a-doption
+                            v-if="createdBugCount < 1 && hasAnyPermission(['PROJECT_BUG:READ'])"
+                            :disabled="!hasAnyPermission(['PROJECT_BUG:READ'])"
+                            value="link"
+                            >{{ t('caseManagement.featureCase.linkDefect') }}</a-doption
+                          >
+                          <template #content>
+                            <div class="flex items-center text-[14px]">
+                              <span class="text-[var(--color-text-4)]">{{
+                                t('testPlan.featureCase.noBugDataTooltip')
+                              }}</span>
+                              <MsButton
+                                :disabled="!hasAnyPermission(['PROJECT_BUG:READ+ADD'])"
+                                type="text"
+                                @click="handleSelect('new')"
+                              >
+                                {{ t('testPlan.featureCase.noBugDataNewBug') }}
+                              </MsButton>
+                            </div>
+                          </template>
+                        </a-popover>
+                      </template>
+                    </a-dropdown>
+                  </template>
                 </ExecuteSubmit>
               </div>
             </div>
diff --git a/frontend/src/views/test-plan/testPlan/locale/en-US.ts b/frontend/src/views/test-plan/testPlan/locale/en-US.ts
index 7fea7300a3..655788f38f 100644
--- a/frontend/src/views/test-plan/testPlan/locale/en-US.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/en-US.ts
@@ -19,6 +19,7 @@ export default {
   'testPlan.testPlanIndex.useCount': 'Use cases',
   'testPlan.testPlanIndex.bugCount': 'bug count',
   'testPlan.featureCase.bug': 'bug',
+  'testPlan.featureCase.addBug': 'Add bug',
   'testPlan.testPlanIndex.belongModule': 'belong module',
   'testPlan.testPlanIndex.createTime': 'create time',
   'testPlan.testPlanIndex.operation': 'operation',
diff --git a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
index 654517d8d0..43d39558e8 100644
--- a/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
+++ b/frontend/src/views/test-plan/testPlan/locale/zh-CN.ts
@@ -99,6 +99,7 @@ export default {
   'testPlan.bugManagement.defectState': '缺陷状态',
   'testPlan.featureCase.bugCount': '缺陷数',
   'testPlan.featureCase.bug': '缺陷',
+  'testPlan.featureCase.addBug': '添加缺陷',
   'testPlan.featureCase.executor': '执行人',
   'testPlan.featureCase.changeExecutor': '修改执行人',
   'testPlan.featureCase.batchChangeExecutor': '批量修改执行人',