Merge branch 'master' of https://github.com/metersphere/server

frontend/src/business/components/api/head/ApiHeaderMenus.vue

@@ -88,10 +88,11 @@ export default {
     }
   },
   mounted() {
+    let self = this;
     ApiEvent.$on(LIST_CHANGE, () => {
-      this.$refs.projectRecent.recent();
-      this.$refs.testRecent.recent();
-      this.$refs.reportRecent.recent();
+      self.$refs.projectRecent.recent();
+      self.$refs.testRecent.recent();
+      self.$refs.reportRecent.recent();
     });
   }
 }

frontend/src/business/components/api/report/ApiReportView.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="container" v-loading="loading" :element-loading-text="$t('api_report.running')">
-    <div class="main-content">
+  <ms-container v-loading="loading" :element-loading-text="$t('api_report.running')">
+    <ms-main-container>
       <el-card>
         <section class="report-container" v-if="this.report.testId">
           <header class="report-header">
@@ -39,159 +39,161 @@
           </main>
         </section>
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
 
-  import MsRequestResult from "./components/RequestResult";
-  import MsRequestResultTail from "./components/RequestResultTail";
-  import MsScenarioResult from "./components/ScenarioResult";
-  import MsMetricChart from "./components/MetricChart";
-  import MsScenarioResults from "./components/ScenarioResults";
-  import {Scenario} from "../test/model/ScenarioModel";
-  import writer from "file-writer";
-  import ResumeCss from "../../../../common/css/main.css";
+import MsRequestResult from "./components/RequestResult";
+import MsRequestResultTail from "./components/RequestResultTail";
+import MsScenarioResult from "./components/ScenarioResult";
+import MsMetricChart from "./components/MetricChart";
+import MsScenarioResults from "./components/ScenarioResults";
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 
-  export default {
-    name: "MsApiReportView",
-    components: {MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult},
-    data() {
-      return {
-        activeName: "total",
-        content: {},
-        report: {},
-        loading: true,
-        fails: [],
-        totalTime: 0,
-        isRequestResult: false,
-        request: {},
-        scenarioName: null,
-      }
+export default {
+  name: "MsApiReportView",
+  components: {
+    MsMainContainer,
+    MsContainer, MsScenarioResults, MsRequestResultTail, MsMetricChart, MsScenarioResult, MsRequestResult
+  },
+  data() {
+    return {
+      activeName: "total",
+      content: {},
+      report: {},
+      loading: true,
+      fails: [],
+      totalTime: 0,
+      isRequestResult: false,
+      request: {},
+      scenarioName: null,
+    }
+  },
+  activated() {
+    this.isRequestResult = false
+  },
+  methods: {
+    init() {
+      this.loading = true;
+      this.report = {};
+      this.content = {};
+      this.fails = [];
     },
-    activated() {
+    handleClick(tab, event) {
       this.isRequestResult = false
     },
-    methods: {
-      init() {
-        this.loading = true;
-        this.report = {};
-        this.content = {};
-        this.fails = [];
-      },
-      handleClick(tab, event) {
-        this.isRequestResult = false
-      },
-      getReport() {
-        this.init();
-        if (this.reportId) {
-          let url = "/api/report/get/" + this.reportId;
-          this.$get(url, response => {
-            this.report = response.data || {};
-            if (response.data) {
-              if (this.isNotRunning) {
-                try {
-                  this.content = JSON.parse(this.report.content);
-                } catch (e) {
-                  console.log(this.report.content)
-                  throw e;
-                }
-                this.getFails();
-                this.loading = false;
-              } else {
-                setTimeout(this.getReport, 2000)
+    getReport() {
+      this.init();
+      if (this.reportId) {
+        let url = "/api/report/get/" + this.reportId;
+        this.$get(url, response => {
+          this.report = response.data || {};
+          if (response.data) {
+            if (this.isNotRunning) {
+              try {
+                this.content = JSON.parse(this.report.content);
+              } catch (e) {
+                console.log(this.report.content)
+                throw e;
               }
-            } else {
+              this.getFails();
               this.loading = false;
-              this.$error(this.$t('api_report.not_exist'));
+            } else {
+              setTimeout(this.getReport, 2000)
             }
-          });
-        }
-      },
-      getFails() {
-        if (this.isNotRunning) {
-          this.fails = [];
-          this.totalTime = 0
-          this.content.scenarios.forEach((scenario) => {
-            this.totalTime = this.totalTime + Number(scenario.responseTime)
-            let failScenario = Object.assign({}, scenario);
-            if (scenario.error > 0) {
-              this.fails.push(failScenario);
-              failScenario.requestResults = [];
-              scenario.requestResults.forEach((request) => {
-                if (!request.success) {
-                  let failRequest = Object.assign({}, request);
-                  failScenario.requestResults.push(failRequest);
-                }
-              })
-
-            }
-          })
-        }
-      },
-      requestResult(requestResult) {
-        this.isRequestResult = false;
-        this.$nextTick(function () {
-          this.isRequestResult = true;
-          this.request = requestResult.request;
-          this.scenarioName = requestResult.scenarioName;
+          } else {
+            this.loading = false;
+            this.$error(this.$t('api_report.not_exist'));
+          }
         });
       }
     },
+    getFails() {
+      if (this.isNotRunning) {
+        this.fails = [];
+        this.totalTime = 0
+        this.content.scenarios.forEach((scenario) => {
+          this.totalTime = this.totalTime + Number(scenario.responseTime)
+          let failScenario = Object.assign({}, scenario);
+          if (scenario.error > 0) {
+            this.fails.push(failScenario);
+            failScenario.requestResults = [];
+            scenario.requestResults.forEach((request) => {
+              if (!request.success) {
+                let failRequest = Object.assign({}, request);
+                failScenario.requestResults.push(failRequest);
+              }
+            })
 
-    watch: {
-      '$route': 'getReport',
-    },
-
-    created() {
-      this.getReport();
-    },
-
-    computed: {
-      reportId: function () {
-        return this.$route.params.reportId;
-      },
-      path() {
-        return "/api/test/edit?id=" + this.report.testId;
-      },
-      isNotRunning() {
-        return "Running" !== this.report.status;
+          }
+        })
       }
+    },
+    requestResult(requestResult) {
+      this.isRequestResult = false;
+      this.$nextTick(function () {
+        this.isRequestResult = true;
+        this.request = requestResult.request;
+        this.scenarioName = requestResult.scenarioName;
+      });
+    }
+  },
+
+  watch: {
+    '$route': 'getReport',
+  },
+
+  created() {
+    this.getReport();
+  },
+
+  computed: {
+    reportId: function () {
+      return this.$route.params.reportId;
+    },
+    path() {
+      return "/api/test/edit?id=" + this.report.testId;
+    },
+    isNotRunning() {
+      return "Running" !== this.report.status;
     }
   }
+}
 </script>
 <style>
-  .report-container .el-tabs__header {
-    margin-bottom: 1px;
-  }
+.report-container .el-tabs__header {
+  margin-bottom: 1px;
+}
 </style>
 
 <style scoped>
-  .report-container {
-    height: calc(100vh - 150px);
-    min-height: 600px;
-    overflow-y: auto;
-  }
+.report-container {
+  height: calc(100vh - 150px);
+  min-height: 600px;
+  overflow-y: auto;
+}
 
-  .report-header {
-    font-size: 15px;
-  }
+.report-header {
+  font-size: 15px;
+}
 
-  .report-header a {
-    text-decoration: none;
-  }
+.report-header a {
+  text-decoration: none;
+}
 
-  .report-header .time {
-    color: #909399;
-    margin-left: 10px;
-  }
+.report-header .time {
+  color: #909399;
+  margin-left: 10px;
+}
 
-  .report-container .fail {
-    color: #F56C6C;
-  }
+.report-container .fail {
+  color: #F56C6C;
+}
 
-  .report-container .is-active .fail {
-    color: inherit;
-  }
+.report-container .is-active .fail {
+  color: inherit;
+}
 </style>

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="container">
-    <div class="main-content">
+  <ms-container>
+    <ms-main-container>
       <el-card>
         <el-container class="test-container" v-loading="result.loading">
           <el-header>
@@ -60,8 +60,8 @@
                                   :scenarios="test.scenarioDefinition" :project-id="test.projectId" ref="config"/>
         </el-container>
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
@@ -74,11 +74,16 @@ import MsScheduleConfig from "../../common/components/MsScheduleConfig";
 import ApiImport from "./components/import/ApiImport";
 import {getUUID} from "../../../../common/js/utils";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 
 export default {
   name: "MsApiTestConfig",
 
-  components: {ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig},
+  components: {
+    MsMainContainer,
+    MsContainer, ApiImport, MsScheduleConfig, MsApiReportDialog, MsApiReportStatus, MsApiScenarioConfig
+  },
 
   props: ["id"],
 

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -14,10 +14,10 @@
                              :content="$t('test_track.case.import.import')" @click="importTestCase"/>
             <ms-table-button :is-tester-permission="true" icon="el-icon-upload2"
                              :content="$t('test_track.case.export.export')" @click="handleBatch('export')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-right" :content="$t('test_track.case.move')"
-                             @click="handleBatch('move')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-delete" :content="$t('test_track.case.delete')"
-                             @click="handleBatch('delete')"/>
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-right" :content="$t('test_track.case.move')"-->
+<!--                             @click="handleBatch('move')"/>-->
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-delete" :content="$t('test_track.case.delete')"-->
+<!--                             @click="handleBatch('delete')"/>-->
             <!--<test-case-export/>-->
           </template>
         </ms-table-header>

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -15,13 +15,13 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-unlock"
-                             :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline"
-                             :content="$t('test_track.plan_view.change_execution_results')"
-                             @click="handleBatch('status')"/>
-            <ms-table-button :is-tester-permission="true" icon="el-icon-user"
-                             :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-unlock"-->
+<!--                             :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>-->
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline"-->
+<!--                             :content="$t('test_track.plan_view.change_execution_results')"-->
+<!--                             @click="handleBatch('status')"/>-->
+<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-user"-->
+<!--                             :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>-->
             <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
                              :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
             <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"