Merge branch 'v1.7'

2021-02-05 10:56:42 +08:00 · 2021-02-05 10:56:42 +08:00 · b41edd7c03
parent 75b5978373 3aa0d05d66
commit b41edd7c03
11 changed files with 204 additions and 184 deletions
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@ -196,6 +196,8 @@ public abstract class MsTestElement {
                        csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());
                    }
                    csvDataSet.setIgnoreFirstLine(false);
+                    csvDataSet.setRecycle(true);
+                    csvDataSet.setProperty("recycle", true);
                    csvDataSet.setProperty("delimiter", item.getDelimiter());
                    csvDataSet.setComment(StringUtils.isEmpty(item.getDescription()) ? "" : item.getDescription());
                    tree.add(csvDataSet);
--- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
@ -171,12 +171,16 @@ public class HistoricalDataUpgradeService {
                element = new MsJDBCSampler();
                SqlRequest request1 = (SqlRequest) request;
                BeanUtils.copyBean(element, request1);
+
                EnvironmentDTO dto = environmentDTOMap.get(request1.getDataSource());
                if (dto != null) {
                    ((MsJDBCSampler) element).setEnvironmentId(dto.getEnvironmentId());
                    ((MsJDBCSampler) element).setDataSourceId(dto.getDatabaseConfig().getId());
                    ((MsJDBCSampler) element).setDataSource(dto.getDatabaseConfig());
                }
+                if (CollectionUtils.isEmpty(request1.getVariables())) {
+                    ((MsJDBCSampler) element).setVariables(new ArrayList<>());
+                }
                element.setType("JDBCSampler");
            }
            if (request instanceof TCPRequest) {
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@ -11,6 +11,7 @@
      @edit="edit"
      @drag="drag"
      @remove="remove"
+      @refresh="list"
      @nodeSelectEvent="nodeChange"
      ref="nodeTree">

@ -34,24 +35,24 @@
 </template>

 <script>
-  import SelectMenu from "../../../track/common/SelectMenu";
-  import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-  import {getCurrentProjectID} from "@/common/js/utils";
-  import MsNodeTree from "../../../track/common/NodeTree";
-  import {buildNodePath} from "../../definition/model/NodeTree";
-  import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
+import SelectMenu from "../../../track/common/SelectMenu";
+import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
+import {getCurrentProjectID} from "@/common/js/utils";
+import MsNodeTree from "../../../track/common/NodeTree";
+import {buildNodePath} from "../../definition/model/NodeTree";
+import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";

-  export default {
-    name: 'MsApiScenarioModule',
-    components: {
-      ModuleTrashButton,
-      MsNodeTree,
-      MsAddBasisScenario,
-      SelectMenu,
-    },
-    props: {
-      isReadOnly: {
-        type: Boolean,
+export default {
+  name: 'MsApiScenarioModule',
+  components: {
+    ModuleTrashButton,
+    MsNodeTree,
+    MsAddBasisScenario,
+    SelectMenu,
+  },
+  props: {
+    isReadOnly: {
+      type: Boolean,
        default() {
          return false
        }
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@ -17,29 +17,29 @@
 </template>

 <script>
-  import MsEditCompleteHttpApi from "./complete/EditCompleteHTTPApi";
-  import MsEditCompleteTcpApi from "./complete/EditCompleteTCPApi";
-  import MsEditCompleteDubboApi from "./complete/EditCompleteDubboApi";
-  import MsEditCompleteSqlApi from "./complete/EditCompleteSQLApi";
+import MsEditCompleteHttpApi from "./complete/EditCompleteHTTPApi";
+import MsEditCompleteTcpApi from "./complete/EditCompleteTCPApi";
+import MsEditCompleteDubboApi from "./complete/EditCompleteDubboApi";
+import MsEditCompleteSqlApi from "./complete/EditCompleteSQLApi";

-  import {ResponseFactory, Body} from "../model/ApiTestModel";
-  import {getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import {createComponent, Request} from "./jmeter/components";
-  import Sampler from "./jmeter/components/sampler/sampler";
-  import {WORKSPACE_ID} from '@/common/js/constants';
-  import {handleCtrlSEvent} from "../../../../../common/js/utils";
+import {Body} from "../model/ApiTestModel";
+import {getUUID} from "@/common/js/utils";
+import {createComponent, Request} from "./jmeter/components";
+import Sampler from "./jmeter/components/sampler/sampler";
+import {WORKSPACE_ID} from '@/common/js/constants';
+import {handleCtrlSEvent} from "../../../../../common/js/utils";

-  export default {
-    name: "ApiConfig",
-    components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
-    data() {
-      return {
-        reqUrl: "",
-        request: Sampler,
-        config: {},
-        response: {},
-        maintainerOptions: [],
-      }
+export default {
+  name: "ApiConfig",
+  components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
+  data() {
+    return {
+      reqUrl: "",
+      request: Sampler,
+      config: {},
+      response: {},
+      maintainerOptions: [],
+    }
    },
    props: {
      currentApi: {},
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@ -11,6 +11,7 @@
      @edit="edit"
      @drag="drag"
      @remove="remove"
+      @refresh="list"
      @nodeSelectEvent="nodeChange"
      ref="nodeTree">

@ -33,26 +34,26 @@
 </template>

 <script>
-  import MsAddBasisApi from "../basis/AddBasisApi";
-  import SelectMenu from "../../../../track/common/SelectMenu";
-  import {OPTIONS} from "../../model/JsonData";
-  import ApiImport from "../import/ApiImport";
-  import {getCurrentProjectID} from "@/common/js/utils";
-  import MsNodeTree from "../../../../track/common/NodeTree";
-  import ApiModuleHeader from "./ApiModuleHeader";
-  import {buildNodePath} from "../../model/NodeTree";
+import MsAddBasisApi from "../basis/AddBasisApi";
+import SelectMenu from "../../../../track/common/SelectMenu";
+import {OPTIONS} from "../../model/JsonData";
+import ApiImport from "../import/ApiImport";
+import {getCurrentProjectID} from "@/common/js/utils";
+import MsNodeTree from "../../../../track/common/NodeTree";
+import ApiModuleHeader from "./ApiModuleHeader";
+import {buildNodePath} from "../../model/NodeTree";

-  export default {
-    name: 'MsApiModule',
-    components: {
-      ApiModuleHeader,
-      MsNodeTree,
-      MsAddBasisApi,
-      SelectMenu,
-      ApiImport
-    },
-    data() {
-      return {
+export default {
+  name: 'MsApiModule',
+  components: {
+    ApiModuleHeader,
+    MsNodeTree,
+    MsAddBasisApi,
+    SelectMenu,
+    ApiImport
+  },
+  data() {
+    return {
        result: {},
        condition: {
          protocol: OPTIONS[0].value,
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
@ -44,29 +44,29 @@
 </template>

 <script>
-  import {downloadFile, getUUID} from "@/common/js/utils";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import {parseEnvironment} from "../../model/EnvironmentModel";
-  import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
-  import MsRequestResultTail from "../response/RequestResultTail";
-  import MsRun from "../Run";
-  import MsBasisParameters from "../request/dubbo/BasisParameters";
-  import {REQ_METHOD} from "../../model/JsonData";
-  import MsJmxStep from "../step/JmxStep";
+import {getUUID, uuid} from "@/common/js/utils";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import {parseEnvironment} from "../../model/EnvironmentModel";
+import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
+import MsRequestResultTail from "../response/RequestResultTail";
+import MsRun from "../Run";
+import MsBasisParameters from "../request/dubbo/BasisParameters";
+import {REQ_METHOD} from "../../model/JsonData";
+import MsJmxStep from "../step/JmxStep";

-  export default {
-    name: "RunTestDubboPage",
-    components: {
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      MsRequestResultTail,
-      ApiEnvironmentConfig,
-      MsRun,
-      MsBasisParameters,
-      MsJmxStep
+export default {
+  name: "RunTestDubboPage",
+  components: {
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    MsRequestResultTail,
+    ApiEnvironmentConfig,
+    MsRun,
+    MsBasisParameters,
+    MsJmxStep
    },
    data() {
      return {
@ -161,12 +161,14 @@
      },
      saveAsApi() {
        let data = {};
+        this.api.request.id = uuid();
        data.request = JSON.stringify(this.api.request);
        data.method = this.api.method;
        data.status = this.api.status;
        data.userId = this.api.userId;
        data.description = this.api.description;
        this.$emit('saveAsApi', data);
+        this.$emit('refresh');
      },
      updateApi() {
        let url = "/api/definition/update";
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
@ -44,29 +44,29 @@
 </template>

 <script>
-  import {downloadFile, getUUID} from "@/common/js/utils";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import {parseEnvironment} from "../../model/EnvironmentModel";
-  import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
-  import MsRequestResultTail from "../response/RequestResultTail";
-  import MsRun from "../Run";
-  import MsBasisParameters from "../request/database/BasisParameters";
-  import {REQ_METHOD} from "../../model/JsonData";
-  import MsJmxStep from "../step/JmxStep";
+import {getUUID, uuid} from "@/common/js/utils";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import {parseEnvironment} from "../../model/EnvironmentModel";
+import ApiEnvironmentConfig from "../environment/ApiEnvironmentConfig";
+import MsRequestResultTail from "../response/RequestResultTail";
+import MsRun from "../Run";
+import MsBasisParameters from "../request/database/BasisParameters";
+import {REQ_METHOD} from "../../model/JsonData";
+import MsJmxStep from "../step/JmxStep";

-  export default {
-    name: "RunTestSQLPage",
-    components: {
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      MsRequestResultTail,
-      ApiEnvironmentConfig,
-      MsRun,
-      MsBasisParameters,
-      MsJmxStep
+export default {
+  name: "RunTestSQLPage",
+  components: {
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    MsRequestResultTail,
+    ApiEnvironmentConfig,
+    MsRun,
+    MsBasisParameters,
+    MsJmxStep
    },
    data() {
      return {
@ -160,12 +160,14 @@
      },
      saveAsApi() {
        let data = {};
+        this.api.request.id = uuid();
        data.request = JSON.stringify(this.api.request);
        data.method = this.api.method;
        data.status = this.api.status;
        data.userId = this.api.userId;
        data.description = this.api.description;
        this.$emit('saveAsApi', data);
+        this.$emit('refresh');
      },
      updateApi() {
        let url = "/api/definition/update";
@ -175,7 +177,7 @@
          if (this.syncTabs.indexOf(this.api.id) === -1) {
            this.syncTabs.push(this.api.id);
          }
-          this.$emit('saveApi', this.api);
+          this.$emit('refresh');
        });
      },
      selectTestCase(item) {
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
@ -54,29 +54,29 @@
 </template>

 <script>
-  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-  import {downloadFile, getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import MsRequestResultTail from "../response/RequestResultTail";
-  import MsRun from "../Run";
-  import MsBasisParameters from "../request/tcp/TcpBasisParameters";
-  import {REQ_METHOD} from "../../model/JsonData";
-  import EnvironmentSelect from "../environment/EnvironmentSelect";
-  import MsJmxStep from "../step/JmxStep";
+import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+import {getUUID, uuid} from "@/common/js/utils";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import MsRequestResultTail from "../response/RequestResultTail";
+import MsRun from "../Run";
+import MsBasisParameters from "../request/tcp/TcpBasisParameters";
+import {REQ_METHOD} from "../../model/JsonData";
+import EnvironmentSelect from "../environment/EnvironmentSelect";
+import MsJmxStep from "../step/JmxStep";

-  export default {
-    name: "RunTestTCPPage",
-    components: {
-      MsJmxStep,
-      EnvironmentSelect,
-      MsApiRequestForm,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      MsRequestResultTail,
-      MsRun,
+export default {
+  name: "RunTestTCPPage",
+  components: {
+    MsJmxStep,
+    EnvironmentSelect,
+    MsApiRequestForm,
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    MsRequestResultTail,
+    MsRun,
      MsBasisParameters
    },
    data() {
@ -173,12 +173,14 @@
      },
      saveAsApi() {
        let data = {};
+        this.api.request.id = uuid();
        data.request = JSON.stringify(this.api.request);
        data.method = this.api.method;
        data.status = this.api.status;
        data.userId = this.api.userId;
        data.description = this.api.description;
        this.$emit('saveAsApi', data);
+        this.$emit('refresh');
      },
      updateApi() {
        let url = "/api/definition/update";
--- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
@ -14,11 +14,11 @@
            <el-form :inline="true">
              <el-form-item :label="$t('load_test.thread_num')">
                <el-input-number
-                  :disabled="true"
-                  :placeholder="$t('load_test.input_thread_num')"
-                  v-model="threadGroup.threadNumber"
-                  :min="1"
-                  size="mini"/>
+                    :disabled="true"
+                    :placeholder="$t('load_test.input_thread_num')"
+                    v-model="threadGroup.threadNumber"
+                    :min="1"
+                    size="mini"/>
              </el-form-item>
              <br>
              <el-form-item>
@ -31,72 +31,72 @@
              <div v-if="threadGroup.threadType === 'DURATION'">
                <el-form-item :label="$t('load_test.duration')">
                  <el-input-number
-                    :disabled="true"
-                    v-model="threadGroup.duration"
-                    :min="1"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      v-model="threadGroup.duration"
+                      :min="1"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                </el-form-item>
                <br>
                <el-form-item :label="$t('load_test.rps_limit')">
                  <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
                  &nbsp;
                  <el-input-number
-                    :disabled="true "
-                    v-model="threadGroup.rpsLimit"
-                    @change="calculateChart(threadGroup)"
-                    :min="1"
-                    size="mini"/>
+                      :disabled="true "
+                      v-model="threadGroup.rpsLimit"
+                      @change="calculateChart(threadGroup)"
+                      :min="1"
+                      size="mini"/>
                </el-form-item>
                <br>
                <el-form-item :label="$t('load_test.ramp_up_time_within')">
                  <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    :max="threadGroup.duration"
-                    v-model="threadGroup.rampUpTime"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="threadGroup.duration"
+                      v-model="threadGroup.rampUpTime"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                </el-form-item>
                <el-form-item :label="$t('load_test.ramp_up_time_minutes')">
                  <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
-                    v-model="threadGroup.step"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
+                      v-model="threadGroup.step"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                </el-form-item>
                <el-form-item :label="$t('load_test.ramp_up_time_times')"/>
              </div>
              <div v-if="threadGroup.threadType === 'ITERATION'">
                <el-form-item :label="$t('load_test.iterate_num')">
                  <el-input-number
-                    :disabled="true"
-                    v-model="threadGroup.iterateNum"
-                    :min="1"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      v-model="threadGroup.iterateNum"
+                      :min="1"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                </el-form-item>
                <br>
                <el-form-item :label="$t('load_test.rps_limit')">
                  <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
                  &nbsp;
                  <el-input-number
-                    :disabled="true || !threadGroup.rpsLimitEnable"
-                    v-model="threadGroup.rpsLimit"
-                    @change="calculateChart(threadGroup)"
-                    :min="1"
-                    size="mini"/>
+                      :disabled="true || !threadGroup.rpsLimitEnable"
+                      v-model="threadGroup.rpsLimit"
+                      @change="calculateChart(threadGroup)"
+                      :min="1"
+                      size="mini"/>
                </el-form-item>
                <br>
                <el-form-item :label="$t('load_test.ramp_up_time_within')">
                  <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    v-model="threadGroup.iterateRampUp"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      v-model="threadGroup.iterateRampUp"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                </el-form-item>
                <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
              </div>
@ -129,11 +129,11 @@ const ITERATE_RAMP_UP = "iterateRampUpTime";

 const hexToRgba = function (hex, opacity) {
  return 'rgba(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5)) + ','
-    + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
+      + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
 }
 const hexToRgb = function (hex) {
  return 'rgb(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5))
-    + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
+      + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
 }

 export default {
@ -469,11 +469,12 @@ export default {
    },
  },
  watch: {
-    'report.testId': {
+    report: {
      handler() {
        this.getJmxContent();
      },
-    }
+      deep: true
+    },
  }
 }
 </script>
--- a/frontend/src/business/components/track/common/NodeTree.vue
+++ b/frontend/src/business/components/track/common/NodeTree.vue
@ -220,6 +220,10 @@ export default {
      if (dropType === "none" || dropType === undefined) {
        return;
      }
+      if (dropNode.data.id === 'root' && dropType === 'before') {
+        this.$emit('refresh');
+        return false;
+      }
      let param = this.buildParam(draggingNode, dropNode, dropType);
      let list = [];
      this.getNodeTree(this.treeNodes, draggingNode.data.id, list);
--- a/frontend/src/business/components/track/common/TestCaseNodeTree.vue
+++ b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
@ -8,25 +8,26 @@
    @drag="drag"
    @remove="remove"
    @nodeSelectEvent="nodeChange"
+    @refresh="list"
    ref="nodeTree"/>
 </template>

 <script>
-  import NodeEdit from "./NodeEdit";
-  import {getCurrentProjectID} from "../../../../common/js/utils";
-  import MsNodeTree from "./NodeTree";
+import NodeEdit from "./NodeEdit";
+import {getCurrentProjectID} from "../../../../common/js/utils";
+import MsNodeTree from "./NodeTree";

-  export default {
-    name: "TestCaseNodeTree",
-    components: {MsNodeTree, NodeEdit },
-    data() {
-      return {
-        defaultProps: {
-          children: "children",
-          label: "label"
-        },
-        result: {},
-        treeNodes: [],
+export default {
+  name: "TestCaseNodeTree",
+  components: {MsNodeTree, NodeEdit},
+  data() {
+    return {
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      result: {},
+      treeNodes: [],
        projectId: ""
      };
    },