From b16c287633764ba8b4b6d3de34d49d4f51a3e156 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 6 May 2022 16:26:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=8C=E5=BD=93=E5=A4=9A=E6=AC=A1=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8E=E5=86=8D=E5=88=87=E5=9B=9E=E5=8E=9F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=88=99=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=A7=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |   5 +
 .../scenario/common/JDBCProcessorContent.vue  |   3 +
 .../api/definition/components/ApiConfig.vue   | 628 +++++++++---------
 .../components/case/ApiCaseItem.vue           |  19 +
 .../components/case/ApiCaseList.vue           |  19 +-
 .../request/database/BasisParameters.vue      |   4 +
 .../definition/components/step/JmxStep.vue    |   2 +
 7 files changed, 374 insertions(+), 306 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 93e68859a7..271de706d7 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -1667,6 +1667,11 @@ export default {
     dataProcessing(stepArray) {
       if (stepArray) {
         for (let i in stepArray) {
+          let typeArray = ["JDBCPostProcessor", "JDBCSampler", "JDBCPreProcessor"]
+          if (typeArray.indexOf(stepArray[i].type) !== -1) {
+            stepArray[i].originalDataSourceId = stepArray[i].dataSourceId;
+            stepArray[i].originalEnvironmentId = stepArray[i].environmentId;
+          }
           if (!stepArray[i].hashTree) {
             stepArray[i].hashTree = [];
           }
diff --git a/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
index 498365587d..5f1e7b3d96 100644
--- a/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
@@ -226,6 +226,9 @@ export default {
           envId = this.request.refEevMap.get(id);
         }
       }
+      if(envId === this.request.originalEnvironmentId && this.request.originalDataSourceId) {
+        this.request.dataSourceId = this.request.originalDataSourceId;
+      }
       let targetDataSourceName = "";
       let currentEnvironment = {};
       this.result = this.$get('/api/environment/list/' + id, response => {
diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index 2c5d77a2a2..2977b65330 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -32,333 +32,353 @@
 </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 {Body} from "../model/ApiTestModel";
-import {getCurrentProjectID, getUUID, handleCtrlSEvent} from "@/common/js/utils";
-import {createComponent, Request} from "./jmeter/components";
-import Sampler from "./jmeter/components/sampler/sampler";
-import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
+  import {Body} from "../model/ApiTestModel";
+  import {getCurrentProjectID, getUUID, handleCtrlSEvent} from "@/common/js/utils";
+  import {createComponent, Request} from "./jmeter/components";
+  import Sampler from "./jmeter/components/sampler/sampler";
+  import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
 
-export default {
-  name: "ApiConfig",
-  components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
-  data() {
-    return {
-      reqUrl: "",
-      request: Sampler,
-      config: {},
-      response: {},
-      maintainerOptions: [],
-      count: 0,
-      responseCount: 0,
-    }
-  },
-  props: {
-    currentApi: {},
-    moduleOptions: {},
-    currentProtocol: String,
-    syncTabs: Array,
-    projectId: String
-  },
-  watch: {
-    request: {
-      handler(newObj) {
-        this.count++
-        if (this.count > 2) {
-          this.$store.state.apiStatus.set("requestChange", true);
-          this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+  export default {
+    name: "ApiConfig",
+    components: {MsEditCompleteHttpApi, MsEditCompleteTcpApi, MsEditCompleteDubboApi, MsEditCompleteSqlApi},
+    data() {
+      return {
+        reqUrl: "",
+        request: Sampler,
+        config: {},
+        response: {},
+        maintainerOptions: [],
+        count: 0,
+        responseCount: 0,
+      }
+    },
+    props: {
+      currentApi: {},
+      moduleOptions: {},
+      currentProtocol: String,
+      syncTabs: Array,
+      projectId: String
+    },
+    watch: {
+      request: {
+        handler(newObj) {
+          this.count++
+          if (this.count > 2) {
+            this.$store.state.apiStatus.set("requestChange", true);
+            this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+          }
+        },
+        deep: true
+      },
+      response: {
+        handler(newObj, oldObj) {
+          this.responseCount++;
+          if (this.responseCount > 1) {
+            this.$store.state.apiStatus.set("responseChange", true);
+            this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+          }
+        },
+        deep: true
+      },
+    },
+
+    created() {
+      this.getMaintainerOptions();
+      switch (this.currentProtocol) {
+        case Request.TYPES.SQL:
+          this.initSql();
+          break;
+        case Request.TYPES.DUBBO:
+          this.initDubbo();
+          break;
+        case Request.TYPES.TCP:
+          this.initTcp();
+          break;
+        default:
+          this.initHttp();
+          break;
+      }
+      this.formatApi();
+      this.addListener();
+      if (!(this.$store.state.apiMap instanceof Map)) {
+        this.$store.state.apiMap = new Map();
+      }
+      if (!(this.$store.state.apiStatus instanceof Map)) {
+        this.$store.state.apiStatus = new Map();
+      }
+      // 记录原始数据源ID
+      if (this.currentApi && this.currentApi.request && this.currentApi.request.hashTree) {
+        this.setOriginal(this.currentApi.request.hashTree);
+      }
+    },
+    methods: {
+      setOriginal(scenarioDefinition) {
+        for (let i in scenarioDefinition) {
+          let typeArray = ["JDBCPostProcessor", "JDBCSampler", "JDBCPreProcessor"]
+          if (typeArray.indexOf(scenarioDefinition[i].type) !== -1) {
+            scenarioDefinition[i].originalDataSourceId = scenarioDefinition[i].dataSourceId;
+          }
+          if (scenarioDefinition[i].hashTree !== undefined && scenarioDefinition[i].hashTree.length > 0) {
+            this.setOriginal(scenarioDefinition[i].hashTree);
+          }
         }
       },
-      deep: true
-    },
-    response: {
-      handler(newObj, oldObj) {
-        this.responseCount++;
-        if (this.responseCount > 1) {
-          this.$store.state.apiStatus.set("responseChange", true);
-          this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+      changeTab(type) {
+        this.$emit("changeTab", type);
+      },
+      addListener() {
+        document.addEventListener("keydown", this.createCtrlSHandle);
+      },
+      removeListener() {
+        document.removeEventListener("keydown", this.createCtrlSHandle);
+      },
+      createCtrlSHandle(event) {
+        if (this.$refs.httpApi) {
+          handleCtrlSEvent(event, this.$refs.httpApi.saveApi);
+        } else if (this.$refs.tcpApi) {
+          handleCtrlSEvent(event, this.$refs.tcpApi.saveApi);
+        } else if (this.$refs.dubboApi) {
+          handleCtrlSEvent(event, this.$refs.dubboApi.saveApi);
+        } else if (this.$refs.sqlApi) {
+          handleCtrlSEvent(event, this.$refs.sqlApi.saveApi);
         }
       },
-      deep: true
-    },
-  },
+      runTest(data) {
+        this.setParameters(data);
+        let bodyFiles = this.getBodyUploadFiles(data);
+        this.$fileUpload(this.reqUrl, null, bodyFiles, data, response => {
+          this.$success(this.$t('commons.save_success'));
+          this.reqUrl = "/api/definition/update";
+          let newData = response.data;
+          data.request = JSON.parse(newData.request);
+          this.$emit('runTest', data);
+        });
+      },
+      mockConfig(data) {
+        this.$emit('mockConfig', data);
+      },
+      checkout(data) {
+        this.$emit('checkout', data);
+      },
+      createRootModelInTree() {
+        this.$emit("createRootModel");
+      },
+      getMaintainerOptions() {
+        this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
+          this.maintainerOptions = response.data;
+        });
+      },
+      setRequest() {
+        if (this.currentApi.request != undefined && this.currentApi.request != null) {
+          if (Object.prototype.toString.call(this.currentApi.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+            this.request = this.currentApi.request;
+          } else {
+            this.request = JSON.parse(this.currentApi.request);
+          }
+          if (!this.request.headers) {
+            this.request.headers = [];
+          }
+          this.currentApi.request = this.request;
+          return true;
+        }
+        return false;
+      },
+      initSql() {
+        if (!this.setRequest()) {
+          this.request = createComponent("JDBCSampler");
+          this.currentApi.request = this.request;
+        }
+        if (!this.currentApi.request.variables) {
+          this.currentApi.request.variables = [];
+        }
+        this.currentApi.request.originalDataSourceId = this.currentApi.request.dataSourceId;
 
-  created() {
-    this.getMaintainerOptions();
-    switch (this.currentProtocol) {
-      case Request.TYPES.SQL:
-        this.initSql();
-        break;
-      case Request.TYPES.DUBBO:
-        this.initDubbo();
-        break;
-      case Request.TYPES.TCP:
-        this.initTcp();
-        break;
-      default:
-        this.initHttp();
-        break;
-    }
-    this.formatApi();
-    this.addListener();
-    if (!(this.$store.state.apiMap instanceof Map)) {
-      this.$store.state.apiMap = new Map();
-    }
-    if (!(this.$store.state.apiStatus instanceof Map)) {
-      this.$store.state.apiStatus = new Map();
-    }
-  },
-  methods: {
-    changeTab(type) {
-      this.$emit("changeTab", type);
-    },
-    addListener() {
-      document.addEventListener("keydown", this.createCtrlSHandle);
-    },
-    removeListener() {
-      document.removeEventListener("keydown", this.createCtrlSHandle);
-    },
-    createCtrlSHandle(event) {
-      if (this.$refs.httpApi) {
-        handleCtrlSEvent(event, this.$refs.httpApi.saveApi);
-      } else if (this.$refs.tcpApi) {
-        handleCtrlSEvent(event, this.$refs.tcpApi.saveApi);
-      } else if (this.$refs.dubboApi) {
-        handleCtrlSEvent(event, this.$refs.dubboApi.saveApi);
-      } else if (this.$refs.sqlApi) {
-        handleCtrlSEvent(event, this.$refs.sqlApi.saveApi);
-      }
-    },
-    runTest(data) {
-      this.setParameters(data);
-      let bodyFiles = this.getBodyUploadFiles(data);
-      this.$fileUpload(this.reqUrl, null, bodyFiles, data, response => {
-        this.$success(this.$t('commons.save_success'));
-        this.reqUrl = "/api/definition/update";
-        let newData = response.data;
-        data.request = JSON.parse(newData.request);
-        this.$emit('runTest', data);
-      });
-    },
-    mockConfig(data) {
-      this.$emit('mockConfig', data);
-    },
-    checkout(data) {
-      this.$emit('checkout', data);
-    },
-    createRootModelInTree() {
-      this.$emit("createRootModel");
-    },
-    getMaintainerOptions() {
-      this.$post('/user/project/member/tester/list', {projectId: getCurrentProjectID()}, response => {
-        this.maintainerOptions = response.data;
-      });
-    },
-    setRequest() {
-      if (this.currentApi.request != undefined && this.currentApi.request != null) {
-        if (Object.prototype.toString.call(this.currentApi.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-          this.request = this.currentApi.request;
+      },
+      initDubbo() {
+        if (!this.setRequest()) {
+          this.request = createComponent("DubboSampler");
+          this.currentApi.request = this.request;
+        }
+      },
+      initTcp() {
+        if (!this.setRequest()) {
+          this.request = createComponent("TCPSampler");
+          this.currentApi.request = this.request;
+        }
+      },
+      initHttp() {
+        if (!this.setRequest()) {
+          this.request = createComponent("HTTPSamplerProxy");
+          this.currentApi.request = this.request;
+        }
+      },
+      sort(stepArray) {
+        if (stepArray) {
+          for (let i in stepArray) {
+            if (!stepArray[i].clazzName) {
+              stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type);
+            }
+            if (stepArray[i].type === "Assertions" && !stepArray[i].document) {
+              stepArray[i].document = {
+                type: "JSON",
+                data: {xmlFollowAPI: false, jsonFollowAPI: false, json: [], xml: []}
+              };
+            }
+            if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) {
+              this.sort(stepArray[i].hashTree);
+            }
+          }
+        }
+      },
+      formatApi() {
+        if (this.currentApi.response != null && this.currentApi.response != 'null' && this.currentApi.response != undefined) {
+          if (Object.prototype.toString.call(this.currentApi.response).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+            this.response = this.currentApi.response;
+          } else {
+            this.response = JSON.parse(this.currentApi.response);
+          }
         } else {
-          this.request = JSON.parse(this.currentApi.request);
+          this.response = {headers: [], body: new Body(), statusCode: [], type: "HTTP"};
         }
-        if (!this.request.headers) {
-          this.request.headers = [];
-        }
-        this.currentApi.request = this.request;
-        return true;
-      }
-      return false;
-    },
-    initSql() {
-      if (!this.setRequest()) {
-        this.request = createComponent("JDBCSampler");
-        this.currentApi.request = this.request;
-      }
-      if (!this.currentApi.request.variables) {
-        this.currentApi.request.variables = [];
-      }
-    },
-    initDubbo() {
-      if (!this.setRequest()) {
-        this.request = createComponent("DubboSampler");
-        this.currentApi.request = this.request;
-      }
-    },
-    initTcp() {
-      if (!this.setRequest()) {
-        this.request = createComponent("TCPSampler");
-        this.currentApi.request = this.request;
-      }
-    },
-    initHttp() {
-      if (!this.setRequest()) {
-        this.request = createComponent("HTTPSamplerProxy");
-        this.currentApi.request = this.request;
-      }
-    },
-    sort(stepArray) {
-      if (stepArray) {
-        for (let i in stepArray) {
-          if (!stepArray[i].clazzName) {
-            stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type);
-          }
-          if (stepArray[i].type === "Assertions" && !stepArray[i].document) {
-            stepArray[i].document = {type: "JSON", data: {xmlFollowAPI: false, jsonFollowAPI: false, json: [], xml: []}};
-          }
-          if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) {
-            this.sort(stepArray[i].hashTree);
-          }
-        }
-      }
-    },
-    formatApi() {
-      if (this.currentApi.response != null && this.currentApi.response != 'null' && this.currentApi.response != undefined) {
-        if (Object.prototype.toString.call(this.currentApi.response).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
-          this.response = this.currentApi.response;
+        if (this.currentApi && this.currentApi.id && !this.currentApi.isCopy) {
+          this.reqUrl = "/api/definition/update";
         } else {
-          this.response = JSON.parse(this.currentApi.response);
+          this.reqUrl = "/api/definition/create";
         }
-      } else {
-        this.response = {headers: [], body: new Body(), statusCode: [], type: "HTTP"};
-      }
-      if (this.currentApi && this.currentApi.id && !this.currentApi.isCopy) {
-        this.reqUrl = "/api/definition/update";
-      } else {
-        this.reqUrl = "/api/definition/create";
-      }
-      if (!this.request.hashTree) {
-        this.request.hashTree = [];
-      }
-      if (this.request.body && !this.request.body.binary) {
-        this.request.body.binary = [];
-      }
-      // 处理导入数据缺失问题
-      if (this.response.body) {
-        let body = new Body();
-        Object.assign(body, this.response.body);
-        if (!body.binary) {
-          body.binary = [];
+        if (!this.request.hashTree) {
+          this.request.hashTree = [];
         }
-        if (!body.kvs) {
-          body.kvs = [];
+        if (this.request.body && !this.request.body.binary) {
+          this.request.body.binary = [];
         }
-        if (!body.binary) {
-          body.binary = [];
+        // 处理导入数据缺失问题
+        if (this.response.body) {
+          let body = new Body();
+          Object.assign(body, this.response.body);
+          if (!body.binary) {
+            body.binary = [];
+          }
+          if (!body.kvs) {
+            body.kvs = [];
+          }
+          if (!body.binary) {
+            body.binary = [];
+          }
+          this.response.body = body;
         }
-        this.response.body = body;
-      }
-      this.request.clazzName = TYPE_TO_C.get(this.request.type);
+        this.request.clazzName = TYPE_TO_C.get(this.request.type);
 
-      this.sort(this.request.hashTree);
-    },
-    saveApi(data) {
-      this.setParameters(data);
-      let bodyFiles = this.getBodyUploadFiles(data);
-      data.requestId = data.request.id;
-      if (data.request) {
-        // 历史数据处理
-        if (data.request.authManager) {
-          data.request.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+        this.sort(this.request.hashTree);
+      },
+      saveApi(data) {
+        this.setParameters(data);
+        let bodyFiles = this.getBodyUploadFiles(data);
+        data.requestId = data.request.id;
+        if (data.request) {
+          // 历史数据处理
+          if (data.request.authManager) {
+            data.request.authManager.clazzName = TYPE_TO_C.get("AuthManager");
+          }
+          this.sort(data.request.hashTree);
         }
-        this.sort(data.request.hashTree);
-      }
-      this.$fileUpload(this.reqUrl, null, bodyFiles, data, (response) => {
-        this.$success(this.$t('commons.save_success'));
-        this.reqUrl = "/api/definition/update";
-        this.currentApi.isCopy = false;
-        this.currentApi.sourceId = "";
-        // 创建了新版本的api，之后id变了，ref_id 保存了原始id
-        data.id = response.data.id;
-        data.remark = response.data.remark;
-        this.$emit('saveApi', data);
-      });
-      this.responseCount = 0;
-      this.count = 0;
-      this.$store.state.apiStatus.set("requestChange", false);
-      this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
-      this.$store.state.apiStatus.set("responseChange", false);
-      this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
-    },
-    handleSave() {
-      if (this.$refs.httpApi) {
-        this.$refs.httpApi.saveApi();
-      } else if (this.$refs.tcpApi) {
-        this.$refs.tcpApi.saveApi();
-      } else if (this.$refs.dubboApi) {
-        this.$refs.dubboApi.saveApi();
-      } else if (this.$refs.sqlApi) {
-        this.$refs.sqlApi.saveApi();
-      }
-    },
-    setParameters(data) {
-      data.projectId = this.projectId;
-      this.request.name = this.currentApi.name;
-      data.protocol = this.currentProtocol;
-      data.request = this.request;
-      data.request.name = data.name;
-      if (this.currentProtocol === "DUBBO" || this.currentProtocol === "dubbo://") {
-        data.request.protocol = "dubbo://";
-      } else {
-        data.request.protocol = this.currentProtocol;
-      }
-      if (data.isCopy) {
-        data.sourceId = data.id;
-        data.id = getUUID();
-        data.request.id = data.id;
-      } else {
-        if (data.id) {
+        this.$fileUpload(this.reqUrl, null, bodyFiles, data, (response) => {
+          this.$success(this.$t('commons.save_success'));
+          this.reqUrl = "/api/definition/update";
+          this.currentApi.isCopy = false;
+          this.currentApi.sourceId = "";
+          // 创建了新版本的api，之后id变了，ref_id 保存了原始id
+          data.id = response.data.id;
+          data.remark = response.data.remark;
+          this.$emit('saveApi', data);
+        });
+        this.responseCount = 0;
+        this.count = 0;
+        this.$store.state.apiStatus.set("requestChange", false);
+        this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+        this.$store.state.apiStatus.set("responseChange", false);
+        this.$store.state.apiMap.set(this.currentApi.id, this.$store.state.apiStatus);
+      },
+      handleSave() {
+        if (this.$refs.httpApi) {
+          this.$refs.httpApi.saveApi();
+        } else if (this.$refs.tcpApi) {
+          this.$refs.tcpApi.saveApi();
+        } else if (this.$refs.dubboApi) {
+          this.$refs.dubboApi.saveApi();
+        } else if (this.$refs.sqlApi) {
+          this.$refs.sqlApi.saveApi();
+        }
+      },
+      setParameters(data) {
+        data.projectId = this.projectId;
+        this.request.name = this.currentApi.name;
+        data.protocol = this.currentProtocol;
+        data.request = this.request;
+        data.request.name = data.name;
+        if (this.currentProtocol === "DUBBO" || this.currentProtocol === "dubbo://") {
+          data.request.protocol = "dubbo://";
+        } else {
+          data.request.protocol = this.currentProtocol;
+        }
+        if (data.isCopy) {
+          data.sourceId = data.id;
+          data.id = getUUID();
           data.request.id = data.id;
         } else {
-          data.id = data.request.id;
+          if (data.id) {
+            data.request.id = data.id;
+          } else {
+            data.id = data.request.id;
+          }
         }
-      }
 
-      if (!data.method) {
-        data.method = this.currentProtocol;
-      }
-      data.response = this.response;
-    },
-    getBodyUploadFiles(data) {
-      let bodyUploadFiles = [];
-      data.bodyUploadIds = [];
-      let request = data.request;
-      if (request.body) {
-        if (request.body.kvs) {
-          request.body.kvs.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  item.name = item.file.name;
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
+        if (!data.method) {
+          data.method = this.currentProtocol;
         }
-        if (request.body.binary) {
-          request.body.binary.forEach(param => {
-            if (param.files) {
-              param.files.forEach(item => {
-                if (item.file) {
-                  let fileId = getUUID().substring(0, 8);
-                  item.name = item.file.name;
-                  item.id = fileId;
-                  data.bodyUploadIds.push(fileId);
-                  bodyUploadFiles.push(item.file);
-                }
-              });
-            }
-          });
+        data.response = this.response;
+      },
+      getBodyUploadFiles(data) {
+        let bodyUploadFiles = [];
+        data.bodyUploadIds = [];
+        let request = data.request;
+        if (request.body) {
+          if (request.body.kvs) {
+            request.body.kvs.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    item.name = item.file.name;
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
+          if (request.body.binary) {
+            request.body.binary.forEach(param => {
+              if (param.files) {
+                param.files.forEach(item => {
+                  if (item.file) {
+                    let fileId = getUUID().substring(0, 8);
+                    item.name = item.file.name;
+                    item.id = fileId;
+                    data.bodyUploadIds.push(fileId);
+                    bodyUploadFiles.push(item.file);
+                  }
+                });
+              }
+            });
+          }
         }
-      }
-      return bodyUploadFiles;
-    },
+        return bodyUploadFiles;
+      },
+    }
   }
-}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 5c853bcc33..4bacf733b8 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -365,8 +365,27 @@ export default {
     if (this.apiCase.id) {
       this.$store.state.apiCaseMap.set(this.apiCase.id, 0);
     }
+    // 记录原始数据源ID
+    this.apiCase.request.originalDataSourceId = this.apiCase.request.dataSourceId;
+    this.apiCase.request.originalEnvironmentId = this.apiCase.request.environmentId;
+
+    if (this.apiCase && this.apiCase.request && this.apiCase.request.hashTree) {
+      this.setOriginal(this.apiCase.request.hashTree);
+    }
   },
   methods: {
+    setOriginal(scenarioDefinition) {
+      for (let i in scenarioDefinition) {
+        let typeArray = ["JDBCPostProcessor", "JDBCSampler", "JDBCPreProcessor"]
+        if (typeArray.indexOf(scenarioDefinition[i].type) !== -1) {
+          scenarioDefinition[i].originalDataSourceId = scenarioDefinition[i].dataSourceId;
+          scenarioDefinition[i].originalEnvironmentId = scenarioDefinition[i].environmentId;
+        }
+        if (scenarioDefinition[i].hashTree !== undefined && scenarioDefinition[i].hashTree.length > 0) {
+          this.setOriginal(scenarioDefinition[i].hashTree);
+        }
+      }
+    },
     saveStatus() {
       if (this.$store.state.apiCaseMap && this.apiCase.id) {
         let change = this.$store.state.apiCaseMap.get(this.apiCase.id);
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index de845d0eea..bf48472f78 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -305,7 +305,15 @@ export default {
         this.$get('/api/environment/list/' + this.projectId, response => {
           this.environments = response.data;
           // 获取原数据源名称
-          this.getTargetSourceName(this.environments, obj);
+          if(env === obj.originalEnvironmentId && obj.originalDataSourceId){
+            obj.dataSourceId = obj.originalDataSourceId;
+            obj.environmentId = env;
+            this.getTargetSourceName(this.environments, obj);
+          }
+          if(!obj.targetDataSourceName){
+            this.getTargetSourceName(this.environments, obj);
+          }
+
           // 设置新环境
           obj.environmentId = env;
           // 设置新数据源
@@ -316,7 +324,14 @@ export default {
         });
       } else {
         // 获取原数据源名称
-        this.getTargetSourceName(this.environments, obj);
+        if(env === obj.originalEnvironmentId && obj.originalDataSourceId){
+          obj.dataSourceId = obj.originalDataSourceId;
+          obj.environmentId = env;
+          this.getTargetSourceName(this.environments, obj);
+        }
+        if(!obj.targetDataSourceName){
+          this.getTargetSourceName(this.environments, obj);
+        }
         // 设置新环境
         obj.environmentId = env;
         // 设置新数据源
diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 0256547d2f..130d719852 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -317,6 +317,10 @@ export default {
       }
       let targetDataSourceName = "";
       let currentEnvironment = {};
+
+      if(envId === this.request.originalEnvironmentId && this.request.originalDataSourceId) {
+        this.request.dataSourceId = this.request.originalDataSourceId;
+      }
       this.result = this.$get('/api/environment/list/' + id, response => {
         this.environments = response.data;
         this.environments.forEach(environment => {
diff --git a/frontend/src/business/components/api/definition/components/step/JmxStep.vue b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
index 84d8981826..d06dd28fd4 100644
--- a/frontend/src/business/components/api/definition/components/step/JmxStep.vue
+++ b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
@@ -264,6 +264,8 @@ export default {
           scenarioDefinition[i].environmentId = this.request.environmentId;
           if (this.request.dataSourceId && !scenarioDefinition[i].dataSourceId) {
             scenarioDefinition[i].dataSourceId = this.request.dataSourceId;
+            scenarioDefinition[i].originalDataSourceId = scenarioDefinition[i].dataSourceId;
+            scenarioDefinition[i].originalEnvironmentId = scenarioDefinition[i].environmentId;
           }
         }
       }