同步代码

km-console/packages/layout-clusters-fe/src/components/DashboardDragChart/ChartDetail.tsx

@@ -6,6 +6,7 @@ import { useParams } from 'react-router-dom';
 import { debounce } from 'lodash';
 import { MetricDefaultChartDataType, MetricChartDataType, formatChartData, getDetailChartConfig } from './config';
 import { UNIT_MAP } from '@src/constants/chartConfig';
+import { CloseOutlined } from '@ant-design/icons';
 
 interface ChartDetailProps {
   metricType: MetricType;
@@ -51,6 +52,7 @@ const colunms = [
   {
     title: 'Host',
     dataIndex: 'name',
+    width: 200,
     render(name: string, record: any) {
       return (
         <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -63,6 +65,7 @@ const colunms = [
   {
     title: 'Avg',
     dataIndex: 'avg',
+    width: 120,
     render(num: number) {
       return num.toFixed(2);
     },
@@ -70,6 +73,7 @@ const colunms = [
   {
     title: 'Max',
     dataIndex: 'max',
+    width: 120,
     render(num: number, record: any) {
       return (
         <div>
@@ -81,6 +85,7 @@ const colunms = [
   {
     title: 'Min',
     dataIndex: 'min',
+    width: 120,
     render(num: number, record: any) {
       return (
         <div>
@@ -92,6 +97,7 @@ const colunms = [
   {
     title: 'Latest',
     dataIndex: 'latest',
+    width: 120,
     render(latest: number[]) {
       return `${latest[1].toFixed(2)}`;
     },
@@ -553,7 +559,7 @@ const ChartDetail = (props: ChartDetailProps) => {
               </div>
               <div className="right">
                 <Button type="text" size="small" onClick={onClose}>
-                  <IconFont type="icon-guanbi" />
+                  <CloseOutlined />
                 </Button>
               </div>
             </div>

km-console/packages/layout-clusters-fe/src/components/DashboardDragChart/config.tsx

@@ -1,4 +1,4 @@
-import { getUnit, getDataNumberUnit, getBasicChartConfig } from '@src/constants/chartConfig';
+import { getUnit, getDataNumberUnit, getBasicChartConfig, CHART_COLOR_LIST } from '@src/constants/chartConfig';
 import { MetricType } from '@src/api';
 import { MetricsDefine } from '@src/pages/CommonConfig';
 
@@ -140,7 +140,7 @@ const seriesCallback = (lines: { name: string; data: [number, string | number][]
     return {
       ...line,
       lineStyle: {
-        width: 1,
+        width: 1.5,
       },
       symbol: 'emptyCircle',
       symbolSize: 4,
@@ -158,6 +158,7 @@ export const getChartConfig = (title: string, metricLength: number) => {
       title: { show: false },
       grid: { top: 24 },
       tooltip: { enterable: metricLength > 9, legendContextMaxHeight: 192 },
+      color: CHART_COLOR_LIST,
       // xAxis: {
       //   type: 'time',
       //   boundaryGap: ['5%', '5%'],

km-console/packages/layout-clusters-fe/src/components/DashboardDragChart/index.less

@@ -10,51 +10,52 @@
     .drag-sort-item:last-child {
       margin-bottom: 10px;
     }
-    .dashboard-drag-item-box {
-      position: relative;
-      width: auto;
-      height: 262px;
-      background: #fff;
-      border-radius: 8px;
-      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.01), 0 3px 6px 3px rgba(0, 0, 0, 0.01), 0 2px 6px 0 rgba(0, 0, 0, 0.03);
-      &-title {
-        padding: 18px 0 0 20px;
-        font-family: @font-family-bold;
-        line-height: 16px;
-        .name {
-          font-size: 14px;
-          color: #212529;
-        }
-        .unit {
-          font-size: 12px;
-          color: #495057;
-        }
-        > span {
-          cursor: pointer;
-        }
-      }
-      .expand-icon-box {
-        position: absolute;
-        z-index: 1000;
-        top: 14px;
-        right: 44px;
-        width: 24px;
-        height: 24px;
-        cursor: pointer;
-        font-size: 16px;
-        text-align: center;
-        border-radius: 50%;
-        transition: background-color 0.3s ease;
-        .expand-icon {
-          color: #adb5bc;
-          line-height: 24px;
-        }
-        &:hover {
-          background: rgba(33, 37, 41, 0.06);
-          .expand-icon {
-            color: #74788d;
-          }
-        }
+  }
+}
+
+.dashboard-drag-item-box {
+  position: relative;
+  width: auto;
+  height: 262px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.01), 0 3px 6px 3px rgba(0, 0, 0, 0.01), 0 2px 6px 0 rgba(0, 0, 0, 0.03);
+  &-title {
+    padding: 18px 0 0 20px;
+    font-family: @font-family-bold;
+    line-height: 16px;
+    .name {
+      font-size: 14px;
+      color: #212529;
+    }
+    .unit {
+      font-size: 12px;
+      color: #495057;
+    }
+    > span {
+      cursor: pointer;
+    }
+  }
+  .expand-icon-box {
+    position: absolute;
+    z-index: 1000;
+    top: 14px;
+    right: 44px;
+    width: 24px;
+    height: 24px;
+    cursor: pointer;
+    font-size: 16px;
+    text-align: center;
+    border-radius: 50%;
+    transition: background-color 0.3s ease;
+    .expand-icon {
+      color: #adb5bc;
+      line-height: 24px;
+    }
+    &:hover {
+      background: rgba(33, 37, 41, 0.06);
+      .expand-icon {
+        color: #74788d;
       }
     }
   }
@@ -91,7 +92,7 @@
     align-items: center;
     .left {
       display: flex;
-      align-items: center;
+      align-items: flex-end;
       .title {
         font-family: @font-family-bold;
         font-size: 18px;