From 8394d880931ac53b079ba17e857dfba574347db2 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 11 Nov 2020 16:02:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/performance/router.js | 10 +--
 ...ceTestPlan.vue => EditPerformanceTest.vue} | 62 +++++++++----------
 ...ceTestPlan.vue => PerformanceTestList.vue} | 20 +++---
 .../components/PerformanceBasicConfig.vue     | 16 ++---
 .../components/PerformancePressureConfig.vue  | 16 +++--
 .../performance/test/model/ThreadGroup.js     | 10 +++
 .../comonents/test/PerformanceTestDetail.vue  | 37 +++++------
 7 files changed, 94 insertions(+), 77 deletions(-)
 rename frontend/src/business/components/performance/test/{EditPerformanceTestPlan.vue => EditPerformanceTest.vue} (83%)
 rename frontend/src/business/components/performance/test/{PerformanceTestPlan.vue => PerformanceTestList.vue} (93%)

diff --git a/frontend/src/business/components/performance/router.js b/frontend/src/business/components/performance/router.js
index d16b239673..8c4197e01d 100644
--- a/frontend/src/business/components/performance/router.js
+++ b/frontend/src/business/components/performance/router.js
@@ -2,8 +2,8 @@ import MsProject from "@/business/components/project/MsProject";
 
 const PerformanceTest = () => import('@/business/components/performance/PerformanceTest')
 const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
-const EditPerformanceTestPlan = () => import('@/business/components/performance/test/EditPerformanceTestPlan')
-const PerformanceTestPlan = () => import('@/business/components/performance/test/PerformanceTestPlan')
+const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
+const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList')
 const PerformanceTestReport = () => import('@/business/components/performance/report/PerformanceTestReport')
 const PerformanceChart = () => import('@/business/components/performance/report/components/PerformanceChart')
 const PerformanceReportView = () => import('@/business/components/performance/report/PerformanceReportView')
