From 0c692cd7949d00d741beb1bd0d82404c20760b33 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 27 Sep 2021 16:31:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)=20?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=A4=84?= =?UTF-8?q?=E7=90=86=20--bug=3D1006958=20--user=3D=E8=B5=B5=E5=8B=87=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=AE=A4=E8=AF=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=20https://www.tapd.cn/55049933/s/10?= =?UTF-8?q?52429?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/ApiScenarioList.vue | 3 +++ .../components/api/automation/scenario/DebugRun.vue | 3 +++ .../api/automation/scenario/EditApiScenario.vue | 6 ++++++ .../api/definition/components/EditCompleteContainer.vue | 3 +++ .../components/api/definition/components/Run.vue | 3 +++ .../api/definition/components/basis/AddBasisApi.vue | 3 +++ .../api/definition/components/case/ApiCaseItem.vue | 6 ++++++ .../api/definition/components/case/ApiCaseList.vue | 9 +++------ .../api/definition/components/debug/DebugDubboPage.vue | 3 +++ .../api/definition/components/debug/DebugHttpPage.vue | 3 +++ .../api/definition/components/list/ApiCaseSimpleList.vue | 3 +++ .../definition/components/reference/ApiExtendBtns.vue | 3 +++ .../definition/components/runtest/RunTestHTTPPage.vue | 3 +++ .../components/settings/project/function/FunctionRun.vue | 3 +++ 14 files changed, 48 insertions(+), 6 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 77c85da331..bd064f08be 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -877,6 +877,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.sort(stepArray[i].hashTree); } diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue index 0bc97a02ce..1c0a55fe8e 100644 --- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue +++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue @@ -39,6 +39,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.sort(stepArray[i].hashTree); } diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue index 54967468f7..0ed80407e4 100644 --- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue +++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue @@ -967,6 +967,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (!stepArray[i].projectId) { // 如果自身没有ID并且场景有ID则赋值场景ID,否则赋值当前项目ID stepArray[i].projectId = scenarioProjectId ? scenarioProjectId : this.projectId; @@ -1378,6 +1381,9 @@ export default { if (!hashTree[i].clazzName) { hashTree[i].clazzName = TYPE_TO_C.get(hashTree[i].type); } + if (hashTree[i] && hashTree[i].authManager && !hashTree[i].authManager.clazzName) { + hashTree[i].authManager.clazzName = TYPE_TO_C.get(hashTree[i].authManager.type); + } if (hashTree[i].hashTree && hashTree[i].hashTree.length > 0) { this.formatData(hashTree[i].hashTree); } diff --git a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue index 39ae9777c0..edf9163e46 100644 --- a/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue +++ b/frontend/src/business/components/api/definition/components/EditCompleteContainer.vue @@ -183,6 +183,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.sort(stepArray[i].hashTree); } diff --git a/frontend/src/business/components/api/definition/components/Run.vue b/frontend/src/business/components/api/definition/components/Run.vue index 3866d4c9bf..88b08e7a60 100644 --- a/frontend/src/business/components/api/definition/components/Run.vue +++ b/frontend/src/business/components/api/definition/components/Run.vue @@ -64,6 +64,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.sort(stepArray[i].hashTree); } diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue index 6abaf3d750..14791020af 100644 --- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue +++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue @@ -108,6 +108,9 @@ if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.compatibleHistory(stepArray[i].hashTree); } 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 ea1c637457..de4714ff10 100644 --- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue +++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue @@ -397,6 +397,9 @@ export default { if (!stepArray[i].clazzName) { stepArray[i].clazzName = TYPE_TO_C.get(stepArray[i].type); } + if (stepArray[i] && stepArray[i].authManager && !stepArray[i].authManager.clazzName) { + stepArray[i].authManager.clazzName = TYPE_TO_C.get(stepArray[i].authManager.type); + } if (stepArray[i].hashTree && stepArray[i].hashTree.length > 0) { this.sort(stepArray[i].hashTree); } @@ -438,6 +441,9 @@ export default { } if (tmp.request) { tmp.request.clazzName = TYPE_TO_C.get(tmp.request.type); + if (tmp.request.authManager) { + tmp.request.authManager.clazzName = TYPE_TO_C.get(tmp.request.authManager.type); + } this.sort(tmp.request.hashTree); } this.result = this.$fileUpload(url, null, bodyFiles, tmp, (response) => { 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 e5bf2e2d75..28c2798eee 100644 --- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue +++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue @@ -58,22 +58,19 @@