diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index e4901ca88a..0fb813de1f 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -284,6 +284,7 @@
:onSampleError="onSampleError"
:execDebug="stopDebug"
:isFullUrl.sync="isFullUrl"
+ :clearMessage="clearMessage"
@closePage="close"
@unFullScreen="unFullScreen"
@showAllBtn="showAllBtn"
@@ -451,6 +452,7 @@ export default {
buttonData: [],
stepFilter: new STEP,
plugins: [],
+ clearMessage: "",
}
},
created() {
@@ -1137,6 +1139,7 @@ export default {
let sign = this.$refs.envPopover.checkEnv(this.isFullUrl);
if (!sign) {
this.buttonIsLoading = false;
+ this.clearMessage = getUUID().substring(0, 8);
return;
}
//调试时不再保存
@@ -1157,6 +1160,8 @@ export default {
this.debugLoading = true;
})
})
+ } else {
+ this.clearMessage = getUUID().substring(0, 8);
}
})
},
@@ -1401,6 +1406,7 @@ export default {
this.debugLoading = false;
this.debugVisible = false;
this.loading = false;
+ this.clearMessage = getUUID().substring(0, 8);
},
showScenarioParameters() {
this.$refs.scenarioParameters.open(this.currentScenario.variables, this.currentScenario.headers);
diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index 393f05a68d..b00d2a294d 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -81,7 +81,7 @@ export const PLUGIN_ELEMENTS = new Map([
['menu_logic_controller', ['GenericController', "IfController", "LoopController", 'IfControllerPanel', 'TransactionController', 'LoopControlPanel', 'WhileController', 'Separator', 'ForeachControlPanel', 'IncludeController', 'RunTime', 'CriticalSectionController', 'InterleaveControl', 'OnceOnlyController', 'RecordController', 'LogicController', 'RandomControl', 'RandomOrderController', 'ThroughputController', 'SwitchController', 'ModuleController']],
['menu_fragments', ['TestFragmentController']],
['menu_non_test_elements', ['ProxyControl', 'HttpMirrorControl', 'GenerateTree', 'PropertyControl']],
- ['menu_generative_controller', ['AbstractSampler', 'CustomizeReq', 'HttpTestSample', 'TestAction', 'DebugSampler', 'JSR223Sampler', 'Separator', 'AjpSampler', 'AccessLogSampler', 'BeanShellSampler', 'BoltSampler', 'FtpTestSampler', 'GraphQLHTTPSampler', 'JDBCSampler', 'JMSPublisher', 'JMSSampler', 'JMSSubscriber', 'JUnitTestSampler', 'JavaTestSampler', 'LdapExtTestSampler', 'LdapTestSampler', 'SystemSampler', 'SmtpSampler', 'TCPSampler', 'MailReaderSampler']],
+ ['menu_generative_controller', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler","Sampler",'AbstractSampler', 'CustomizeReq', 'HttpTestSample', 'TestAction', 'DebugSampler', 'JSR223Sampler', 'Separator', 'AjpSampler', 'AccessLogSampler', 'BeanShellSampler', 'BoltSampler', 'FtpTestSampler', 'GraphQLHTTPSampler', 'JDBCSampler', 'JMSPublisher', 'JMSSampler', 'JMSSubscriber', 'JUnitTestSampler', 'JavaTestSampler', 'LdapExtTestSampler', 'LdapTestSampler', 'SystemSampler', 'SmtpSampler', 'TCPSampler', 'MailReaderSampler']],
['menu_threads', ['SetupThreadGroup', 'PostThreadGroup', 'ThreadGroup']],
['menu_timer', ['ConstantTimer', 'UniformRandomTimer', 'PreciseThroughputTimer', 'ConstantThroughputTimer', 'Separator', 'JSR223Timer', 'SyncTimer', 'PoissonRandomTimer', 'GaussianRandomTimer', 'BeanShellTimer']],
['menu_config_element', ['CSVDataSet', 'HeaderPanel', 'CookiePanel', 'CacheManager', 'HttpDefaults', 'Separator', 'BoltConnectionElement', 'DNSCachePanel', 'FtpConfig', 'AuthPanel', 'DataSourceElement', 'JavaConfig', 'LdapExtConfig', 'LdapConfig', 'TCPConfig', 'KeystoreConfig', 'ArgumentsPanel', 'LoginConfig', 'SimpleConfig', 'CounterConfig', 'RandomVariableConfig']],
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index 7ddbaf1855..d9df7bb286 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -129,7 +129,7 @@
+ @runRefresh="runRefresh" @errorRefresh="errorRefresh" ref="runTest"/>
@@ -563,6 +563,7 @@ export default {
/*触发执行操作*/
let sign = this.$refs.envPopover.checkEnv();
if (!sign) {
+ this.errorRefresh();
return;
}
this.$refs['currentScenario'].validate((valid) => {
@@ -584,6 +585,8 @@ export default {
this.reportId = getUUID().substring(0, 8);
}
});
+ }else{
+ this.errorRefresh();
}
})
},
@@ -761,6 +764,10 @@ export default {
this.debugVisible = true;
this.loading = false;
},
+ errorRefresh(){
+ this.debugVisible = false;
+ this.loading = false;
+ },
showScenarioParameters() {
this.$refs.scenarioParameters.open(this.currentScenario.variables, this.currentScenario.headers);
},
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
index 0a8e787126..edc235ecec 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue
@@ -19,7 +19,7 @@