Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java

@@ -124,11 +124,17 @@ public class TestCaseNodeService {
 
         testCases.forEach(testCase -> {
             StringBuilder path = new StringBuilder(testCase.getNodePath());
-            List<String> list = Arrays.asList(path.toString().split("/"));
-            list.set(request.getLevel(), request.getName());
+            List<String> pathLists = Arrays.asList(path.toString().split("/"));
+
+            if (request.getLevel() <= pathLists.size()) {
+                pathLists.set(request.getLevel(), request.getName());
+            } else {
+                pathLists.add(request.getName());
+            }
+
             path.delete( 0, path.length());
-            for (int i = 1; i < list.size(); i++) {
-                path = path.append("/").append(list.get(i));
+            for (int i = 1; i < pathLists.size(); i++) {
+                path = path.append("/").append(pathLists.get(i));
             }
             testCase.setNodePath(path.toString());
         });

frontend/src/business/components/performance/report/PerformanceReportView.vue

 <template>
-  <div v-loading="result.loading" class="container">
-    <div class="main-content">
-      <el-card>
+  <ms-container>
+    <ms-main-container>
+      <el-card v-loading="result.loading">
         <el-row>
           <el-col :span="16">
             <el-row>
@@ -51,8 +51,8 @@
         </el-tabs>
 
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
@@ -60,6 +60,8 @@
   import MsReportLogDetails from './components/LogDetails';
   import MsReportRequestStatistics from './components/RequestStatistics';
   import MsReportTestOverview from './components/TestOverview';
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
     name: "PerformanceReportView",
@@ -67,7 +69,9 @@
       MsReportErrorLog,
       MsReportLogDetails,
       MsReportRequestStatistics,
-      MsReportTestOverview
+      MsReportTestOverview,
+      MsContainer,
+      MsMainContainer
     },
     data() {
       return {

frontend/src/business/components/performance/report/PerformanceTestReport.vue

 <template>
-  <div class="container" v-loading="result.loading">
-
-    <div class="main-content">
-      <el-card class="table-card">
+  <ms-container>
+    <ms-main-container>
+      <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
           <div>
             <el-row type="flex" justify="space-between" align="middle">
@@ -84,17 +83,18 @@
         <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                              :total="total"/>
       </el-card>
-    </div>
-
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
   import MsTablePagination from "../../common/pagination/TablePagination";
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
     name: "PerformanceTestReport",
-    components: {MsTablePagination},
+    components: {MsTablePagination, MsContainer, MsMainContainer},
     created: function () {
       this.initTableData();
     },

frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue

 <template>
-  <div class="container" v-loading="result.loading">
-    <div class="main-content">
-      <el-card>
+  <ms-container>
+    <ms-main-container>
+      <el-card v-loading="result.loading">
         <el-row>
           <el-col :span="10">
             <el-input :placeholder="$t('load_test.input_name')" v-model="testPlan.name" class="input-with-select">
@@ -37,21 +37,25 @@
           </el-tab-pane>
         </el-tabs>
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
   import PerformanceBasicConfig from "./components/PerformanceBasicConfig";
   import PerformancePressureConfig from "./components/PerformancePressureConfig";
   import PerformanceAdvancedConfig from "./components/PerformanceAdvancedConfig";
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
     name: "EditPerformanceTestPlan",
     components: {
       PerformancePressureConfig,
       PerformanceBasicConfig,
-      PerformanceAdvancedConfig
+      PerformanceAdvancedConfig,
+      MsContainer,
+      MsMainContainer
     },
     data() {
       return {

frontend/src/business/components/performance/test/PerformanceTestPlan.vue

 <template>
-  <div class="container" v-loading="result.loading">
-    <div class="main-content">
-      <el-card class="table-card">
+  <ms-container>
+    <ms-main-container>
+      <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
           <div>
             <el-row type="flex" justify="space-between" align="middle">
@@ -85,16 +85,23 @@
         <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                              :total="total"/>
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
   import MsTablePagination from "../../common/pagination/TablePagination";
   import MsTableOperator from "../../common/components/MsTableOperator";
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
-    components: {MsTablePagination, MsTableOperator},
+    components: {
+      MsTablePagination,
+      MsTableOperator,
+      MsContainer,
+      MsMainContainer
+    },
     data() {
       return {
         result: {},

frontend/src/business/components/project/MsProject.vue

@@ -9,7 +9,7 @@
         <el-table :data="items" style="width: 100%">
           <el-table-column prop="name" :label="$t('commons.name')"/>
           <el-table-column prop="description" :label="$t('commons.description')"/>
-          <el-table-column prop="workspaceName" label="所属工作空间"/>
+          <el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>
           <el-table-column>
             <template v-slot:default="scope">
               <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>

frontend/src/business/components/settings/Setting.vue

@@ -35,7 +35,7 @@
     padding: 20px;
   }
 
-  .ms-main-container {
+  ms-main-container {
     height: calc(100vh - 40px);
   }
 

frontend/src/business/components/settings/personal/PersonSetting.vue

@@ -12,10 +12,10 @@
       <!--Personal information menu-->
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="id" label="ID"/>
-        <el-table-column prop="name" :label="$t('commons.username')" width="120"/>
+        <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column prop="createTime" :label="$t('commons.create_time')" width="180">
+        <el-table-column prop="createTime" :label="$t('commons.create_time')">
           <template v-slot:default="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>

frontend/src/business/components/settings/system/Organization.vue

@@ -8,7 +8,6 @@
       </template>
       <!-- system menu organization table-->
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="selection" width="55"/>
         <el-table-column prop="name" :label="$t('commons.name')"/>
         <el-table-column prop="description" :label="$t('commons.description')"/>
         <el-table-column :label="$t('commons.member')">

frontend/src/business/components/settings/system/User.vue

@@ -8,12 +8,11 @@
       </template>
 
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="selection" width="55"/>
         <el-table-column prop="id" label="ID"/>
-        <el-table-column prop="name" :label="$t('commons.username')" width="120"/>
+        <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column prop="status" :label="$t('commons.status')" width="100">
+        <el-table-column prop="status" :label="$t('commons.status')">
           <template v-slot:default="scope">
             <el-switch v-model="scope.row.status"
                        active-color="#13ce66"