From 0e882485b7b8d5c0e0cccbbd1cc66d292c391b7e Mon Sep 17 00:00:00 2001 From: baiqi Date: Wed, 11 Sep 2024 18:20:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4&?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8C=E6=AD=A5=20mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/models/apiTest/management.ts | 1 + .../api-test/management/components/import.vue | 11 + .../views/api-test/management/locale/en-US.ts | 1 + .../views/api-test/management/locale/zh-CN.ts | 1 + .../report/component/case/setReportChart.vue | 2 +- .../report/component/caseReportCom.vue | 301 +++++++++--------- .../api-test/report/component/scenarioCom.vue | 1 + .../report/component/step/stepTree.vue | 2 +- .../api-test/report/component/tiledList.vue | 2 +- 9 files changed, 176 insertions(+), 146 deletions(-) diff --git a/frontend/src/models/apiTest/management.ts b/frontend/src/models/apiTest/management.ts index 94e3416379..272cdb1972 100644 --- a/frontend/src/models/apiTest/management.ts +++ b/frontend/src/models/apiTest/management.ts @@ -229,6 +229,7 @@ export interface ImportApiDefinitionRequest { coverModule: boolean; // 是否覆盖子目录 coverData: boolean; // 是否覆盖数据 syncCase: boolean; // 是否同步导入用例 + syncMock: boolean; // 是否同步导入mock protocol: string; authSwitch?: boolean; authUsername?: string; diff --git a/frontend/src/views/api-test/management/components/import.vue b/frontend/src/views/api-test/management/components/import.vue index 221e228dfe..aba11c8754 100644 --- a/frontend/src/views/api-test/management/components/import.vue +++ b/frontend/src/views/api-test/management/components/import.vue @@ -100,6 +100,13 @@ {{ t('apiTestManagement.syncImportCase') }} +
+ + {{ t('apiTestManagement.syncImportMock') }} +
--> -
+
diff --git a/frontend/src/views/api-test/report/component/caseReportCom.vue b/frontend/src/views/api-test/report/component/caseReportCom.vue index f1677293b9..6ee8994693 100644 --- a/frontend/src/views/api-test/report/component/caseReportCom.vue +++ b/frontend/src/views/api-test/report/component/caseReportCom.vue @@ -4,151 +4,155 @@ -
+
-
-
{{ t('report.detail.api.requestAnalysis') }}
- -
- -
-
-
- - {{ t('report.detail.api.totalTime') }} - - {{ getTotalTime.split('-')[0] }}{{ getTotalTime.split('-')[1] || 'ms' }} - - + + + +
-
- - {{ t('report.detail.api.requestTotalTime') }} - + +
+ +
+
+ + {{ t('report.detail.api.executionRate') }} +
-
{{ - detail.requestDuration !== null ? formatDuration(detail.requestDuration).split('-')[0] : '0' - }}
{{ - detail.requestDuration !== null ? formatDuration(detail.requestDuration).split('-')[1] : 'ms' - }}
+ +
{{ getExcuteRate() }}
% + + {{ getIndicators(getRequestEacuteCount) }} + / {{ getIndicators(getRequestTotalCount) }} + + +
+
+
+
+ + {{ t('report.detail.api.assertPass') }}
- - -
-
- -
- -
-
- - {{ t('report.detail.api.executionRate') }} -
-
- -
{{ getExcuteRate() }}
% - - {{ getIndicators(getRequestEacuteCount) }} - / {{ getIndicators(getRequestTotalCount) }} - - -
-
-
-
- - {{ t('report.detail.api.assertPass') }} -
-
- -
-
{{ detail.assertionPassRate || '0.00' }}
% - -
{{ - getIndicators(detail.assertionSuccessCount) !== 'Calculating' - ? addCommasToNumber(detail.assertionSuccessCount || 0) - : getIndicators(detail.assertionSuccessCount) - }}
- / -
- {{ - getIndicators(detail.assertionCount) !== 'Calculating' - ? addCommasToNumber(detail.assertionCount) - : getIndicators(detail.assertionCount) - }}
-
- - - + + +
@@ -417,11 +421,12 @@ @apply mb-4 bg-white; } .analyze { - height: 196px; + @apply mb-4 bg-white; + + padding: 16px; border-radius: 4px; - @apply mb-4 flex justify-between bg-white; .request-analyze { - @apply flex h-full flex-1 flex-col p-4; + @apply flex h-full flex-1 flex-col; .chart-legend { .chart-legend-item { @apply grid grid-cols-3 gap-2; @@ -435,28 +440,36 @@ } } .time-analyze { - @apply flex h-full flex-1 flex-col p-4; + @apply flex h-full flex-1 flex-col px-4; .time-card { @apply flex items-center justify-between; .time-card-item { + @apply flex flex-1 flex-grow items-end; + + padding: 9px 12px; border-radius: 6px; background: var(--color-text-n9); - @apply mt-4 flex flex-1 flex-grow items-center px-4; .time-card-item-title { color: var(--color-text-4); + line-height: 16px; } .count { - font-size: 18px; @apply mx-2 font-medium; + + line-height: 22px; + font-size: 18px; } } .time-card-item-rote { + @apply flex flex-1 flex-grow flex-col; + + padding: 9px 12px; border-radius: 6px; background: var(--color-text-n9); - @apply mt-4 flex flex-1 flex-grow flex-col p-4; .time-card-item-rote-title { + @apply mb-2 flex items-center; + color: var(--color-text-4); - @apply mb-2; } .count { font-size: 18px; @@ -473,7 +486,9 @@ } } .block-title { - font-size: 14px; @apply font-medium; + + margin-bottom: 16px; + font-size: 14px; } diff --git a/frontend/src/views/api-test/report/component/scenarioCom.vue b/frontend/src/views/api-test/report/component/scenarioCom.vue index bdf022cd6c..5c74b6db9a 100644 --- a/frontend/src/views/api-test/report/component/scenarioCom.vue +++ b/frontend/src/views/api-test/report/component/scenarioCom.vue @@ -48,6 +48,7 @@ :active-type="activeTab" :report-detail="detail || []" :is-export="props.isExport" + class="p-[16px]" />
diff --git a/frontend/src/views/api-test/report/component/step/stepTree.vue b/frontend/src/views/api-test/report/component/step/stepTree.vue index 6f31163a45..f90d0c8131 100644 --- a/frontend/src/views/api-test/report/component/step/stepTree.vue +++ b/frontend/src/views/api-test/report/component/step/stepTree.vue @@ -382,7 +382,7 @@ .arco-tree-node-title { @apply !cursor-pointer bg-white; - padding: 12px 4px; + padding: 8px 4px; &:hover { background-color: white !important; } diff --git a/frontend/src/views/api-test/report/component/tiledList.vue b/frontend/src/views/api-test/report/component/tiledList.vue index 42d92347f0..cdea821504 100644 --- a/frontend/src/views/api-test/report/component/tiledList.vue +++ b/frontend/src/views/api-test/report/component/tiledList.vue @@ -1,6 +1,6 @@