From 23b238ef75adc3237ec87a843641d5fb4899c956 Mon Sep 17 00:00:00 2001 From: medcl Date: Mon, 7 Jun 2021 10:33:48 +0800 Subject: [PATCH] update cluster overview page --- web/src/pages/Cluster/Overview.js | 255 ++++++++-------------------- web/src/pages/Cluster/Overview.less | 6 +- 2 files changed, 80 insertions(+), 181 deletions(-) diff --git a/web/src/pages/Cluster/Overview.js b/web/src/pages/Cluster/Overview.js index 97560b07..befd99da 100644 --- a/web/src/pages/Cluster/Overview.js +++ b/web/src/pages/Cluster/Overview.js @@ -5,200 +5,95 @@ import moment from "moment"; import styles from "./Overview.less"; import {connect} from "dva"; import {ClusterItem} from "./ClusterList"; - -let HealthCircle = (props)=>{ - return ( -
- ) -} +import CalendarHeatmap from 'react-calendar-heatmap'; +import 'react-calendar-heatmap/dist/styles.css'; +import { Avatar } from 'antd'; +import { Tabs } from 'antd'; +const { TabPane } = Tabs; +import ClusterLoadMore from "../../components/List/LoadMoreList" +const data = [ + { + title: 'Ant Design Title 1', + }, + { + title: 'Ant Design Title 2', + }, + { + title: 'Ant Design Title 3', + }, + { + title: 'Ant Design Title 4', + }, +]; @connect(({global}) => ({ selectedCluster: global.selectedCluster })) + class Overview extends React.Component { - state = { - data: [{id:"JFpIbacZQamv9hkgQEDZ2Q", name:"single-es", endpoint:"http://localhost:9200", health: "green", version: "7.10.0", uptime:"320883955"}] - } - - clusterColumns = [ - { - title: '名称', - dataIndex: 'name', - render: (text, record) => ( -
- {text} -
- ), - }, - { - title: '集群访问 URL', - dataIndex: 'endpoint' - }, - { - title: '健康状态', - dataIndex: 'health' - }, - { - title: '版本', - dataIndex: 'version' - }, - { - title: '运行时长', - dataIndex: 'uptime', - render: (text, record) => ( - moment.duration(text).humanize() - ), - } - ]; - - clusterItem = { - name: 'cluster-test-name4', - nodes: [{ - name: 'node-32', - status: 'green' - },{ - name: 'node-33', - status: 'green' - },{ - name: 'node-34', - status: 'green' - },{ - name: 'node-35', - status: 'green' - },{ - name: 'node-36', - status: 'green' - },{ - name: 'node-37', - status: 'yellow' - },{ - name: 'node-33', - status: 'green' - },{ - name: 'node-34', - status: 'green' - },{ - name: 'node-35', - status: 'green' - },{ - name: 'node-36', - status: 'green' - },{ - name: 'node-37', - status: 'yellow' - },{ - name: 'node-33', - status: 'green' - },{ - name: 'node-34', - status: 'green' - },{ - name: 'node-35', - status: 'green' - },{ - name: 'node-36', - status: 'green' - },{ - name: 'node-37', - status: 'yellow' - },{ - name: 'node-33', - status: 'green' - },{ - name: 'node-34', - status: 'green' - },{ - name: 'node-35', - status: 'green' - },{ - name: 'node-36', - status: 'green' - },{ - name: 'node-37', - status: 'yellow' - },{ - name: 'node-38', - status: 'green' - }], - }; - - handleChangeClusterById = () =>{ - const {dispatch} = this.props; - dispatch({ - type: 'global/changeClusterById', - payload: { - id: "c0oc4kkgq9s8qss2uk51" - } - }) - } - render() { - - // useEffect(() => { - // console.log('Listening: ', name); - // }, [name]); - return (
- - - - - - - Healthy - 7.10.0 - 3 天 - Basic - - + + + + (value.count > 0 ? 'blue' : 'white') + // } + // onClick={value => alert(`Clicked on value with count: ${value.count}`)} + /> + + + + ( + + } + title={{item.title}} + description="Ant Design, a design language for background applications, is refined by Ant UED Team" + /> + + )} + /> + - - - - - 83.21% -

775.1 GB / 931.5 GB

-
- - 27.60% -

565.3 GB / 2.0 GB

-
-
-
- - - - - 20,812,087 - 1.1 GB - 28 - 26 - - + + + + + + + + + Content of Tab Pane 2 + + +
-
- 查看更多} - > -
- {/* {item.nodes.map(node => { - return ({node.name}); - })} */} - -
-
+ +
) } diff --git a/web/src/pages/Cluster/Overview.less b/web/src/pages/Cluster/Overview.less index a85530ce..093d1072 100644 --- a/web/src/pages/Cluster/Overview.less +++ b/web/src/pages/Cluster/Overview.less @@ -20,4 +20,8 @@ .clusterItemCard { text-align: center; -} \ No newline at end of file +} + +.card { + margin-bottom: 24px; +}