From 63bd7f1fe32ad5fbc0a23c996628d8defee30969 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 12 Oct 2020 16:22:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/plan/components/TestPlanEdit.vue    | 20 ++---
 .../view/comonents/TestPlanTestCaseEdit.vue   | 81 ++++++++++---------
 .../review/components/TestCaseReviewEdit.vue  | 12 +--
 frontend/src/i18n/en-US.js                    |  5 +-
 frontend/src/i18n/zh-CN.js                    |  5 +-
 frontend/src/i18n/zh-TW.js                    |  5 +-
 6 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index f17c7072ae..b50c8ed87f 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -3,7 +3,7 @@
   <div>
 
     <el-dialog :close-on-click-modal="false"
-               :title="operationType == 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
+               :title="operationType === 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
                :visible.sync="dialogFormVisible"
                @close="close"
                width="65%">
@@ -75,7 +75,8 @@
               :label="$t('test_track.plan.planned_start_time')"
               :label-width="formLabelWidth"
               prop="plannedStartTime">
-              <el-date-picker :placeholder="$t('test_track.plan.planned_start_time')" v-model="form.plannedStartTime" type="datetime" value-format="timestamp"></el-date-picker>
+              <el-date-picker :placeholder="$t('test_track.plan.planned_start_time')" v-model="form.plannedStartTime"
+                              type="datetime" value-format="timestamp"></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -84,7 +85,8 @@
               :label="$t('test_track.plan.planned_end_time')"
               :label-width="formLabelWidth"
               prop="plannedEndTime">
-              <el-date-picker :placeholder="$t('test_track.plan.planned_end_time')" v-model="form.plannedEndTime" type="datetime" value-format="timestamp" ></el-date-picker>
+              <el-date-picker :placeholder="$t('test_track.plan.planned_end_time')" v-model="form.plannedEndTime"
+                              type="datetime" value-format="timestamp"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,7 +104,7 @@
           </el-col>
         </el-row>
 
-        <el-row v-if="operationType == 'edit'" type="flex" justify="left" style="margin-top: 10px;">
+        <el-row v-if="operationType === 'edit'" type="flex" justify="left" style="margin-top: 10px;">
           <el-col :span="19" :offset="1">
             <el-form-item :label="$t('test_track.plan.plan_status')" :label-width="formLabelWidth" prop="status">
               <test-plan-status-button :status="form.status" @statusChange="statusChange"/>
@@ -134,9 +136,9 @@
 
 <script>
 
-import {WORKSPACE_ID} from '../../../../../common/js/constants';
+import {WORKSPACE_ID} from '@/common/js/constants';
 import TestPlanStatusButton from "../common/TestPlanStatusButton";
