Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6

# Conflicts:
#	frontend/src/business/components/settings/project/MsProject.vue

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit 068127ce59ea8b016434ed52a9de4a7a4b13bdb4
+Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f

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

@@ -3,7 +3,12 @@
     <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.project')"/>
+                         :create-tip="btnTips" :title="$t('commons.project')">
+          <template v-slot:button>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-box"
+                             :content="$t('api_test.jar_config.title')" @click="openJarConfig"/>
+          </template>
+        </ms-table-header>
       </template>
       <el-table border class="adjust-table" :data="items" style="width: 100%" @sort-change="sort">
         <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip/>
@@ -48,7 +53,7 @@
     </el-card>
 
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="createVisible" destroy-on-close @close="handleClose">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="140px" size="small">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
@@ -81,6 +86,8 @@
 
     <api-environment-config ref="environmentConfig"/>
 
+    <ms-jar-config :is-read-only="isReadOnly" ref="jarConfig"/>
+
   </div>
 </template>
 
@@ -99,10 +106,13 @@
   import ApiEnvironmentConfig from "../../api/test/components/ApiEnvironmentConfig";
   import TemplateComponent from "../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
   import {PROJECT_ID} from "@/common/js/constants";
-
+  import MsJarConfig from "../../api/test/components/jar/JarConfig";
+  import MsTableButton from "../../common/components/MsTableButton";
   export default {
     name: "MsProject",
     components: {
+      MsTableButton,
+      MsJarConfig,
       TemplateComponent,
       ApiEnvironmentConfig,
       MsTableOperatorButton,
@@ -191,7 +201,6 @@
           }
         });
       },
-
       submit(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -209,6 +218,9 @@
           }
         });
       },
+      openJarConfig() {
+        this.$refs.jarConfig.open();
+      },
       handleDelete(project) {
         this.$refs.deleteConfirm.open(project);
       },
@@ -278,5 +290,4 @@
     margin: 0 0;
     font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
   }
-
 </style>

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36
+Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433