From f0324e3bdb3f9e666ba97d655508b0ad6fddcffd Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Tue, 8 Nov 2022 13:51:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=E5=B0=B1=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001019490 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001018365 --user=郭雨琦 --- .../ApiDefinitionExecResultService.java | 5 ----- .../complete/EditCompleteHTTPApi.vue | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java index 7b75802f1c..5c017876ec 100644 --- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java +++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java @@ -237,11 +237,6 @@ public class ApiDefinitionExecResultService { // 更新用例最后执行结果 caseWithBLOBs.setLastResultId(reportId); caseWithBLOBs.setStatus(status); - if (status.equals(ApiReportStatus.ERROR.name())) { - caseWithBLOBs.setToBeUpdated(true); - } else { - caseWithBLOBs.setToBeUpdated(false); - } caseWithBLOBs.setUpdateTime(System.currentTimeMillis()); apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs); diff --git a/api-test/frontend/src/business/definition/components/complete/EditCompleteHTTPApi.vue b/api-test/frontend/src/business/definition/components/complete/EditCompleteHTTPApi.vue index dd005da69e..db1f483e60 100644 --- a/api-test/frontend/src/business/definition/components/complete/EditCompleteHTTPApi.vue +++ b/api-test/frontend/src/business/definition/components/complete/EditCompleteHTTPApi.vue @@ -517,7 +517,23 @@ export default { this.batchSyncApiVisible = true; } } - if (this.apiSyncRuleRelation.showUpdateRule === true && !this.noShowSyncRuleRelation) { + if (this.request.authManager && this.beforeRequest.authManager) { + let submitRequestAuthManager = JSON.stringify(this.request.authManager); + let beforeRequestAuthManager = JSON.stringify(this.beforeRequest.authManager); + if ((submitRequestAuthManager !== beforeRequestAuthManager) && !this.noShowSyncRuleRelation) { + this.batchSyncApiVisible = true; + } + } + if (this.request.hashTree && this.beforeRequest.hashTree) { + let submitRequestHashTree = JSON.stringify(this.request.hashTree); + let beforeRequestHashTree = JSON.stringify(this.beforeRequest.hashTree); + if ((submitRequestHashTree !== beforeRequestHashTree) && !this.noShowSyncRuleRelation) { + this.batchSyncApiVisible = true; + } + } + if (((this.request.connectTimeout !== this.beforeRequest.connectTimeout) || (this.request.responseTimeout !== this.beforeRequest.responseTimeout) + || (this.request.followRedirects !== this.beforeRequest.followRedirects) || (this.request.alias !== this.beforeRequest.alias) + || this.apiSyncRuleRelation.showUpdateRule === true) && !this.noShowSyncRuleRelation) { this.batchSyncApiVisible = true; } if (this.batchSyncApiVisible !== true) {