Merge remote-tracking branch 'origin/v1.6' into v1.6

backend/src/main/java/io/metersphere/i18n/Translator.java

@@ -17,6 +17,6 @@ public class Translator {
      * 单Key翻译
      */
     public static String get(String key) {
-        return messageSource.getMessage(key, null, "Not Support Key", LocaleContextHolder.getLocale());
+        return messageSource.getMessage(key, null, "Not Support Key: " + key, LocaleContextHolder.getLocale());
     }
 }

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

@@ -1 +1 @@
-Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17
+Subproject commit c10b11f224e4186306e6ae3a3976e29a42af96a5

backend/src/main/resources/i18n/messages_en_US.properties

@@ -60,6 +60,7 @@ test_resource_pool_name_is_null=Test Resource Pool name cannot be null
 test_resource_pool_name_already_exists=The test resource pool name already exists
 load_test=Load Test
 test_resource_pool_is_use=This resource pool is in use and cannot be deleted
+only_one_k8s=Only one K8S can be added
 #project
 project_name_is_null=Project name cannot be null
 project_name_already_exists=The project name already exists

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -60,6 +60,7 @@ test_resource_pool_name_is_null=资源池名称不能为空
 test_resource_pool_name_already_exists=资源池名称已存在
 load_test=性能测试
 test_resource_pool_is_use=正在使用此资源池，无法删除
+only_one_k8s=只能添加一个 K8S
 #project
 project_name_is_null=项目名称不能为空
 project_name_already_exists=项目名称已存在

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -60,6 +60,7 @@ test_resource_pool_name_is_null=資源池名稱不能為空
 test_resource_pool_name_already_exists=資源池名稱已存在
 load_test=性能測試
 test_resource_pool_is_use=正在使用此資源池，無法刪除
+only_one_k8s=只能添加一個 K8S
 #project
 project_name_is_null=項目名稱不能為空
 project_name_already_exists=項目名稱已存在

frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue

@@ -20,11 +20,20 @@
           <div>
             <el-select size="small" :placeholder="$t('api_test.definition.request.grade_info')" v-model="condition.priority"
                        :disabled="isCaseEdit"
-                       class="ms-api-header-select" @change="getApiTest" clearable style="margin-right: 20px">
+                       class="ms-api-header-select" @change="getApiTest" clearable>
               <el-option v-for="grd in priorities" :key="grd.id" :label="grd.name" :value="grd.id"/>
             </el-select>
           </div>
         </el-col>
+
+        <el-col :span="3">
+          <div class="ms-api-header-select" style="margin-right: 20px">
+            <el-input size="small" :placeholder="$t('api_test.definition.request.select_case')"
+                      :disabled="isCaseEdit"
+                      v-model="condition.name" @blur="getApiTest" @keyup.enter.native="getApiTest" />
+          </div>
+        </el-col>
+
         <el-col :span="4">
           <div>
             <ms-environment-select
@@ -33,13 +42,7 @@
               @setEnvironment="setEnvironment"/>
           </div>
         </el-col>
-        <el-col :span="3">
+
-          <div class="ms-api-header-select">
-            <el-input size="small" :placeholder="$t('api_test.definition.request.select_case')"
-                      :disabled="isCaseEdit"
-                      v-model="condition.name" @blur="getApiTest" @keyup.enter.native="getApiTest"/>
-          </div>
-        </el-col>
         <el-col :span="2" v-if="!(isReadOnly || isCaseEdit)">
           <el-dropdown size="small" split-button type="primary" class="ms-api-header-select" @click="addCase"
                        @command="handleCommand" v-tester>
@@ -56,17 +59,17 @@
 
 <script>
 
-    import ApiEnvironmentConfig from "../../../test/components/ApiEnvironmentConfig";
+  import ApiEnvironmentConfig from "../../../test/components/ApiEnvironmentConfig";
-    import {parseEnvironment} from "../../../test/model/EnvironmentModel";
+  import {parseEnvironment} from "../../../test/model/EnvironmentModel";
-    import MsTag from "../../../../common/components/MsTag";
+  import MsTag from "../../../../common/components/MsTag";
-    import MsEnvironmentSelect from "./MsEnvironmentSelect";
+  import MsEnvironmentSelect from "./MsEnvironmentSelect";
-    import {API_METHOD_COLOUR} from "../../model/JsonData";
+  import {API_METHOD_COLOUR} from "../../model/JsonData";
 
-    export default {
+  export default {
-      name: "ApiCaseHeader",
+    name: "ApiCaseHeader",
-      components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig},
+    components: {MsEnvironmentSelect, MsTag, ApiEnvironmentConfig},
-      data() {
+    data() {
-        return {
+      return {
         environments: [],
         environment: {},
         methodColorMap: new Map(API_METHOD_COLOUR),
@@ -171,7 +174,6 @@
     font-size: 10px;
   }
 
-
   .el-col {
     height: 32px;
     line-height: 32px;