From 6afbabcb6fe2e95c9b2c1aec16411d07d454da0b Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Thu, 13 Jul 2023 16:55:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E"=E4=BF=9D=E5=AD=98=E4=B8=8B=E4=B8=80=E6=9D=A1"?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1012419 --user=王旭 测试计划执行增加“保存并下一条”操作 https://www.tapd.cn/55049933/s/1393169
---
 .../frontend/src/i18n/lang/track/en-US.js     |  1 +
 .../frontend/src/i18n/lang/track/zh-CN.js     |  1 +
 .../frontend/src/i18n/lang/track/zh-TW.js     |  1 +
 .../functional/FunctionalTestCaseEdit.vue     |  5 ++-
 .../functional/TestPlanCommentInput.vue       |  4 +-
 .../functional/TestPlanFunctionalExecute.vue  | 42 ++++++++++++++++---
 6 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
index 1dd69860dc..87163d7f8e 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
@@ -15,6 +15,7 @@ export default {
   planning_execution: "Planning&Execution",
   project: "Project",
   save: "Save",
+  save_and_next: "Save and next",
   return: "Return",
   length_less_than: "Length must be less than or equal to",
   recent_plan: "My recent plan",
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
index 14a194ed58..76cb7db9dc 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-CN.js
@@ -15,6 +15,7 @@ export default {
   cancel: "取 消",
   project: "项目",
   save: "保 存",
+  save_and_next: "保存并下一条",
   return: "返 回",
   length_less_than: "长度必须小于等于",
   recent_plan: "我最近的计划",
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
index 6acdf797cc..b51ab9995c 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/zh-TW.js
@@ -15,6 +15,7 @@ export default {
   cancel: "取 消",
   project: "項目",
   save: "保 存",
+  save_and_next: "保存並下一條",
   return: "返 回",
   length_less_than: "長度必須小於等于",
   recent_plan: "我最近的計劃",
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 7e2ae07a95..6e73fff12b 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -347,7 +347,7 @@ export default {
         },
       };
     },
-    saveCase() {
+    saveCase(command) {
       let param = {};
       param.id = this.testCase.id;
       param.caseId = this.testCase.caseId;
@@ -396,6 +396,9 @@ export default {
           this.testCase.comment = "";
         }
         this.originalStatus = this.testCase.status;
+        if (command === 'save') {
+          this.handleNext();
+        }
       });
     },
     updateTestCases(param) {
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanCommentInput.vue b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanCommentInput.vue
index 2cce634b2d..101ebfa84f 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanCommentInput.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanCommentInput.vue
@@ -103,9 +103,9 @@ export default {
 <style scoped>
 
 .comment-form {
-  padding-right: 20px;
+  padding-right: 10px;
   padding-left: 30px;
-  margin-top: 100px;
+  margin-top: 56px;
 }
 
 .inputWarning :deep(.v-note-panel) {
diff --git a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalExecute.vue b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalExecute.vue
index e3324123d4..9cd333485a 100644
--- a/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalExecute.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/functional/TestPlanFunctionalExecute.vue
@@ -4,13 +4,22 @@
                                        @statusChange="statusChange"
                                        :is-read-only="statusReadOnly"
                                        :status="testCase.status"/>
-    <el-button class="save-btn" type="primary" size="mini" :disabled="isReadOnly" @click="saveCase()">
-      {{$t('test_track.save')}}
-    </el-button>
-
     <test-plan-comment-input
       :data="testCase"
       ref="comment"/>
+
+    <el-dropdown
+      split-button
+      type="primary"
+      class="save-btn"
+      @command="handleCommand"
+      @click="saveCase"
+      size="medium">
+      {{ save }}
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item :command="command">{{ saveAndNext }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
   </el-card>
 </template>
 
@@ -21,6 +30,13 @@ import TestPlanCommentInput from "@/business/plan/view/comonents/functional/Test
 export default {
   name: "TestPlanFunctionalExecute",
   components: {TestPlanCommentInput, TestPlanTestCaseStatusButton},
+  data() {
+    return {
+      save: this.$t('test_track.save'),
+      saveAndNext: this.$t('test_track.save_and_next'),
+      command: 'save_and_next',
+    }
+  },
   props: {
     isReadOnly: Boolean,
     originStatus: String,
@@ -41,7 +57,21 @@ export default {
       this.testCase.status = status;
     },
     saveCase() {
-      this.$emit('saveCase');
+      this.$emit('saveCase',this.command);
+    },
+    handleCommand(e) {
+      switch (e) {
+        case 'save_and_next':
+          this.save = this.$t('test_track.save_and_next');
+          this.saveAndNext = this.$t('test_track.save');
+          this.command = 'save';
+          break;
+        default:
+          this.save = this.$t('test_track.save');
+          this.saveAndNext = this.$t('test_track.save_and_next');
+          this.command = 'save_and_next';
+          break;
+      }
     }
   }
 }
@@ -59,6 +89,8 @@ export default {
 .save-btn {
   float: right;
   margin-top: 10px;
+  margin-block: 10px;
+  margin-right: 10px;
 }
 
 </style>