You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/01/22 08:41:13 UTC
[incubator-skywalking-ui] branch feature/5.0.0 updated: Mend list
style
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch feature/5.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
The following commit(s) were added to refs/heads/feature/5.0.0 by this push:
new 8244eec Mend list style
8244eec is described below
commit 8244eecaf3b419dbb117069e8f5688f88caf48fe
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Jan 22 16:37:10 2018 +0800
Mend list style
---
src/main/frontend/src/layouts/BasicLayout.js | 10 +++++-----
src/main/frontend/src/routes/Dashboard/Dashboard.js | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/frontend/src/layouts/BasicLayout.js b/src/main/frontend/src/layouts/BasicLayout.js
index 123f7a4..13e3801 100644
--- a/src/main/frontend/src/layouts/BasicLayout.js
+++ b/src/main/frontend/src/layouts/BasicLayout.js
@@ -325,7 +325,7 @@ class BasicLayout extends React.PureComponent {
<NoticeIcon.Tab
list={[{
id: '000000001',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+ avatar: ['https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png'],
title: 'Appliction A error',
datetime: '2017-08-09',
type: 'app-alert',
@@ -343,8 +343,8 @@ class BasicLayout extends React.PureComponent {
read: true,
type: 'app-alert',
}]}
- title="Application Alert"
- emptyText="No alert"
+ title="Application"
+ emptyText="No alarm"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/>
<NoticeIcon.Tab
@@ -368,8 +368,8 @@ class BasicLayout extends React.PureComponent {
read: true,
type: 'server-alert',
}]}
- title="Server Alert"
- emptyText="No alert"
+ title="Server"
+ emptyText="No alarm"
emptyImage="https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg"
/>
</NoticeIcon>
diff --git a/src/main/frontend/src/routes/Dashboard/Dashboard.js b/src/main/frontend/src/routes/Dashboard/Dashboard.js
index fe23740..04eb438 100644
--- a/src/main/frontend/src/routes/Dashboard/Dashboard.js
+++ b/src/main/frontend/src/routes/Dashboard/Dashboard.js
@@ -26,7 +26,7 @@ export default class Dashboard extends Component {
}
return this.props.dashboard !== nextProps.dashboard;
}
- renderList = (data, title, content) => {
+ renderList = (data, title, content, unit) => {
return (<List
size="small"
itemLayout="horizontal"
@@ -40,8 +40,8 @@ export default class Dashboard extends Component {
>
{item.key}
</Avatar>}
- title={`${title}: ${item[title]}`}
- description={item[content]}
+ title={item[title]}
+ description={`${item[content]} ${unit}`}
/>
</List.Item>
)}
@@ -142,18 +142,18 @@ export default class Dashboard extends Component {
<Card
title="Slow Service"
bordered={false}
- bodyStyle={{ padding: 0 }}
+ bodyStyle={{ padding: 10 }}
>
- {this.renderList(this.props.dashboard.getTopNSlowService, 'avgResponseTime', 'name')}
+ {this.renderList(this.props.dashboard.getTopNSlowService, 'name', 'avgResponseTime', 'ms')}
</Card>
</Col>
<Col xs={24} sm={24} md={24} lg={8} xl={8} style={{ marginTop: 24 }}>
<Card
title="Application Throughput"
bordered={false}
- bodyStyle={{ padding: 0 }}
+ bodyStyle={{ padding: 10 }}
>
- {this.renderList(this.props.dashboard.getTopNServerThroughput, 'tps', 'name')}
+ {this.renderList(this.props.dashboard.getTopNServerThroughput, 'name', 'tps', 't/s')}
</Card>
</Col>
</Row>
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.