Merge branch 'master' of https://github.com/metersphere/metersphere

frontend/src/business/components/api/report/components/ResponseText.vue

@@ -16,16 +16,16 @@
           <ms-assertion-results :assertions="response.assertions"/>
         </el-tab-pane>
 
+        <el-tab-pane :label="$t('api_test.request.extract.label')" name="label" class="pane">
+          <pre>{{response.vars}}</pre>
+        </el-tab-pane>
+
         <el-tab-pane v-if="activeName == 'body'" :disabled="true" name="mode" class="pane assertions">
           <template v-slot:label>
             <ms-dropdown :commands="modes" :default-command="mode" @command="modeChange"/>
           </template>
         </el-tab-pane>
 
-        <el-tab-pane :label="$t('api_test.request.extract.label')" name="label" class="pane">
-          <pre>{{response.vars}}</pre>
-        </el-tab-pane>
-
       </el-tabs>
     </el-collapse-transition>
   </div>

frontend/src/business/components/api/test/components/jar/JarConfigList.vue

@@ -45,41 +45,29 @@
       data() {
         return {
           result: {},
-          // relevanceConfigSet: new Set()
         }
       },
-      // created() {
-      //   this.listRelevance();
-      // },
       methods: {
         handleView(row) {
           this.$emit('rowSelect', row);
         },
         handleDelete(id) {
+          this.$confirm(this.$t('api_test.jar_config.delete_tip'), '', {
+            confirmButtonText: this.$t('commons.confirm'),
+            cancelButtonText: this.$t('commons.cancel'),
+            type: 'warning'
+          }).then(() => {
             this.result = this.$get("/jar/delete/" + id, () => {
               this.$success(this.$t('commons.delete_success'));
               this.$emit('refresh');
             });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: this.$t('commons.delete_cancelled')
+            });
+          });
         },
-        // handleRelevance(id, type) {
-        //   let url = type === 'relevance' ? '/jar/relevance' : '/jar/unrelevance';
-        //   let param = {
-        //     jarConfigId: id
-        //   };
-        //   this.result = this.$post(url, param, () => {
-        //     this.$success(this.$t('commons.save_success'));
-        //     this.$emit('refresh');
-        //     this.listRelevance();
-        //   });
-        // },
-        // listRelevance() {
-        //   if (this.testId) {
-        //     this.result = this.$get("/jar/relevance/list/" + this.testId, (response) => {
-        //       this.relevanceConfigSet = new Set(response.data);
-        //       this.$emit('refresh');
-        //     });
-        //   }
-        // }
       }
     }
 </script>

frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue

@@ -39,7 +39,7 @@
 
       <el-form-item>
         <div class="buttons">
-          <el-button type="primary" v-show="currentConfig.id" size="small" @click="validate()">{{$t('校验')}}</el-button>
+          <el-button type="primary" v-show="currentConfig.id" size="small" @click="validate()">{{$t('commons.validate')}}</el-button>
           <el-button type="primary" v-show="currentConfig.id" size="small" @click="save('update')">{{$t('commons.update')}}</el-button>
           <el-button type="primary" size="small" @click="save('add')">{{$t('commons.add')}}</el-button>
         </div>

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1

frontend/src/i18n/en-US.js

@@ -119,6 +119,7 @@ export default {
     reference_documentation: "Reference documentation",
     already_exists: 'The name already exists',
     modifier: 'Modifier',
+    validate: "Validate",
     date: {
       select_date: 'Select date',
       start_date: 'Start date',
@@ -441,6 +442,7 @@ export default {
     jar_config: {
       title: "The Jar Package Management",
       jar_file: "Jar package",
+      delete_tip: "The deletion takes effect after the service is restarted",
       file_exist: "The name already exists in the project",
       upload_limit_size: "Upload file size cannot exceed 30MB!",
     },

frontend/src/i18n/zh-CN.js

@@ -119,6 +119,7 @@ export default {
     required: "{0}是必填的",
     already_exists: '名称不能重复',
     modifier: '修改人',
+    validate: "校验",
     date: {
       select_date: '选择日期',
       start_date: '开始日期',
@@ -444,6 +445,7 @@ export default {
     jar_config: {
       title: "jar包管理",
       jar_file: "jar包",
+      delete_tip: "删除需重启服务后生效",
       file_exist: "该项目下已存在改jar包",
       upload_limit_size: "上传文件大小不能超过 30MB!",
     },

frontend/src/i18n/zh-TW.js

@@ -119,6 +119,7 @@ export default {
     required: "{0}是必填的",
     already_exists: '名稱不能重復',
     modifier: '修改人',
+    validate: "校驗",
     date: {
       select_date: '選擇日期',
       start_date: '開始日期',
@@ -444,6 +445,7 @@ export default {
     jar_config: {
       title: "jar包管理",
       jar_file: "jar包",
+      delete_tip: "刪除需重啟服務後生效",
       file_exist: "該項目下已存在改jar包",
       upload_limit_size: "上傳文件大小不能超過 30MB!",
     },