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;
         }
-        let param = {};
-        let auth = {
-          account: this.form.account,
-          password: this.form.password,
-          url: this.form.url,
-          issuetype: this.form.issuetype
-        };
-        param.organizationId = getCurrentUser().lastOrganizationId;
-        param.platform = this.platform;
-        param.configuration = JSON.stringify(auth);
+
         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: formatUrl,
+              issuetype: this.form.issuetype
+            };
+            param.organizationId = getCurrentUser().lastOrganizationId;
+            param.platform = this.platform;
+            param.configuration = JSON.stringify(auth);
+
             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>
@@ -14,33 +14,34 @@
 </template>
 
 <script>
-    import RelatedTestPlanList from "./components/RelatedTestPlanList";
-    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},
-      watch: {
-        '$route'(to,from) {
-          if (to.path.indexOf('/track/home') > -1) {
-            this.innitData();
-          }
-        }
-      },
-      methods: {
-        innitData() {
-          this.$refs.relatedTestPlanList.initTableData();
-          this.$refs.testCaseRecentList.initTableData();
-        }
+import RelatedTestPlanList from "./components/RelatedTestPlanList";
+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},
+  watch: {
+    '$route'(to, from) {
+      if (to.path.indexOf('/track/home') > -1) {
+        this.innitData();
       }
     }
+  },
+  methods: {
+    innitData() {
+      this.$refs.relatedTestPlanList.initTableData();
+      this.$refs.testCaseRecentList.initTableData();
+    }
+  }
+}
 </script>
 
 <style scoped>
 
-  .ms-main-container >>> .el-table {
-    cursor:pointer;
-  }
+.ms-main-container >>> .el-table {
+  cursor: pointer;
+}
 
 </style>

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

@@ -1,8 +1,8 @@
 <template>
-  <div class="track-home-component">
+  <div>
     <el-card>
       <template v-slot:header>
-        <span class="title">{{title}}</span>
+        <span class="title">{{ title }}</span>
       </template>
       <slot></slot>
     </el-card>
@@ -10,27 +10,19 @@
 </template>
 
 <script>
-    export default {
-      name: "HomeBaseComponent",
-      props: {
-        title: {
-          type: String,
-          default() {
-            this.$t('commons.title')
-          }
-        }
+export default {
+  name: "HomeBaseComponent",
+  props: {
+    title: {
+      type: String,
+      default() {
+        this.$t('commons.title')
       }
     }
+  }
+}
 </script>
 
 <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

@@ -23,22 +23,22 @@
 </template>
 
 <script>
-  import {Test} from "../../../../../api/test/model/ScenarioModel"
-  import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig";
-  import MsContainer from "../../../../../common/components/MsContainer";
-  import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import {Test} from "../../../../../api/test/model/ScenarioModel"
+import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig";
+import MsContainer from "../../../../../common/components/MsContainer";
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
 
-  export default {
-    name: "ApiTestDetail",
-    components: {MsMainContainer, MsContainer, MsApiScenarioConfig},
-    props: {
-      id: String,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
+export default {
+  name: "ApiTestDetail",
+  components: {MsMainContainer, MsContainer, MsApiScenarioConfig},
+  props: {
+    id: String,
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
       return {
         result: {},
         test: new Test(),
@@ -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

@@ -30,24 +30,24 @@
 
 <script>
 
-  import MsScenarioResult from "../../../../../api/report/components/ScenarioResult";
-  import MsMetricChart from "../../../../../api/report/components/MetricChart";
-  import MsScenarioResults from "../../../../../api/report/components/ScenarioResults";
-  import MsRequestResult from "../../../../../api/report/components/RequestResult";
-  import MsContainer from "../../../../../common/components/MsContainer";
-  import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import MsScenarioResult from "../../../../../api/report/components/ScenarioResult";
+import MsMetricChart from "../../../../../api/report/components/MetricChart";
+import MsScenarioResults from "../../../../../api/report/components/ScenarioResults";
+import MsRequestResult from "../../../../../api/report/components/RequestResult";
+import MsContainer from "../../../../../common/components/MsContainer";
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
 
-  export default {
-    name: "ApiTestResult",
-    components: {MsMainContainer, MsContainer, MsRequestResult, MsScenarioResults, MsMetricChart, MsScenarioResult},
-    data() {
-      return {
-        activeName: "total",
-        content: {},
-        report: {},
-        loading: true,
-        fails: [],
-      }
+export default {
+  name: "ApiTestResult",
+  components: {MsMainContainer, MsContainer, MsRequestResult, MsScenarioResults, MsMetricChart, MsScenarioResult},
+  data() {
+    return {
+      activeName: "total",
+      content: {},
+      report: {},
+      loading: true,
+      fails: [],
+    }
     },
     props:['reportId'],
     watch: {
@@ -108,7 +108,7 @@
 
 <style scoped>
   .report-container {
-    height: calc(100vh - 150px);
+    height: calc(100vh - 155px);
     min-height: 600px;
     overflow-y: auto;
   }