From 288dd65b70eab841eb1305ec94b66409b734e904 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 24 Apr 2020 17:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/plan/components/TestPlanEdit.vue     | 7 ++++---
 .../components/track/plan/components/TestPlanList.vue     | 8 ++++++++
 frontend/src/i18n/en-US.js                                | 3 ++-
 frontend/src/i18n/zh-CN.js                                | 1 +
 package-lock.json                                         | 3 +++
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 package-lock.json

diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index e153c6c891..fed509563c 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -54,10 +54,11 @@
             <el-form-item :label="$t('test_track.plan.plan_stage')" :label-width="formLabelWidth" prop="stage">
               <el-select v-model="form.stage" clearable :placeholder="$t('test_track.plan.input_plan_stage')">
                 <el-option :label="$t('test_track.plan.smoke_test')" value="smoke"></el-option>
-                <el-option :label="$t('test_track.plan.functional_test')" value="functional"></el-option>
-                <el-option :label="$t('test_track.plan.integration_testing')" value="integration"></el-option>
+                <!--<el-option :label="$t('test_track.plan.functional_test')" value="functional"></el-option>-->
+                <!--<el-option :label="$t('test_track.plan.integration_testing')" value="integration"></el-option>-->
                 <el-option :label="$t('test_track.plan.system_test')" value="system"></el-option>
-                <el-option :label="$t('test_track.plan.version_validation')" value="version"></el-option>
+                <el-option :label="$t('test_track.plan.regression_test')" value="regression"></el-option>
+                <!--<el-option :label="$t('test_track.plan.version_validation')" value="version"></el-option>-->
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 5b84ec3b94..db9b632f75 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -38,6 +38,7 @@
               <span v-if="scope.row.stage == 'functional'">{{$t('test_track.plan.functional_test')}}</span>
               <span v-if="scope.row.stage == 'integration'">{{$t('test_track.plan.integration_testing')}}</span>
               <span v-if="scope.row.stage == 'system'">{{$t('test_track.plan.system_test')}}</span>
+              <span v-if="scope.row.stage == 'regression'">{{$t('test_track.plan.regression_test')}}</span>
               <span v-if="scope.row.stage == 'version'">{{$t('test_track.plan.version_validation')}}</span>
             </template>
           </el-table-column>
@@ -99,6 +100,13 @@
           tableData: [],
         }
       },
+      watch: {
+        '$route'(to, from) {
+          if (to.path.indexOf("/track/plan/all") >= 0){
+            this.initTableData();
+          }
+        }
+      },
       created() {
         this.projectId = this.$route.params.projectId;
         this.initTableData();
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 168978ee04..eea5128c8e 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -239,8 +239,9 @@ export default {
       plan_status: "Status",
       smoke_test: "Smoke test",
       functional_test: "Functional test",
-      integration_testing: "Integration testing",
+      integration_testing: "Integration test",
       system_test: "System test",
+      regression_test: "Regression test",
       version_validation: "Version validation",
       plan_principal: "Principal",
       input_plan_name: "Please input plan name",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 1b882a7fee..3eed12849d 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -282,6 +282,7 @@ export default {
       plan_status: "当前状态",
       smoke_test: "冒烟测试",
       functional_test: "功能测试",
+      regression_test: "回归测试",
       integration_testing: "集成测试",
       system_test: "系统测试",
       version_validation: "版本验证",
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..48e341a095
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}