fix(全局): 样式调整&部分问题修复

metersphere · Apr 28, 2024 · ab4676b · ab4676b
1 parent df16810
commit ab4676b
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 518 deletions.
diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less
@@ -709,12 +709,6 @@
     background-color: var(--color-text-input-border);
   }
 }
-// .ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-vertical {
-//   right: -10px;
-// }
-// .ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-horizontal {
-//   bottom: -10px;
-// }
 .ms-base-table .arco-scrollbar .arco-scrollbar-track-direction-vertical {
   right: 0;
 }

diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
@@ -675,6 +675,19 @@
         }
       }
     }
+    :deep(.arco-table-th):hover {
+      .arco-table-column-handle {
+        @apply inline-block;
+
+        top: 50%;
+        margin: 0 3px;
+        padding: 4px 0;
+        width: 2px;
+        height: 24px;
+        background-color: var(--color-text-n8);
+        transform: translateY(-50%);
+      }
+    }
     .setting-icon {
       color: var(--color-text-4);
       background-color: var(--color-text-10);

diff --git a/frontend/src/router/routes/modules/performanceTest.ts b/frontend/src/router/routes/modules/performanceTest.ts
diff --git a/frontend/src/router/routes/modules/uiTest.ts b/frontend/src/router/routes/modules/uiTest.ts
diff --git a/frontend/src/router/routes/modules/workbench.ts b/frontend/src/router/routes/modules/workbench.ts
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/detail.vue b/frontend/src/views/api-test/management/components/management/api/preview/detail.vue
@@ -778,8 +778,7 @@
     background-color: rgb(var(--primary-1));
   }
   .arco-collapse {
-    @apply h-full overflow-y-auto;
-    .ms-scroll-bar();
+    @apply h-full;
 
     border-radius: 0;
     :deep(.arco-collapse-item-icon-hover) {
@@ -795,10 +794,7 @@
       }
     }
     .detail-collapse-item {
-      @apply overflow-y-auto;
-
       margin-bottom: 16px;
-      .ms-scroll-bar();
     }
   }
   .detail-item {

diff --git a/frontend/src/views/api-test/management/components/management/api/preview/history.vue b/frontend/src/views/api-test/management/components/management/api/preview/history.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="history-container">
+  <div>
     <a-alert v-if="!getIsVisited()" :show-icon="false" class="mb-[16px]" type="warning" closable @close="addVisited">
       {{ t('apiTestManagement.historyListTip') }}
       <template #close-element>
@@ -115,10 +115,4 @@
   // }
 </script>
 
-<style lang="less" scoped>
-  .history-container {
-    @apply h-full overflow-y-auto;
-
-    .ms-scroll-bar();
-  }
-</style>
+<style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/index.vue b/frontend/src/views/api-test/management/components/management/api/preview/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full w-full overflow-hidden">
+  <div class="preview">
     <div class="px-[18px] pt-[16px]">
       <MsDetailCard
         :title="`【${previewDetail.num}】${previewDetail.name}`"
@@ -33,21 +33,19 @@
         </template>
       </MsDetailCard>
     </div>
-    <div class="h-[calc(100%-124px)]">
-      <a-tabs v-model:active-key="activeKey" class="h-full" animation lazy-load>
-        <a-tab-pane key="detail" :title="t('apiTestManagement.detail')" class="px-[18px] py-[16px]">
-          <detailTab :detail="previewDetail" :protocols="props.protocols" />
-        </a-tab-pane>
-        <a-tab-pane key="reference" :title="t('apiTestManagement.reference')" class="px-[18px] py-[16px]">
-          <quote :source-id="previewDetail.id" />
-        </a-tab-pane>
-        <!-- <a-tab-pane key="dependencies" :title="t('apiTestManagement.dependencies')" class="px-[18px] py-[16px]">
+    <a-tabs v-model:active-key="activeKey" animation lazy-load>
+      <a-tab-pane key="detail" :title="t('apiTestManagement.detail')" class="px-[18px] py-[16px]">
+        <detailTab :detail="previewDetail" :protocols="props.protocols" />
+      </a-tab-pane>
+      <a-tab-pane key="reference" :title="t('apiTestManagement.reference')" class="px-[18px] py-[16px]">
+        <quote :source-id="previewDetail.id" />
+      </a-tab-pane>
+      <!-- <a-tab-pane key="dependencies" :title="t('apiTestManagement.dependencies')" class="px-[18px] py-[16px]">
         </a-tab-pane> -->
-        <a-tab-pane key="changeHistory" :title="t('apiTestManagement.changeHistory')" class="px-[18px] py-[16px]">
-          <history :source-id="previewDetail.id" />
-        </a-tab-pane>
-      </a-tabs>
-    </div>
+      <a-tab-pane key="changeHistory" :title="t('apiTestManagement.changeHistory')" class="px-[18px] py-[16px]">
+        <history :source-id="previewDetail.id" />
+      </a-tab-pane>
+    </a-tabs>
   </div>
 </template>
 
@@ -187,3 +185,13 @@
 
   const activeKey = ref('detail');
 </script>
+
+<style lang="less" scoped>
+  .preview {
+    @apply h-full w-full overflow-y-auto overflow-x-hidden;
+    .ms-scroll-bar();
+    :deep(.arco-tabs-pane) {
+      @apply h-auto;
+    }
+  }
+</style>
diff --git a/frontend/src/views/api-test/management/components/management/api/preview/quote.vue b/frontend/src/views/api-test/management/components/management/api/preview/quote.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="history-container">
+  <div>
     <a-input-search
       v-model:model-value="keyword"
       :placeholder="t('apiTestManagement.quoteSearchPlaceholder')"
@@ -124,10 +124,4 @@
   });
 </script>
 
-<style lang="less" scoped>
-  .history-container {
-    @apply h-full overflow-y-auto;
-
-    .ms-scroll-bar();
-  }
-</style>
+<style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue b/frontend/src/views/api-test/management/components/recycle/api/apiTable.vue
@@ -491,8 +491,7 @@
       },
       onBeforeOk: async () => {
         try {
-          console.log(getBatchParams(), ' getBatchParams() getBatchParams()');
-          // await batchCleanOutDefinition(await getBatchParams());
+          await batchCleanOutDefinition(await getBatchParams());
           Message.success(t('common.deleteSuccess'));
           resetSelector();
           loadApiList(true);

diff --git a/frontend/src/views/api-test/management/recycle.vue b/frontend/src/views/api-test/management/recycle.vue
@@ -1,5 +1,5 @@
 <template>
-  <MsCard :min-width="1180" simple no-content-padding>
+  <MsCard has-breadcrumb simple no-content-padding>
     <MsSplitBox :size="300" :max="0.5">
       <template #first>
         <div class="p-[24px]">