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

backend/src/main/java/io/metersphere/service/RegistryParamService.java

-package io.metersphere.service;
-
-import io.metersphere.base.domain.SystemParameter;
-import io.metersphere.base.domain.SystemParameterExample;
-import io.metersphere.base.mapper.SystemParameterMapper;
-import io.metersphere.commons.constants.ParamConstants;
-import io.metersphere.commons.utils.EncryptUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Comparator;
-import java.util.List;
-
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class RegistryParamService {
-    @Resource
-    private SystemParameterMapper parameterMapper;
-
-    public List<SystemParameter> getRegistry(String type) {
-        List<SystemParameter> paramList = this.getParamList(type);
-        for (SystemParameter parameter : paramList) {
-            if (StringUtils.equalsIgnoreCase(ParamConstants.Type.PASSWORD.getValue(), parameter.getType())) {
-                parameter.setParamValue(EncryptUtils.aesDecrypt(parameter.getParamValue()).toString());
-            }
-        }
-        paramList.sort(Comparator.comparingInt(SystemParameter::getSort));
-        return paramList;
-    }
-
-    public void updateRegistry(List<SystemParameter> parameters) {
-        for (SystemParameter parameter : parameters) {
-            if (StringUtils.equalsIgnoreCase(ParamConstants.Type.PASSWORD.getValue(), parameter.getType())) {
-                parameter.setParamValue(EncryptUtils.aesEncrypt(parameter.getParamValue()).toString());
-            }
-            parameterMapper.updateByPrimaryKey(parameter);
-        }
-    }
-
-    public List<SystemParameter> getParamList(String type) {
-        SystemParameterExample example = new SystemParameterExample();
-        example.createCriteria().andParamKeyLike(type + "%");
-        return parameterMapper.selectByExample(example);
-    }
-}

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

@@ -104,14 +104,14 @@
                   <el-input-number v-model="item.maxConcurrency" :min="1" :max="9999"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :offset="2" :span="2">
                 <span class="box">
-                    <el-button @click="addResourceInfo()" type="primary" size="mini" circle>
+                    <el-button @click="addResourceInfo()" type="success" size="mini" circle>
                         <font-awesome-icon :icon="['fas', 'plus']"/>
                     </el-button>
                 </span>
                 <span class="box">
-                    <el-button @click="removeResourceInfo(index)" type="primary" size="mini" circle>
+                    <el-button @click="removeResourceInfo(index)" type="danger" size="mini" circle>
                         <font-awesome-icon :icon="['fas', 'minus']"/>
                     </el-button>
                 </span>
@@ -187,14 +187,14 @@
                   <el-input-number v-model="item.maxConcurrency" :min="1" :max="9999"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :offset="2" :span="2">
                 <span class="box">
-                    <el-button @click="addResourceInfo()" type="primary" size="mini" circle>
+                    <el-button @click="addResourceInfo()" type="success" size="mini" circle>
                         <font-awesome-icon :icon="['fas', 'plus']"/>
                     </el-button>
                 </span>
                 <span class="box">
-                    <el-button @click="removeResourceInfo(index)" type="primary" size="mini" circle>
+                    <el-button @click="removeResourceInfo(index)" type="danger" size="mini" circle>
                         <font-awesome-icon :icon="['fas', 'minus']"/>
                     </el-button>
                 </span>

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

@@ -20,7 +20,7 @@
                        ref="nodeTree"/>
           </el-aside>
 
-          <el-main class="test-case-list">
+          <el-main>
             <test-case-list
               :current-project="currentProject"
               :select-node-ids="selectNodeIds"
@@ -226,7 +226,7 @@
 
 <style scoped>
 
-  .test-case-list {
+  .el-main {
     padding: 15px;
   }
 

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

 <template>
 
-  <div>
-    <el-card class="table-card" v-loading="result.loading">
+  <div class="card-container">
+    <el-card class="card-content" v-loading="result.loading">
       <template v-slot:header>
 
         <ms-table-header :condition.sync="condition" @search="initTableData"

frontend/src/business/components/track/plan/view/TestPlanView.vue

@@ -18,7 +18,7 @@
       </el-aside>
 
       <el-main>
-        <test-plan-test-case-list
+        <test-plan-test-case-list class="table-list"
           @openTestCaseRelevanceDialog="openTestCaseRelevanceDialog"
           @refresh="refresh"
           :plan-id="planId"

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

 <template>
-  <el-card class="table-card" v-loading="result.loading">
+  <div class="card-container">
+    <el-card class="card-content" v-loading="result.loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="initTableData" :show-create="false">
           <template v-slot:title>
@@ -120,6 +121,7 @@
       <test-case-report-view :plan-id="planId" ref="testCaseReportView"/>
 
     </el-card>
+  </div>
 </template>
 
 <script>
@@ -339,5 +341,4 @@
     margin-left: 10px;
     width: 240px;
   }
-
 </style>

frontend/src/common/css/main.css

@@ -8,6 +8,7 @@
 .main-content {
   margin: 0 auto;
   width: 100%;
+  position: absolute;
 }
 
 body {
@@ -33,6 +34,15 @@ body {
   clear: both;
 }
 
+.card-container {
+  position: relative;
+}
+
+.card-content {
+  width: 100%;
+  position: absolute;
+}
+
 .table-card > .el-card__body {
   padding-top: 0;
 }