-import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 
 export default {
@@ -194,7 +196,7 @@ export default {
           let param = {};
           Object.assign(param, this.form);
           param.name = param.name.trim();
-          if (param.name == '') {
+          if (param.name === '') {
             this.$warning(this.$t('test_track.plan.input_plan_name'));
             return;
           }
@@ -206,7 +208,7 @@ export default {
             this.dbProjectIds.forEach(dbId => {
               if (nowIds.indexOf(dbId) === -1 && sign) {
                 sign = false;
-                this.$confirm('取消项目关联会同时取消该项目下已关联的测试用例', '提示', {
+                this.$confirm(this.$t('test_track.case.cancel_relevance_project'), this.$t('commons.prompt'), {
                   confirmButtonText: this.$t('commons.confirm'),
                   cancelButtonText: this.$t('commons.cancel'),
                   type: 'warning'
@@ -263,7 +265,7 @@ export default {
     resetForm() {
       //防止点击修改后，点击新建触发校验
       if (this.$refs['planFrom']) {
-        this.$refs['planFrom'].validate((valid) => {
+        this.$refs['planFrom'].validate(() => {
           this.$refs['planFrom'].resetFields();
           this.form.name = '';
           this.form.projectIds = [];
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index a17de5d2a7..e67919c705 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -26,11 +26,15 @@
               </el-col>
 
               <el-col :span="12" class="head-right">
-                <span class="head-right-tip" v-if="index + 1 == testCases.length">
-                  {{ $t('test_track.plan_view.pre_case') }} : {{ testCases[index - 1] ? testCases[index - 1].name : '' }}
+                <span class="head-right-tip" v-if="index + 1 === testCases.length">
+                  {{ $t('test_track.plan_view.pre_case') }} : {{
+                    testCases[index - 1] ? testCases[index - 1].name : ''
+                  }}
                 </span>
-                <span class="head-right-tip" v-if="index + 1 != testCases.length">
-                  {{ $t('test_track.plan_view.next_case') }} : {{ testCases[index + 1] ? testCases[index + 1].name : '' }}
+                <span class="head-right-tip" v-if="index + 1 !== testCases.length">
+                  {{ $t('test_track.plan_view.next_case') }} : {{
+                    testCases[index + 1] ? testCases[index + 1].name : ''
+                  }}
                 </span>
 
                 <el-button plain size="mini" icon="el-icon-arrow-up"
@@ -49,7 +53,7 @@
 
             </el-row>
 
-            <el-row style="margin-top: 0px;">
+            <el-row style="margin-top: 0;">
               <el-col>
                 <el-divider content-position="left">{{ testCase.name }}</el-divider>
               </el-col>
@@ -65,9 +69,9 @@
               </el-col>
               <el-col :span="5">
                 <span class="cast_label">{{ $t('test_track.case.case_type') }}：</span>
-                <span class="cast_item" v-if="testCase.type == 'functional'">{{ $t('commons.functional') }}</span>
-                <span class="cast_item" v-if="testCase.type == 'performance'">{{ $t('commons.performance') }}</span>
-                <span class="cast_item" v-if="testCase.type == 'api'">{{ $t('commons.api') }}</span>
+                <span class="cast_item" v-if="testCase.type === 'functional'">{{ $t('commons.functional') }}</span>
+                <span class="cast_item" v-if="testCase.type === 'performance'">{{ $t('commons.performance') }}</span>
+                <span class="cast_item" v-if="testCase.type === 'api'">{{ $t('commons.api') }}</span>
               </el-col>
               <el-col :span="13">
                 <test-plan-test-case-status-button class="status-button"
@@ -81,8 +85,8 @@
             <el-row>
               <el-col :span="4" :offset="1">
                 <span class="cast_label">{{ $t('test_track.case.method') }}：</span>
-                <span v-if="testCase.method == 'manual'">{{ $t('test_track.case.manual') }}</span>
-                <span v-if="testCase.method == 'auto'">{{ $t('test_track.case.auto') }}</span>
+                <span v-if="testCase.method === 'manual'">{{ $t('test_track.case.manual') }}</span>
+                <span v-if="testCase.method === 'auto'">{{ $t('test_track.case.auto') }}</span>
               </el-col>
               <el-col :span="5">
                 <span class="cast_label">{{ $t('test_track.case.module') }}：</span>
@@ -101,25 +105,26 @@
               </el-col>
             </el-row>
 
-            <el-row v-if="testCase.method == 'auto' && testCase.testId">
+            <el-row v-if="testCase.method === 'auto' && testCase.testId">
               <el-col class="test-detail" :span="20" :offset="1">
                 <el-tabs v-model="activeTab" type="border-card" @tab-click="testTabChange">
                   <el-tab-pane name="detail" :label="$t('test_track.plan_view.test_detail')">
-                    <api-test-detail :is-read-only="isReadOnly" v-if="testCase.type == 'api'" @runTest="testRun"
+                    <api-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'api'" @runTest="testRun"
                                      :id="testCase.testId" ref="apiTestDetail"/>
-                    <performance-test-detail :is-read-only="isReadOnly" v-if="testCase.type == 'performance'"
+                    <performance-test-detail :is-read-only="isReadOnly" v-if="testCase.type === 'performance'"
                                              @runTest="testRun" :id="testCase.testId" ref="performanceTestDetail"/>
                   </el-tab-pane>
                   <el-tab-pane name="result" :label="$t('test_track.plan_view.test_result')">
-                    <api-test-result :report-id="testCase.reportId" v-if=" testCase.type == 'api'" ref="apiTestResult"/>
+                    <api-test-result :report-id="testCase.reportId" v-if=" testCase.type === 'api'"
+                                     ref="apiTestResult"/>
                     <performance-test-result :is-read-only="isReadOnly" :report-id="testCase.reportId"
-                                             v-if="testCase.type == 'performance'" ref="performanceTestResult"/>
+                                             v-if="testCase.type === 'performance'" ref="performanceTestResult"/>
                   </el-tab-pane>
                 </el-tabs>
               </el-col>
             </el-row>
 
-            <el-row v-if="testCase.method && testCase.method != 'auto'">
+            <el-row v-if="testCase.method && testCase.method !== 'auto'">
               <el-col :span="20" :offset="1">
                 <div>
                   <span class="cast_label">{{ $t('test_track.case.steps') }}：</span>
@@ -219,8 +224,11 @@
                 <ckeditor :editor="editor" :disabled="isReadOnly" :config="editorConfig"
                           v-model="testCase.issues.content"/>
                 <el-row v-if="hasTapdId">
-                  Tapd平台处理人：
-                  <el-select v-model="testCase.tapdUsers" placeholder="请选择处理人" style="width: 20%" multiple
+                  {{ $t('test_track.issue.please_choose_current_owner') }}
+                  <el-select v-model="testCase.tapdUsers"
+                             multiple
+                             style="width: 20%"
+                             :placeholder="$t('test_track.issue.please_choose_current_owner')"
                              collapse-tags>
                     <el-option v-for="(userInfo, index) in users" :key="index" :label="userInfo.user"
                                :value="userInfo.user"/>
@@ -277,7 +285,7 @@
               <el-col :span="15" :offset="1">
                 <div>
                   <span class="cast_label">{{ $t('commons.remark') }}：</span>
-                  <span v-if="testCase.remark == null || testCase.remark == ''"
+                  <span v-if="testCase.remark == null || testCase.remark === ''"
                         style="color: darkgrey">{{ $t('commons.not_filled') }}</span>
                 </div>
                 <div>
@@ -309,8 +317,7 @@ import ApiTestDetail from "./test/ApiTestDetail";
 import ApiTestResult from "./test/ApiTestResult";
 import PerformanceTestDetail from "./test/PerformanceTestDetail";
 import PerformanceTestResult from "./test/PerformanceTestResult";
-import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
-import {CURRENT_PROJECT} from "../../../../../../common/js/constants";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 
 export default {
   name: "TestPlanTestCaseEdit",
@@ -332,7 +339,6 @@ export default {
       issues: [],
       editor: ClassicEditor,
       editorConfig: {
-        // 'increaseIndent','decreaseIndent'
         toolbar: ['heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'insertTable', '|', 'undo', 'redo'],
       },
       readConfig: {toolbar: []},
@@ -388,7 +394,6 @@ export default {
       }
 
       param.results = JSON.stringify(param.results);
-      param.issues = JSON.stringify(this.testCase.issues);
       this.$post('/test/plan/case/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
         this.updateTestCases(param);
@@ -448,11 +453,11 @@ export default {
     },
     initTest() {
       this.$nextTick(() => {
-        if (this.testCase.method == 'auto') {
-          if (this.$refs.apiTestDetail && this.testCase.type == 'api') {
+        if (this.testCase.method === 'auto') {
+          if (this.$refs.apiTestDetail && this.testCase.type === 'api') {
 
             this.$refs.apiTestDetail.init();
-          } else if (this.testCase.type == 'performance') {
+          } else if (this.testCase.type === 'performance') {
             this.$refs.performanceTestDetail.init();
           }
         }
@@ -464,7 +469,7 @@ export default {
       this.activeTab = 'result';
     },
     testTabChange(data) {
-      if (this.testCase.type == 'performance' && data.paneName == 'result') {
+      if (this.testCase.type === 'performance' && data.paneName === 'result') {
         this.$refs.performanceTestResult.checkReportStatus();
         this.$refs.performanceTestResult.init();
       }
@@ -485,7 +490,7 @@ export default {
       });
     },
     getRelatedTest() {
-      if (this.testCase.method == 'auto' && this.testCase.testId && this.testCase.testId != 'other') {
+      if (this.testCase.method === 'auto' && this.testCase.testId && this.testCase.testId !== 'other') {
         this.$get('/' + this.testCase.type + '/get/' + this.testCase.testId, response => {
           let data = response.data;
           if (data) {
@@ -495,7 +500,7 @@ export default {
             this.$warning(this.$t("test_track.case.relate_test_not_find"));
           }
         });
-      } else if (this.testCase.testId === 'other' && this.testCase.method == 'auto') {
+      } else if (this.testCase.testId === 'other' && this.testCase.method === 'auto') {
         this.$warning(this.$t("test_track.case.other_relate_test_not_find"));
       }
     },
@@ -506,9 +511,9 @@ export default {
         let actualResult = this.addPLabel('[' + this.$t('test_track.plan_view.actual_result') + ']');
         this.testCase.steps.forEach(step => {
           let stepPrefix = this.$t('test_track.plan_view.step') + step.num + ':';
-          desc += this.addPLabel(stepPrefix + (step.desc == undefined ? '' : step.desc));
-          result += this.addPLabel(stepPrefix + (step.result == undefined ? '' : step.result));
-          actualResult += this.addPLabel(stepPrefix + (step.actualResult == undefined ? '' : step.actualResult));
+          desc += this.addPLabel(stepPrefix + (step.desc === undefined ? '' : step.desc));
+          result += this.addPLabel(stepPrefix + (step.result === undefined ? '' : step.result));
+          actualResult += this.addPLabel(stepPrefix + (step.actualResult === undefined ? '' : step.actualResult));
         });
         this.testCase.issues.content = desc + this.addPLabel('') + result + this.addPLabel('') + actualResult + this.addPLabel('');
 
@@ -517,8 +522,7 @@ export default {
           if (project.tapdId) {
             this.hasTapdId = true;
             this.result = this.$get("/issues/tapd/user/" + this.testCase.caseId, response => {
-              let data = response.data;
-              this.users = data;
+              this.users = response.data;
             })
           }
         })
@@ -531,27 +535,29 @@ export default {
       this.$post('/test/plan/edit/status/' + planId);
     },
     stepResultChange() {
-      if (this.testCase.method == 'manual') {
+      if (this.testCase.method === 'manual') {
         this.isFailure = this.testCase.steptResults.filter(s => {
           return s.executeResult === 'Failure' || s.executeResult === 'Blocking';
         }).length > 0;
       }
-
     },
     saveIssues() {
       if (!this.testCase.issues.title || !this.testCase.issues.content) {
         this.$warning(this.$t('test_track.issue.title_description_required'));
         return;
       }
+
       let param = {};
       param.title = this.testCase.issues.title;
       param.content = this.testCase.issues.content;
       param.testCaseId = this.testCase.caseId;
       param.tapdUsers = this.testCase.tapdUsers;
+
       this.result = this.$post("/issues/add", param, () => {
         this.$success(this.$t('commons.save_success'));
         this.getIssues(param.testCaseId);
       });
+
       this.issuesSwitch = false;
       this.testCase.issues.title = "";
       this.testCase.issues.content = "";
@@ -559,8 +565,7 @@ export default {
     },
     getIssues(caseId) {
       this.result = this.$get("/issues/get/" + caseId, response => {
-        let data = response.data;
-        this.issues = data;
+        this.issues = response.data;
       })
     },
     closeIssue(row) {
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index 5d9621209d..fba2912cc2 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -80,7 +80,7 @@
           </el-col>
         </el-row>
 
-        <el-row v-if="operationType == 'edit'" type="flex" justify="left" style="margin-top: 10px;">
+        <el-row v-if="operationType === 'edit'" type="flex" justify="left" style="margin-top: 10px;">
           <el-col :span="19" :offset="1">
             <el-form-item :label="$t('test_track.review.review_status')" :label-width="formLabelWidth" prop="status">
               <test-plan-status-button :status="form.status" @statusChange="statusChange"/>
@@ -110,8 +110,8 @@
 <script>
 
 import TestPlanStatusButton from "../../plan/common/TestPlanStatusButton";
-import {WORKSPACE_ID} from "../../../../../common/js/constants";
-import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
+import {WORKSPACE_ID} from "@/common/js/constants";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 
 export default {
   name: "TestCaseReviewEdit",
@@ -169,7 +169,7 @@ export default {
           let param = {};
           Object.assign(param, this.form);
           param.name = param.name.trim();
-          if (param.name == '') {
+          if (param.name === '') {
             this.$warning(this.$t('test_track.plan.input_plan_name'));
             return;
           }
@@ -183,7 +183,7 @@ export default {
             this.dbProjectIds.forEach(dbId => {
               if (nowIds.indexOf(dbId) === -1 && sign) {
                 sign = false;
-                this.$confirm('取消项目关联会同时取消该项目下已关联的测试用例', '提示', {
+                this.$confirm(this.$t('test_track.case.cancel_relevance_project'), this.$t('commons.prompt'), {
                   confirmButtonText: this.$t('commons.confirm'),
                   cancelButtonText: this.$t('commons.cancel'),
                   type: 'warning'
@@ -240,7 +240,7 @@ export default {
     resetForm() {
       //防止点击修改后，点击新建触发校验
       if (this.$refs['reviewForm']) {
-        this.$refs['reviewForm'].validate((valid) => {
+        this.$refs['reviewForm'].validate(() => {
           this.$refs['reviewForm'].resetFields();
           this.form.name = '';
           this.form.stage = '';
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1e757bbd01..bd811be1f0 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -716,6 +716,7 @@ export default {
       status_prepare: 'Prepare',
       status_pass: 'Pass',
       status_un_pass: 'UnPass',
+      cancel_relevance_project: "Disassociating the project will also cancel the associated test cases under the project",
       import: {
         import: "Import test case",
         case_import: "Import test case",
@@ -895,7 +896,9 @@ export default {
       delete: "Delete",
       title_description_required: "Title and description are required",
       close_success: "Closed successfully",
-      preview: "Preview"
+      preview: "Preview",
+      please_choose_current_owner: "Please choose current owner",
+      tapd_current_owner: "Tapd Current Owner：",
     }
   },
   test_resource_pool: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c01f5eff8a..1c2c2057d3 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -718,6 +718,7 @@ export default {
       status_prepare: '未开始',
       status_pass: '通过',
       status_un_pass: '未通过',
+      cancel_relevance_project: "取消项目关联会同时取消该项目下已关联的测试用例",
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
@@ -897,7 +898,9 @@ export default {
       delete: "删除缺陷",
       title_description_required: "标题和描述必填",
       close_success: "关闭成功",
-      preview: "预览"
+      preview: "预览",
+      please_choose_current_owner: "请选择处理人",
+      tapd_current_owner: "Tapd平台处理人：",
     }
   },
   test_resource_pool: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a3627683fc..73efcfc7af 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -718,6 +718,7 @@ export default {
       status_prepare: '未開始',
       status_pass: '通過',
       status_un_pass: '未通過',
+      cancel_relevance_project: "取消項目關聯會同時取消該項目下已關聯的測試用例",
       import: {
         import: "導入用例",
         case_import: "導入測試用例",
@@ -897,7 +898,9 @@ export default {
       delete: "刪除缺陷",
       title_description_required: "標題和描述必填",
       close_success: "關閉成功",
-      preview: "預覽"
+      preview: "預覽",
+      please_choose_current_owner: "請選擇處理人",
+      tapd_current_owner: "Tapd平台處理人：",
     }
   },
   test_resource_pool: {