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">
-    <template v-slot:header>
-      <ms-table-header :condition.sync="condition" @search="initTableData" :show-create="false">
-        <template v-slot:title>
-          <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>
-        </template>
-        <template v-slot:button>
-          <ms-table-button v-if="!showMyTestCase" icon="el-icon-s-custom" :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
-          <ms-table-button v-if="showMyTestCase" icon="el-icon-files" :content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/>
-          <ms-table-button icon="el-icon-connection" :content="$t('test_track.plan_view.relevance_test_case')" @click="$emit('openTestCaseRelevanceDialog')"/>
-          <ms-table-button icon="el-icon-edit-outline" :content="$t('test_track.plan_view.change_execution_results')" @click="handleBatch('status')"/>
-          <ms-table-button icon="el-icon-user" :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
-          <ms-table-button v-if="!testPlan.reportId" icon="el-icon-document" :content="$t('创建测试报告')" @click="openTestReport"/>
-          <ms-table-button v-if="testPlan.reportId" icon="el-icon-document" :content="$t('查看测试报告')" @click="openReport"/>
-        </template>
-      </ms-table-header>
-    </template>
+  <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>
+            <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>
+          </template>
+          <template v-slot:button>
+            <ms-table-button v-if="!showMyTestCase" icon="el-icon-s-custom" :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
+            <ms-table-button v-if="showMyTestCase" icon="el-icon-files" :content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/>
+            <ms-table-button icon="el-icon-connection" :content="$t('test_track.plan_view.relevance_test_case')" @click="$emit('openTestCaseRelevanceDialog')"/>
+            <ms-table-button icon="el-icon-edit-outline" :content="$t('test_track.plan_view.change_execution_results')" @click="handleBatch('status')"/>
+            <ms-table-button icon="el-icon-user" :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
+            <ms-table-button v-if="!testPlan.reportId" icon="el-icon-document" :content="$t('创建测试报告')" @click="openTestReport"/>
+            <ms-table-button v-if="testPlan.reportId" icon="el-icon-document" :content="$t('查看测试报告')" @click="openReport"/>
+          </template>
+        </ms-table-header>
+      </template>
 
-    <executor-edit ref="executorEdit" :select-ids="selectIds" @refresh="initTableData"/>
-    <status-edit ref="statusEdit" :select-ids="selectIds" @refresh="initTableData"/>
+      <executor-edit ref="executorEdit" :select-ids="selectIds" @refresh="initTableData"/>
+      <status-edit ref="statusEdit" :select-ids="selectIds" @refresh="initTableData"/>
 
-    <el-table
-      @select-all="handleSelectAll"
-      @filter-change="filter"
-      @sort-change="sort"
-      @select="handleSelectionChange"
-      row-key="id"
-      :data="tableData">
+      <el-table
+        @select-all="handleSelectAll"
+        @filter-change="filter"
+        @sort-change="sort"
+        @select="handleSelectionChange"
+        row-key="id"
+        :data="tableData">
 
-      <el-table-column
-        type="selection"></el-table-column>
+        <el-table-column
+          type="selection"></el-table-column>
 
-      <el-table-column
-        prop="name"
-        :label="$t('commons.name')"
-        show-overflow-tooltip>
-      </el-table-column>
-      <el-table-column
-        prop="priority"
-        :filters="priorityFilters"
-        column-key="priority"
-        :label="$t('test_track.case.priority')">
-        <template v-slot:default="scope">
-          <priority-table-item :value="scope.row.priority" ref="priority"/>
-        </template>
-      </el-table-column>
+        <el-table-column
+          prop="name"
+          :label="$t('commons.name')"
+          show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+          prop="priority"
+          :filters="priorityFilters"
+          column-key="priority"
+          :label="$t('test_track.case.priority')">
+          <template v-slot:default="scope">
+            <priority-table-item :value="scope.row.priority" ref="priority"/>
+          </template>
+        </el-table-column>
 
-      <el-table-column
-        prop="type"
-        :filters="typeFilters"
-        column-key="type"
-        :label="$t('test_track.case.type')"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          <type-table-item :value="scope.row.type"/>
-        </template>
-      </el-table-column>
+        <el-table-column
+          prop="type"
+          :filters="typeFilters"
+          column-key="type"
+          :label="$t('test_track.case.type')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <type-table-item :value="scope.row.type"/>
+          </template>
+        </el-table-column>
 
-      <el-table-column
-        prop="method"
-        :filters="methodFilters"
-        column-key="method"
-        :label="$t('test_track.case.method')"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          <method-table-item :value="scope.row.method"/>
-        </template>
-      </el-table-column>
+        <el-table-column
+          prop="method"
+          :filters="methodFilters"
+          column-key="method"
+          :label="$t('test_track.case.method')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <method-table-item :value="scope.row.method"/>
+          </template>
+        </el-table-column>
 
-      <el-table-column
-        prop="nodePath"
-        :label="$t('test_track.case.module')"
-        show-overflow-tooltip>
-      </el-table-column>
+        <el-table-column
+          prop="nodePath"
+          :label="$t('test_track.case.module')"
+          show-overflow-tooltip>
+        </el-table-column>
 
-      <el-table-column
-        prop="executorName"
-        :label="$t('test_track.plan_view.executor')">
-      </el-table-column>
+        <el-table-column
+          prop="executorName"
+          :label="$t('test_track.plan_view.executor')">
+        </el-table-column>
 
-      <el-table-column
-        prop="status"
-        :filters="statusFilters"
-        column-key="status"
-        :label="$t('test_track.plan_view.execute_result')">
-        <template v-slot:default="scope">
-          <status-table-item :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+        <el-table-column
+          prop="status"
+          :filters="statusFilters"
+          column-key="status"
+          :label="$t('test_track.plan_view.execute_result')">
+          <template v-slot:default="scope">
+            <status-table-item :value="scope.row.status"/>
+          </template>
+        </el-table-column>
 
-      <el-table-column
-        sortable
-        prop="updateTime"
-        :label="$t('commons.update_time')"
-        show-overflow-tooltip>
-        <template v-slot:default="scope">
-          <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('commons.operating')">
-        <template v-slot:default="scope">
-          <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleEdit(scope.row)" />
-          <ms-table-operator-button :tip="$t('test_track.plan_view.cancel_relevance')" icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          sortable
+          prop="updateTime"
+          :label="$t('commons.update_time')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('commons.operating')">
+          <template v-slot:default="scope">
+            <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleEdit(scope.row)" />
+            <ms-table-operator-button :tip="$t('test_track.plan_view.cancel_relevance')" icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
-                         :total="total"/>
+      <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
 
-    <test-plan-test-case-edit
-      ref="testPlanTestCaseEdit"
-      :search-param="condition"
-      @refresh="initTableData"
-      @refreshTable="search"/>
+      <test-plan-test-case-edit
+        ref="testPlanTestCaseEdit"
+        :search-param="condition"
+        @refresh="initTableData"
+        @refreshTable="search"/>
 
-    <test-report-template-list @openReport="openReport" :plan-id="planId" ref="testReporTtemplateList"/>
-    <test-case-report-view :plan-id="planId" ref="testCaseReportView"/>
+      <test-report-template-list @openReport="openReport" :plan-id="planId" ref="testReporTtemplateList"/>
+      <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;
 }