From 5efb837ee8449d2aa09ec86fea6f7267f94cb7bb Mon Sep 17 00:00:00 2001
From: GraceWalk <gracewalk1999@163.com>
Date: Tue, 13 Sep 2022 14:46:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E9=9B=86=E7=BE=A4=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/SingleClusterDetail/ChangeLog.tsx   | 14 ++-----------
 .../pages/SingleClusterDetail/CheckDetail.tsx |  6 +-----
 .../pages/SingleClusterDetail/LeftSider.tsx   |  5 ++---
 .../src/pages/SingleClusterDetail/index.less  | 20 -------------------
 4 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/ChangeLog.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/ChangeLog.tsx
index d451ca22..270205c9 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/ChangeLog.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/ChangeLog.tsx
@@ -7,6 +7,7 @@ import moment from 'moment';
 import { timeFormat } from '../../constants/common';
 import { DownOutlined } from '@ant-design/icons';
 import { renderToolTipValue } from './config';
+import RenderEmpty from '@src/components/RenderEmpty';
 
 const { Panel } = Collapse;
 
@@ -51,17 +52,6 @@ const ChangeLog = () => {
     );
   }, []);
 
-  const renderEmpty = () => {
-    return (
-      <>
-        <div className="empty-panel">
-          <div className="img" />
-          <div className="text">暂无配置记录</div>
-        </div>
-      </>
-    );
-  };
-
   const getHref = (item: any) => {
     if (item.resTypeName.toLowerCase().includes('topic')) return `/cluster/${clusterId}/topic/list#topicName=${item.resName}`;
     if (item.resTypeName.toLowerCase().includes('broker')) return `/cluster/${clusterId}/broker/list#brokerId=${item.resName}`;
@@ -73,7 +63,7 @@ const ChangeLog = () => {
       <div className="change-log-panel">
         <div className="title">历史变更记录</div>
         {!loading && !data.length ? (
-          renderEmpty()
+          <RenderEmpty message="暂无配置记录" />
         ) : (
           <div id="changelog-scroll-box">
             <Spin spinning={loading} style={{ paddingLeft: '42%', marginTop: 100 }} />
diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/CheckDetail.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/CheckDetail.tsx
index 42da736b..29fc708a 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/CheckDetail.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/CheckDetail.tsx
@@ -1,14 +1,11 @@
 /* eslint-disable react/display-name */
-import { Drawer, Form, Spin, Table, Utils } from 'knowdesign';
+import { Drawer, Spin, Table, Utils } from 'knowdesign';
 import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
-import { useIntl } from 'react-intl';
 import { getDetailColumn } from './config';
 import API from '../../api';
 import { useParams } from 'react-router-dom';
 
 const CheckDetail = forwardRef((props: any, ref): JSX.Element => {
-  const intl = useIntl();
-  const [form] = Form.useForm();
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState([]);
@@ -28,7 +25,6 @@ const CheckDetail = forwardRef((props: any, ref): JSX.Element => {
   };
 
   const onCancel = () => {
-    form.resetFields();
     setVisible(false);
   };
 
diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx
index dc104a1a..5a428b5b 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/LeftSider.tsx
@@ -153,7 +153,7 @@ const LeftSider = () => {
         <Divider />
         <div className="title">
           <div className="name">{renderToolTipValue(clusterInfo?.name, 35)}</div>
-          {global.hasPermission && global.hasPermission(ClustersPermissionMap.CLUSTER_CHANGE_INFO) ? (
+          {!loading && global.hasPermission && global.hasPermission(ClustersPermissionMap.CLUSTER_CHANGE_INFO) ? (
             <div className="edit-icon-box" onClick={() => setVisible(true)}>
               <IconFont className="edit-icon" type="icon-bianji2" />
             </div>
@@ -239,8 +239,7 @@ const LeftSider = () => {
       <AccessClusters
         visible={visible}
         setVisible={setVisible}
-        title={'edit.cluster'}
-        infoLoading={loading}
+        title="edit.cluster"
         afterSubmitSuccess={getPhyClusterInfo}
         clusterInfo={clusterInfo}
         kafkaVersion={Object.keys(kafkaVersion)}
diff --git a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.less b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.less
index b7314f38..7baae7b8 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.less
+++ b/km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/index.less
@@ -377,26 +377,6 @@
           }
         }
       }
-
-      .empty-panel {
-        margin-top: 96px;
-        text-align: center;
-
-        .img {
-          width: 51px;
-          height: 34px;
-          margin-left: 80px;
-          margin-bottom: 7px;
-          background-size: cover;
-          background-image: url('../../assets/empty.png');
-        }
-
-        .text {
-          font-size: 10px;
-          color: #919aac;
-          line-height: 20px;
-        }
-      }
     }
   }
 }
-- 
GitLab