From bb108e595ad81df24bd12d2167f5ae78899b1bdd Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 22 Sep 2021 19:55:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96)=20=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7=E5=8C=96?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=90=8E=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20--bug=3D1006837=20--user=3D=E8=B5=B5=E5=8B=87=20=E3=80=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92-=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=91=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=85=8D=E7=BD=AE=E4=B8=BA=E7=A9=BA=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E7=8E=AF=E5=A2=83=E4=B8=8E?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=AD=89=20https://www.tapd.cn/5504?= =?UTF-8?q?9933/s/1049756?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/EditApiScenario.vue | 6 ++++++ .../components/api/automation/scenario/Setting.js | 2 +- .../automation/scenario/maximize/MaximizeScenario.vue | 9 ++++++++- .../automation/scenario/maximize/ScenarioHeader.vue | 11 ++++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) 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 @@
共享cookie - {{$t('commons.failure_continues')}} + {{ $t('commons.failure_continues') }}