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

docker/jmeter-master/run-test.sh

@@ -1,4 +1,3 @@
-export HEAP=$(cat /proc/meminfo | grep MemTotal | awk '{ mem=int($2/1024/1024 * 3/4 + 0.5); metasize=int(mem/4+0.5)"g"; if(mem<1) mem=1; if (metasize == "0g") metasize="256m";  HEAP="-Xms"mem"g -Xmx"mem"g -XX:MaxMetaspaceSize="metasize; print HEAP }')
 for file in ${TESTS_DIR}/*.jmx; do
   jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED}
 done

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

@@ -171,7 +171,7 @@ export default {
 
 <style scoped>
 .report-container {
-  height: calc(100vh - 150px);
+  height: calc(100vh - 155px);
   min-height: 600px;
   overflow-y: auto;
 }

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -344,7 +344,7 @@ export default {
 
 <style scoped>
 .test-container {
-  height: calc(100vh - 150px);
+  height: calc(100vh - 155px);
   min-height: 600px;
 }
 

frontend/src/business/components/settings/organization/IssuesManagement.vue

@@ -161,18 +161,26 @@
           this.$warning(this.$t('organization.integration.choose_platform'));
           return;
         }
+
+        this.$refs[form].validate(valid => {
+          if (valid) {
+
+            let formatUrl = this.form.url;
+            if (!formatUrl.endsWith('/')) {
+              formatUrl = formatUrl + '/';
+            }
+
             let param = {};
             let auth = {
               account: this.form.account,
               password: this.form.password,
-          url: this.form.url,
+              url: formatUrl,
               issuetype: this.form.issuetype
             };
             param.organizationId = getCurrentUser().lastOrganizationId;
             param.platform = this.platform;
             param.configuration = JSON.stringify(auth);
-        this.$refs[form].validate(valid => {
-          if (valid) {
+
             this.result = this.$post("service/integration/save", param, () => {
               this.show = true;
               this.showEdit = true;

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

@@ -269,8 +269,8 @@ export default {
         type: [{required: true, message: this.$t('test_track.case.input_type'), trigger: 'change'}],
         testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
         method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}],
-        prerequisite: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}],
-        remark: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}]
+        prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}],
+        remark: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}]
       },
       formLabelWidth: "120px",
       operationType: '',

frontend/src/business/components/track/home/TrackHome.vue

@@ -1,7 +1,7 @@
 <template>
   <ms-container>
     <ms-main-container>
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="15">
           <related-test-plan-list ref="relatedTestPlanList"/>
         </el-col>
@@ -18,6 +18,7 @@
 import TestCaseSideList from "./components/TestCaseSideList";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
+
 export default {
   name: "TrackHome",
   components: {MsMainContainer, MsContainer, TestCaseSideList, RelatedTestPlanList},

frontend/src/business/components/track/home/components/HomeBaseComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="track-home-component">
+  <div>
     <el-card>
       <template v-slot:header>
         <span class="title">{{ title }}</span>
@@ -25,12 +25,4 @@
 
 <style scoped>
 
-  .el-card {
-    padding: 15px;
-  }
-
-  .track-home-component {
-    padding: 0 15px 15px;
-  }
-
 </style>

frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue

@@ -92,7 +92,7 @@
 
 <style scoped>
   .test-container {
-    height: calc(100vh - 150px);
+    height: calc(100vh - 155px);
     min-height: 600px;
     padding: 15px;
   }

frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue

@@ -108,7 +108,7 @@
 
 <style scoped>
   .report-container {
-    height: calc(100vh - 150px);
+    height: calc(100vh - 155px);
     min-height: 600px;
     overflow-y: auto;
   }