From cd03ccead90b9b3c8b2ae79b8b307db57b426c7b Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Wed, 17 Apr 2024 21:20:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80bug?= =?UTF-8?q?=E6=A0=91=E6=A8=A1=E5=BF=AB=E6=82=AC=E6=B5=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?&=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86bug&=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=8F=9C=E5=8D=95style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ms-case-associate/index.vue | 2 +- .../ms-common-script/formApiImportDrawer.vue | 2 +- .../ms-common-script/ms-addScriptDrawer.vue | 3 +- .../ms-common-script/ms-script-menu.vue | 33 +++++++------- .../business/ms-link-file/fileTree.vue | 2 +- .../src/components/business/ms-tree/index.vue | 5 ++- .../components/pure/ms-code-editor/index.vue | 5 +++ frontend/src/components/pure/navbar/index.vue | 6 +++ frontend/src/config/pathMap.ts | 3 ++ .../requestComposition/response/result.vue | 12 +++-- .../response/result/body.vue | 5 +++ .../api-test/debug/components/moduleTree.vue | 2 +- .../management/api/preview/quote.vue | 9 ++++ .../management/components/moduleTree.vue | 2 +- .../common/importApiDrawer/moduleTree.vue | 4 +- .../operationScenarioModuleTree.vue | 2 +- .../api-test/scenario/recycle/recycleTree.vue | 2 +- .../components/bug-detail-drawer.vue | 44 +++++++++++-------- .../components/caseTree.vue | 8 ++-- .../components/recycleCaseTable.vue | 4 +- .../tabDependency/preAndPostCaseDrawer.vue | 2 +- .../caseManagementFeature/index.vue | 2 +- .../caseReview/components/detail/caseTree.vue | 2 +- .../components/index/moduleTree.vue | 4 +- .../fileManagement/components/folderTree.vue | 4 +- .../testPlan/components/testPlanTree.vue | 4 +- 26 files changed, 115 insertions(+), 58 deletions(-) diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index fbf71300a8..311b80be49 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -78,7 +78,7 @@ diff --git a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue index 7bd4044c04..f79a49a5ea 100644 --- a/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue +++ b/frontend/src/components/business/ms-common-script/formApiImportDrawer.vue @@ -53,7 +53,7 @@ diff --git a/frontend/src/components/business/ms-common-script/ms-addScriptDrawer.vue b/frontend/src/components/business/ms-common-script/ms-addScriptDrawer.vue index 7996a4c60c..c57c3d7dec 100644 --- a/frontend/src/components/business/ms-common-script/ms-addScriptDrawer.vue +++ b/frontend/src/components/business/ms-common-script/ms-addScriptDrawer.vue @@ -2,7 +2,8 @@ -
-
+
+
@@ -8,22 +8,23 @@ -
{{ t('project.commonScript.codeSnippet') }}
+
{{ t('project.commonScript.codeSnippet') }}
- - - - {{ item.text }} - - - +
+ + + + {{ item.text }} + + + +
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue index 765ff979c1..c6352d9cb6 100644 --- a/frontend/src/components/business/ms-tree/index.vue +++ b/frontend/src/components/business/ms-tree/index.vue @@ -405,7 +405,7 @@ @apply h-full; .ms-tree { .ms-scroll-bar(); - @apply h-full; + @apply h-full overflow-auto; .arco-tree-node { border-radius: var(--border-radius-small); &:hover { @@ -418,6 +418,9 @@ } } } + .ms-tree-node-count { + @apply hidden; + } .ms-tree-node-extra { @apply visible w-auto; } diff --git a/frontend/src/components/pure/ms-code-editor/index.vue b/frontend/src/components/pure/ms-code-editor/index.vue index bbfcbe8e6f..970729beba 100644 --- a/frontend/src/components/pure/ms-code-editor/index.vue +++ b/frontend/src/components/pure/ms-code-editor/index.vue @@ -252,6 +252,10 @@ } } } + // 获取编码方式对应内容 + function getEncodingCode() { + return editor.getValue(); + } const init = () => { // 注册自定义主题 TODO:自定义主题高亮色还没配置 @@ -351,6 +355,7 @@ undo, redo, format, + getEncodingCode, }; }, }); diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue index 04fe182217..2cc64335f0 100644 --- a/frontend/src/components/pure/navbar/index.vue +++ b/frontend/src/components/pure/navbar/index.vue @@ -265,6 +265,12 @@ function goMessageCenter() { messageCenterVisible.value = true; } + + onMounted(() => { + if (route.query.task) { + goTaskCenter(); + } + }); diff --git a/frontend/src/views/api-test/debug/components/moduleTree.vue b/frontend/src/views/api-test/debug/components/moduleTree.vue index 85a85177a4..24bd945b3b 100644 --- a/frontend/src/views/api-test/debug/components/moduleTree.vue +++ b/frontend/src/views/api-test/debug/components/moduleTree.vue @@ -105,7 +105,7 @@
{{ nodeData.name }}
-
({{ nodeData.count || 0 }})
+
({{ nodeData.count || 0 }})
diff --git a/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue b/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue index 9ff2de1dea..51e28cca8a 100644 --- a/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue +++ b/frontend/src/views/case-management/caseReview/components/index/moduleTree.vue @@ -59,7 +59,9 @@