From d83d35aee93a39708857ff8419b995cd0b242215 Mon Sep 17 00:00:00 2001
From: GraceWalk <gracewalk1999@163.com>
Date: Wed, 21 Sep 2022 16:12:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=20&=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 km-console/packages/layout-clusters-fe/src/locales/zh.tsx   | 3 +--
 .../layout-clusters-fe/src/pages/Consumers/index.less       | 4 ++++
 .../layout-clusters-fe/src/pages/Jobs/RebalancePlan.tsx     | 4 ++--
 .../layout-clusters-fe/src/pages/LoadRebalance/index.tsx    | 2 +-
 .../src/pages/MutliClusterPage/AccessCluster.tsx            | 6 +++---
 .../layout-clusters-fe/src/pages/TopicList/Create.tsx       | 4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/km-console/packages/layout-clusters-fe/src/locales/zh.tsx b/km-console/packages/layout-clusters-fe/src/locales/zh.tsx
index db190ffc..85c9014b 100755
--- a/km-console/packages/layout-clusters-fe/src/locales/zh.tsx
+++ b/km-console/packages/layout-clusters-fe/src/locales/zh.tsx
@@ -21,7 +21,6 @@ export default {
 
   [`menu.${systemKey}.cluster`]: 'Cluster',
   [`menu.${systemKey}.cluster.overview`]: 'Overview',
-  [`menu.${systemKey}.cluster.balance`]: 'Load Rebalance',
 
   [`menu.${systemKey}.broker`]: 'Broker',
   [`menu.${systemKey}.broker.dashbord`]: 'Overview',
@@ -45,7 +44,7 @@ export default {
   [`menu.${systemKey}.consumer-group.group-list`]: 'GroupList',
 
   [`menu.${systemKey}.operation`]: 'Operation',
-  [`menu.${systemKey}.operation.balance`]: 'Load Rebalance',
+  [`menu.${systemKey}.operation.balance`]: 'Rebalance',
   [`menu.${systemKey}.operation.jobs`]: 'Job',
 
   [`menu.${systemKey}.acls`]: 'ACLs',
diff --git a/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.less b/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.less
index 09af80b8..2ff718b7 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.less
+++ b/km-console/packages/layout-clusters-fe/src/pages/Consumers/index.less
@@ -53,6 +53,10 @@
       align-items: center;
       .d-range-time-input {
         height: 27px !important;
+        padding: 0 11px;
+        input{
+          line-height: 100%;
+        }
       }
       .divider {
         width: 1px;
diff --git a/km-console/packages/layout-clusters-fe/src/pages/Jobs/RebalancePlan.tsx b/km-console/packages/layout-clusters-fe/src/pages/Jobs/RebalancePlan.tsx
index 4b11b2e7..024fced3 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/Jobs/RebalancePlan.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/Jobs/RebalancePlan.tsx
@@ -13,8 +13,8 @@ interface PropsType {
 }
 
 const typeObj: any = {
-  1: '周期均衡',
-  2: '立即均衡',
+  1: '立即均衡',
+  2: '周期均衡',
 };
 
 const { request, post } = Utils;
diff --git a/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx
index 2ff2b960..1a7b035f 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/LoadRebalance/index.tsx
@@ -330,7 +330,7 @@ const LoadBalance: React.FC = (props: any) => {
           breadcrumbs={[
             { label: '多集群管理', aHref: '/' },
             { label: global?.clusterInfo?.name, aHref: `/cluster/${global?.clusterInfo?.id}` },
-            { label: 'Load Rebalance', aHref: `` },
+            { label: 'Rebalance', aHref: `` },
           ]}
         />
       </div>
diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx
index 908c2f57..6ca8666c 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx
@@ -202,7 +202,7 @@ const AccessClusters = (props: any): JSX.Element => {
           }
 
           if (modifyKey) {
-            extraMsg[modifyKey] = `连接失败。${message}`;
+            extraMsg[modifyKey] = message;
           }
         });
 
@@ -338,7 +338,7 @@ const AccessClusters = (props: any): JSX.Element => {
             <Form.Item
               name="bootstrapServers"
               label="Bootstrap Servers"
-              extra={<span className={extra.bootstrapExtra.includes('连接成功') ? 'error-extra-info' : ''}>{extra.bootstrapExtra}</span>}
+              extra={<span className={!extra.bootstrapExtra.includes('连接成功') ? 'error-extra-info' : ''}>{extra.bootstrapExtra}</span>}
               validateTrigger={'onBlur'}
               rules={[
                 {
@@ -374,7 +374,7 @@ const AccessClusters = (props: any): JSX.Element => {
             <Form.Item
               name="zookeeper"
               label="Zookeeper"
-              extra={<span className={extra.zooKeeperExtra.includes('连接成功') ? 'error-extra-info' : ''}>{extra.zooKeeperExtra}</span>}
+              extra={<span className={!extra.zooKeeperExtra.includes('连接成功') ? 'error-extra-info' : ''}>{extra.zooKeeperExtra}</span>}
               validateStatus={zookeeperErrorStatus ? 'error' : 'success'}
               validateTrigger={'onBlur'}
               rules={[
diff --git a/km-console/packages/layout-clusters-fe/src/pages/TopicList/Create.tsx b/km-console/packages/layout-clusters-fe/src/pages/TopicList/Create.tsx
index 218b0754..288b99c7 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/TopicList/Create.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/TopicList/Create.tsx
@@ -218,10 +218,10 @@ export default (props: any) => {
           </Form.Item>
           <div className="create-topic-flex-layout">
             <Form.Item name="partitionNum" label="分区数" rules={[{ required: true, message: '请输入分区数' }]}>
-              <InputNumber min={1} style={{ width: '100%' }} />
+              <InputNumber min={1} style={{ width: '100%' }} addonAfter="个" />
             </Form.Item>
             <Form.Item name="replicaNum" label="副本数" rules={[{ required: true, message: '请输入副本数' }]}>
-              <InputNumber min={1} style={{ width: '100%' }} />
+              <InputNumber min={1} style={{ width: '100%' }} addonAfter="个" />
             </Form.Item>
           </div>
           <Form.Item className="data-save-time-label" name="dataSaveTime">