@@ -24,12 +24,12 @@ export default {
     {
       path: 'test/create',
       name: "createPerTest",
-      component: EditPerformanceTestPlan,
+      component: EditPerformanceTest,
     },
     {
       path: "test/edit/:testId",
       name: "editPerTest",
-      component: EditPerformanceTestPlan,
+      component: EditPerformanceTest,
       props: {
         content: (route) => {
           return {
@@ -41,7 +41,7 @@ export default {
     {
       path: "test/:projectId",
       name: "perPlan",
-      component: PerformanceTestPlan
+      component: PerformanceTestList
     },
     {
       path: "project/:type",
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
similarity index 83%
rename from frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
rename to frontend/src/business/components/performance/test/EditPerformanceTest.vue
index f4b652cba5..baf4c660ca 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -4,12 +4,12 @@
       <el-card v-loading="result.loading">
         <el-row>
           <el-col :span="10">
-            <el-input :disabled="isReadOnly" :placeholder="$t('load_test.input_name')" v-model="testPlan.name"
+            <el-input :disabled="isReadOnly" :placeholder="$t('load_test.input_name')" v-model="test.name"
                       class="input-with-select"
                       maxlength="30" show-word-limit
             >
               <template v-slot:prepend>
-                <el-select filterable v-model="testPlan.projectId"
+                <el-select filterable v-model="test.projectId"
                            :placeholder="$t('load_test.select_project')">
                   <el-option
                     v-for="item in projects"
@@ -29,7 +29,7 @@
             <el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{ $t('commons.cancel') }}
             </el-button>
 
-            <ms-schedule-config :schedule="testPlan.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule"
+            <ms-schedule-config :schedule="test.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule"
                                 :check-open="checkScheduleEdit" :test-id="testId" :custom-validate="durationValidate"/>
           </el-col>
         </el-row>
@@ -37,11 +37,11 @@
 
         <el-tabs class="testplan-config" v-model="active" type="border-card" :stretch="true">
           <el-tab-pane :label="$t('load_test.basic_config')">
-            <performance-basic-config :is-read-only="isReadOnly" :test-plan="testPlan" ref="basicConfig"
+            <performance-basic-config :is-read-only="isReadOnly" :test="test" ref="basicConfig"
                                       @fileChange="fileChange"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.pressure_config')">
-            <performance-pressure-config :is-read-only="isReadOnly" :test-plan="testPlan" :test-id="testId"
+            <performance-pressure-config :is-read-only="isReadOnly" :test="test" :test-id="testId"
                                          ref="pressureConfig" @changeActive="changeTabActive"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.advanced_config')" class="advanced-config">
@@ -64,7 +64,7 @@ import MsScheduleConfig from "../../common/components/MsScheduleConfig";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 
 export default {
-  name: "EditPerformanceTestPlan",
+  name: "EditPerformanceTest",
   components: {
     MsScheduleConfig,
     PerformancePressureConfig,
@@ -76,7 +76,7 @@ export default {
   data() {
     return {
       result: {},
-      testPlan: {schedule: {}},
+      test: {schedule: {}},
       listProjectPath: "/project/listAll",
       savePath: "/performance/save",
       editPath: "/performance/edit",
@@ -137,8 +137,8 @@ export default {
     importAPITest() {
       let apiTest = this.$store.state.api.test;
       if (apiTest && apiTest.name) {
-        this.$set(this.testPlan, "projectId", apiTest.projectId);
-        this.$set(this.testPlan, "name", apiTest.name);
+        this.$set(this.test, "projectId", apiTest.projectId);
+        this.$set(this.test, "name", apiTest.name);
         let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"});
         let file = new File([blob], apiTest.jmx.name);
         this.$refs.basicConfig.beforeUpload(file);
@@ -152,9 +152,9 @@ export default {
         this.testId = testId;
         this.result = this.$get('/performance/get/' + testId, response => {
           if (response.data) {
-            this.testPlan = response.data;
-            if (!this.testPlan.schedule) {
-              this.testPlan.schedule = {};
+            this.test = response.data;
+            if (!this.test.schedule) {
+              this.test.schedule = {};
             }
           }
         });
@@ -166,7 +166,7 @@ export default {
       })
     },
     save() {
-      if (!this.validTestPlan()) {
+      if (!this.validTest()) {
         return;
       }
 
@@ -181,16 +181,16 @@ export default {
       });
     },
     saveAndRun() {
-      if (!this.validTestPlan()) {
+      if (!this.validTest()) {
         return;
       }
 
       let options = this.getSaveOption();
 
       this.result = this.$request(options, (response) => {
-        this.testPlan.id = response.data;
+        this.test.id = response.data;
         this.$success(this.$t('commons.save_success'));
-        this.result = this.$post(this.runPath, {id: this.testPlan.id, triggerMode: 'MANUAL'}, (response) => {
+        this.result = this.$post(this.runPath, {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
           let reportId = response.data;
           this.$router.push({path: '/performance/report/view/' + reportId})
           // 发送广播，刷新 head 上的最新列表
@@ -200,7 +200,7 @@ export default {
     },
     getSaveOption() {
       let formData = new FormData();
-      let url = this.testPlan.id ? this.editPath : this.savePath;
+      let url = this.test.id ? this.editPath : this.savePath;
 
       if (this.$refs.basicConfig.uploadList.length > 0) {
         this.$refs.basicConfig.uploadList.forEach(f => {
@@ -208,15 +208,15 @@ export default {
         });
       }
       // 基本配置
-      this.testPlan.updatedFileList = this.$refs.basicConfig.updatedFileList();
+      this.test.updatedFileList = this.$refs.basicConfig.updatedFileList();
       // 压力配置
-      this.testPlan.loadConfiguration = JSON.stringify(this.$refs.pressureConfig.convertProperty());
-      this.testPlan.testResourcePoolId = this.$refs.pressureConfig.resourcePool;
+      this.test.loadConfiguration = JSON.stringify(this.$refs.pressureConfig.convertProperty());
+      this.test.testResourcePoolId = this.$refs.pressureConfig.resourcePool;
       // 高级配置
-      this.testPlan.advancedConfiguration = JSON.stringify(this.$refs.advancedConfig.configurations());
+      this.test.advancedConfiguration = JSON.stringify(this.$refs.advancedConfig.configurations());
 
       // file属性不需要json化
-      let requestJson = JSON.stringify(this.testPlan, function (key, value) {
+      let requestJson = JSON.stringify(this.test, function (key, value) {
         return key === "file" ? undefined : value
       });
 
@@ -236,13 +236,13 @@ export default {
     cancel() {
       this.$router.push({path: '/performance/test/all'})
     },
-    validTestPlan() {
-      if (!this.testPlan.name) {
+    validTest() {
+      if (!this.test.name) {
         this.$error(this.$t('load_test.test_name_is_null'));
         return false;
       }
 
-      if (!this.testPlan.projectId) {
+      if (!this.test.projectId) {
         this.$error(this.$t('load_test.project_is_null'));
         return false;
       }
@@ -269,26 +269,26 @@ export default {
       });
     },
     saveCronExpression(cronExpression) {
-      this.testPlan.schedule.enable = true;
-      this.testPlan.schedule.value = cronExpression;
+      this.test.schedule.enable = true;
+      this.test.schedule.value = cronExpression;
       this.saveSchedule();
     },
     saveSchedule() {
       this.checkScheduleEdit();
       let param = {};
-      param = this.testPlan.schedule;
-      param.resourceId = this.testPlan.id;
+      param = this.test.schedule;
+      param.resourceId = this.test.id;
       let url = '/performance/schedule/create';
       if (param.id) {
         url = '/performance/schedule/update';
       }
       this.$post(url, param, response => {
         this.$success(this.$t('commons.save_success'));
-        this.getTest(this.testPlan.id);
+        this.getTest(this.test.id);
       });
     },
     checkScheduleEdit() {
-      if (!this.testPlan.id) {
+      if (!this.test.id) {
         this.$message(this.$t('api_test.environment.please_save_test'));
         return false;
       }
diff --git a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
similarity index 93%
rename from frontend/src/business/components/performance/test/PerformanceTestPlan.vue
rename to frontend/src/business/components/performance/test/PerformanceTestList.vue
index 1b8b20f9bc..3dc73cfb2f 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -80,7 +80,7 @@ import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceTestStatus from "./PerformanceTestStatus";
 import MsTableOperators from "../../common/components/MsTableOperators";
-import {_filter, _sort} from "../../../../common/js/utils";
+import {_filter, _sort} from "@/common/js/utils";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import {TEST_CONFIGS} from "../../common/components/search/search-components";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
@@ -164,30 +164,30 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    handleEdit(testPlan) {
+    handleEdit(test) {
       this.$router.push({
-        path: '/performance/test/edit/' + testPlan.id,
+        path: '/performance/test/edit/' + test.id,
       })
     },
-    handleCopy(testPlan) {
-      this.result = this.$post("/performance/copy", {id: testPlan.id}, () => {
+    handleCopy(test) {
+      this.result = this.$post("/performance/copy", {id: test.id}, () => {
         this.$success(this.$t('commons.copy_success'));
         this.search();
       });
     },
-    handleDelete(testPlan) {
-      this.$alert(this.$t('load_test.delete_confirm') + testPlan.name + "？", '', {
+    handleDelete(test) {
+      this.$alert(this.$t('load_test.delete_confirm') + test.name + "？", '', {
         confirmButtonText: this.$t('commons.confirm'),
         callback: (action) => {
           if (action === 'confirm') {
-            this._handleDelete(testPlan);
+            this._handleDelete(test);
           }
         }
       });
     },
-    _handleDelete(testPlan) {
+    _handleDelete(test) {
       let data = {
-        id: testPlan.id
+        id: test.id
       };
 
       this.result = this.$post(this.deletePath, data, () => {
diff --git a/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
index c20c42c3f1..79b7a6ae08 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
@@ -61,7 +61,7 @@ import {findThreadGroup} from "@/business/components/performance/test/model/Thre
 export default {
   name: "PerformanceBasicConfig",
   props: {
-    testPlan: {
+    test: {
       type: Object
     },
     isReadOnly: {
@@ -82,14 +82,14 @@ export default {
     };
   },
   created() {
-    if (this.testPlan.id) {
-      this.getFileMetadata(this.testPlan)
+    if (this.test.id) {
+      this.getFileMetadata(this.test)
     }
   },
   watch: {
-    testPlan() {
-      if (this.testPlan.id) {
-        this.getFileMetadata(this.testPlan)
+    test() {
+      if (this.test.id) {
+        this.getFileMetadata(this.test)
       }
     },
     uploadList() {
@@ -107,11 +107,11 @@ export default {
     }
   },
   methods: {
-    getFileMetadata(testPlan) {
+    getFileMetadata(test) {
       this.fileList = [];
       this.tableData = [];
       this.uploadList = [];
-      this.result = this.$get(this.getFileMetadataPath + "/" + testPlan.id, response => {
+      this.result = this.$get(this.getFileMetadataPath + "/" + test.id, response => {
         let files = response.data;
 
         if (!files) {
diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 77ce8f3b99..d2efae530d 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -92,7 +92,7 @@
 <script>
 import echarts from "echarts";
 import MsChart from "@/business/components/common/chart/MsChart";
-import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
+import {findTestPlan, findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
 
 const TARGET_LEVEL = "TargetLevel";
 const RAMP_UP = "RampUp";
@@ -115,7 +115,7 @@ export default {
   name: "PerformancePressureConfig",
   components: {MsChart},
   props: {
-    testPlan: {
+    test: {
       type: Object
     },
     testId: {
@@ -140,6 +140,7 @@ export default {
       resourcePools: [],
       activeNames: ["0"],
       threadGroups: [],
+      serializeThreadgroups: false,
     }
   },
   mounted() {
@@ -148,11 +149,11 @@ export default {
     } else {
       this.calculateTotalChart();
     }
-    this.resourcePool = this.testPlan.testResourcePoolId;
+    this.resourcePool = this.test.testResourcePoolId;
     this.getResourcePools();
   },
   watch: {
-    testPlan(n) {
+    test(n) {
       this.resourcePool = n.testResourcePoolId;
     },
     testId() {
@@ -240,6 +241,12 @@ export default {
       if (this.testId) {
         this.$get('/performance/get-jmx-content/' + this.testId, (response) => {
           if (response.data) {
+            let testPlan = findTestPlan(response.data);
+            testPlan.elements.forEach(e => {
+              if (e.attributes.name === 'TestPlan.serialize_threadgroups') {
+                this.serializeThreadgroups = Boolean(e.elements[0].text);
+              }
+            });
             this.threadGroups = findThreadGroup(response.data);
             this.threadGroups.forEach(tg => {
               tg.options = {};
@@ -273,7 +280,6 @@ export default {
         series: []
       };
 
-
       for (let i = 0; i < handler.threadGroups.length; i++) {
         let seriesData = {
           name: handler.threadGroups[i].attributes.testname,
diff --git a/frontend/src/business/components/performance/test/model/ThreadGroup.js b/frontend/src/business/components/performance/test/model/ThreadGroup.js
index 17c0750ca9..811f83fb51 100644
--- a/frontend/src/business/components/performance/test/model/ThreadGroup.js
+++ b/frontend/src/business/components/performance/test/model/ThreadGroup.js
@@ -18,3 +18,13 @@ export function findThreadGroup(jmxContent) {
   travel(jmxJson.elements, threadGroups);
   return threadGroups;
 }
+
+
+export function findTestPlan(jmxContent) {
+  let jmxJson = JSON.parse(xml2json(jmxContent));
+  for (let element of jmxJson.elements[0].elements[0].elements) {
+    if (element.name === 'TestPlan') {
+      return element;
+    }
+  }
+}
diff --git a/frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestDetail.vue b/frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestDetail.vue
index 4b326ebf8e..8b10c5a4da 100644
--- a/frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestDetail.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestDetail.vue
@@ -19,10 +19,10 @@
 
         <el-tabs class="test-config" v-model="active" type="border-card" :stretch="true">
           <el-tab-pane :label="$t('load_test.basic_config')">
-            <performance-basic-config :is-read-only="true" :test-plan="test" ref="basicConfig"/>
+            <performance-basic-config :is-read-only="true" :test="test" ref="basicConfig"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.pressure_config')">
-            <performance-pressure-config :is-read-only="true" :test-plan="test" :test-id="id" ref="pressureConfig"/>
+            <performance-pressure-config :is-read-only="true" :test="test" :test-id="id" ref="pressureConfig"/>
           </el-tab-pane>
           <el-tab-pane :label="$t('load_test.advanced_config')" class="advanced-config">
             <performance-advanced-config :read-only="true" :test-id="id" ref="advancedConfig"/>
@@ -35,22 +35,23 @@
 
 <script>
 
-  import MsContainer from "../../../../../common/components/MsContainer";
-  import MsMainContainer from "../../../../../common/components/MsMainContainer";
-  import PerformanceBasicConfig from "../../../../../performance/test/components/PerformanceBasicConfig";
-  import PerformancePressureConfig from "../../../../../performance/test/components/PerformancePressureConfig";
-  import PerformanceAdvancedConfig from "../../../../../performance/test/components/PerformanceAdvancedConfig";
-  export default {
-    name: "PerformanceTestDetail",
-    components: {
-      PerformanceAdvancedConfig,
-      PerformancePressureConfig,
-      PerformanceBasicConfig,
-      MsMainContainer,
-      MsContainer
-    },
-    data() {
-      return {
+import MsContainer from "../../../../../common/components/MsContainer";
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import PerformanceBasicConfig from "../../../../../performance/test/components/PerformanceBasicConfig";
+import PerformancePressureConfig from "../../../../../performance/test/components/PerformancePressureConfig";
+import PerformanceAdvancedConfig from "../../../../../performance/test/components/PerformanceAdvancedConfig";
+
+export default {
+  name: "PerformanceTestDetail",
+  components: {
+    PerformanceAdvancedConfig,
+    PerformancePressureConfig,
+    PerformanceBasicConfig,
+    MsMainContainer,
+    MsContainer
+  },
+  data() {
+    return {
         result: {},
         test: {},
         savePath: "/performance/save",