Skip to content

Commit d566725

Browse files
committed
fix: 样式 & 文案细节优化
1 parent af2b939 commit d566725

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

km-console/packages/layout-clusters-fe/src/pages/Jobs/config.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ export const jobType = [
1919
},
2020
process.env.BUSSINESS_VERSION
2121
? {
22-
label: '集群均衡',
23-
value: 2,
24-
}
22+
label: '集群均衡',
23+
value: 2,
24+
}
2525
: undefined,
2626
].filter((t) => t);
2727

@@ -75,6 +75,7 @@ export const getJobsListColumns = (arg?: any) => {
7575
title: '任务ID',
7676
dataIndex: 'id',
7777
key: 'id',
78+
width: 70,
7879
},
7980
{
8081
title: '任务类型',

km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable react/display-name */
2-
31
import { Button, Divider, Drawer, Form, Input, InputNumber, message, Radio, Select, Spin, Space, Utils } from 'knowdesign';
42
import * as React from 'react';
53
import { useIntl } from 'react-intl';
@@ -16,10 +14,9 @@ const clientPropertiesPlaceholder = `用于创建Kafka客户端进行信息获
1614
{
1715
"security.protocol": "SASL_PLAINTEXT",
1816
"sasl.mechanism": "SCRAM-SHA-256",
19-
"sasl.jaas.config":
20-
"org.apache.kafka.common.security.scram.
21-
ScramLoginModule required username="xxxxxx"
22-
password="xxxxxx";"
17+
"sasl.jaas.config": "org.apache.kafka.common.security.
18+
scram.ScramLoginModule required username=\\"xxxxxx\\" pass
19+
word=\\"xxxxxx\\";"
2320
}
2421
`;
2522

km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/HomePage.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ const MultiClusterPage = () => {
9393
setVersionLoading(true);
9494
Utils.request(API.getClustersVersion)
9595
.then((versions: string[]) => {
96-
setExistKafkaVersion(versions || []);
96+
if (!Array.isArray(versions)) {
97+
versions = [];
98+
}
99+
setExistKafkaVersion(versions.sort().reverse() || []);
97100
setVersionLoading(false);
98101
setCheckedKafkaVersions(versions || []);
99102
})
@@ -299,7 +302,9 @@ const MultiClusterPage = () => {
299302
<div className="test-modal-23"></div>
300303
</div>
301304
</div>
302-
<Spin spinning={clusterLoading}>{renderList}</Spin>
305+
<div className="multi-cluster-page-dashboard">
306+
<Spin spinning={clusterLoading}>{renderList}</Spin>
307+
</div>
303308
</div>
304309
);
305310
};

km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/index.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,11 @@
329329
}
330330
}
331331
}
332+
&-dashboard {
333+
& > .dcloud-spin-nested-loading > .dcloud-spin-container::after {
334+
background: transparent;
335+
}
336+
}
332337

333338
.multi-cluster-list {
334339
box-sizing: content-box;

km-console/packages/layout-clusters-fe/src/pages/SingleClusterDetail/DetailChart/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ const DetailChart = (props: { children: JSX.Element }): JSX.Element => {
201201
if (Number.isNaN(parsedValue)) {
202202
parsedValue = values.MessagesIn;
203203
} else {
204+
// 为避免出现过小的数字影响图表展示效果,图表值统一只保留到小数点后三位
205+
parsedValue = parseFloat(parsedValue.toFixed(3));
204206
if (maxValue < parsedValue) maxValue = parsedValue;
205207
}
206208
const valuesWithUnit = Object.entries(values).map(([key, value]) => {
@@ -287,8 +289,8 @@ const DetailChart = (props: { children: JSX.Element }): JSX.Element => {
287289
checkboxProps: (record: MetricInfo) => {
288290
return record.name === DEFAULT_METRIC
289291
? {
290-
disabled: true,
291-
}
292+
disabled: true,
293+
}
292294
: {};
293295
},
294296
submitCallback: indicatorChangeCallback,

0 commit comments

Comments
 (0)