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 @@