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/06/21 08:45:33 UTC
[incubator-skywalking-ui] branch 5.0.0/beta2 created (now 8f99043)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch 5.0.0/beta2
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
at 8f99043 Support mutiple operation name on trace search page
This branch includes the following new commits:
new 8f99043 Support mutiple operation name on trace search page
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-skywalking-ui] 01/01: Support mutiple operation name on
trace search page
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 5.0.0/beta2
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 8f99043039c2294c9c634992118eb537817c622f
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Thu Jun 21 16:44:25 2018 +0800
Support mutiple operation name on trace search page
---
mock/trace.js | 2 +-
package-lock.json | 65 +++++++++++++++++++++++----------
package.json | 1 +
src/components/Trace/TraceList/index.js | 3 +-
src/index.js | 3 ++
src/routes/Trace/TraceSearch.js | 2 +-
6 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/mock/trace.js b/mock/trace.js
index 2f9083c..31c7be0 100644
--- a/mock/trace.js
+++ b/mock/trace.js
@@ -36,7 +36,7 @@ export default {
queryBasicTraces: {
'traces|20': [{
key: '@id',
- operationName: '@url(200)',
+ 'operationName|1-2': ['@word(100)'],
duration: '@natural(100, 5000)',
start: function() { // eslint-disable-line
offset = offset + 3600000; // eslint-disable-line
diff --git a/package-lock.json b/package-lock.json
index b6b65eb..43b5f9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1363,6 +1363,44 @@
"resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
+ "ant-design-pro": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/ant-design-pro/-/ant-design-pro-1.3.0.tgz",
+ "integrity": "sha512-DZnf3o8nt2pM5wbYuz5cYuPhYsHcL/KpBR7r0DRDHiW34b8dPdmlDm11Yqa9oTO35sBQpUm5pn5stqZ/4gXX1A==",
+ "requires": {
+ "@antv/data-set": "^0.8.0",
+ "@babel/polyfill": "^7.0.0-beta.36",
+ "babel-runtime": "^6.9.2",
+ "bizcharts": "^3.1.3-beta.1",
+ "bizcharts-plugin-slider": "^2.0.1",
+ "classnames": "^2.2.5",
+ "enquire-js": "^0.2.1",
+ "lodash": "^4.17.4",
+ "lodash-decorators": "^4.4.1",
+ "moment": "^2.19.1",
+ "numeral": "^2.0.6",
+ "omit.js": "^1.0.0",
+ "path-to-regexp": "^2.1.0",
+ "prop-types": "^15.5.10",
+ "qs": "^6.5.0",
+ "rc-drawer-menu": "^0.5.0",
+ "react-container-query": "^0.9.1",
+ "react-document-title": "^2.0.3",
+ "react-fittext": "^1.0.0",
+ "rollbar": "^2.3.4",
+ "url-polyfill": "^1.0.10"
+ },
+ "dependencies": {
+ "enquire-js": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/enquire-js/-/enquire-js-0.2.1.tgz",
+ "integrity": "sha512-4vbcWD0ncK6VQ5M5giOImQb2hFPrKDZH5U+uRX9S6e9vfC6Q5PX6A38PVS6RMnCdr/luDTtJjjLuJinH/+a+Lw==",
+ "requires": {
+ "enquire.js": "^2.1.6"
+ }
+ }
+ }
+ },
"antd": {
"version": "3.2.2",
"resolved": "http://registry.npm.taobao.org/antd/download/antd-3.2.2.tgz",
@@ -3604,8 +3642,7 @@
"console-polyfill": {
"version": "0.3.0",
"resolved": "http://registry.npm.taobao.org/console-polyfill/download/console-polyfill-0.3.0.tgz",
- "integrity": "sha1-hJAJAqGMR6XrqTK+dfpE0j6K+GE=",
- "dev": true
+ "integrity": "sha1-hJAJAqGMR6XrqTK+dfpE0j6K+GE="
},
"constants-browserify": {
"version": "1.0.0",
@@ -4583,7 +4620,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/decache/-/decache-3.1.0.tgz",
"integrity": "sha1-T1A2+9ZYH8yXI3rDlUokS5U2wto=",
- "dev": true,
"optional": true,
"requires": {
"find": "^0.2.4"
@@ -6385,7 +6421,6 @@
"version": "0.2.9",
"resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz",
"integrity": "sha1-S3Px/55WrZG3bnFkB/5f/mVUu4w=",
- "dev": true,
"optional": true,
"requires": {
"traverse-chain": "~0.1.0"
@@ -9117,8 +9152,7 @@
"is_js": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz",
- "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0=",
- "dev": true
+ "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0="
},
"isarray": {
"version": "0.0.1",
@@ -16281,7 +16315,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/request-ip/-/request-ip-2.0.2.tgz",
"integrity": "sha1-3urm1K8hdoSX24zQX6NxQ/jxJX4=",
- "dev": true,
"requires": {
"is_js": "^0.9.0"
}
@@ -16584,7 +16617,6 @@
"version": "2.3.9",
"resolved": "http://registry.npm.taobao.org/rollbar/download/rollbar-2.3.9.tgz",
"integrity": "sha1-RtxsVTEXeuKCyGIq2Okw2tnPIwU=",
- "dev": true,
"requires": {
"async": "~1.2.1",
"console-polyfill": "0.3.0",
@@ -16601,14 +16633,12 @@
"async": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/async/-/async-1.2.1.tgz",
- "integrity": "sha1-pIFqF81f9RbfosdpikUzabl5DeA=",
- "dev": true
+ "integrity": "sha1-pIFqF81f9RbfosdpikUzabl5DeA="
},
"error-stack-parser": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.3.tgz",
"integrity": "sha1-+tpuOpzSsOCA5tb8dRQYZJc081w=",
- "dev": true,
"requires": {
"stackframe": "^0.3.1"
}
@@ -16616,20 +16646,17 @@
"extend": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
- "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=",
- "dev": true
+ "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
},
"lru-cache": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
- "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
- "dev": true
+ "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0="
},
"uuid": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
- "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
- "dev": true
+ "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
}
}
},
@@ -17470,8 +17497,7 @@
"stackframe": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
- "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
- "dev": true
+ "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ="
},
"staged-git-files": {
"version": "1.0.0",
@@ -18567,7 +18593,6 @@
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz",
"integrity": "sha1-YdvC1Ttp/2CRoSoWj9fUMxB+QPE=",
- "dev": true,
"optional": true
},
"treeify": {
diff --git a/package.json b/package.json
index d62cd78..465326b 100755
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"dependencies": {
"@antv/data-set": "^0.8.0",
"@babel/polyfill": "^7.0.0-beta.36",
+ "ant-design-pro": "^1.3.0",
"antd": "^3.1.0",
"babel-runtime": "^6.9.2",
"bizcharts": "^3.1.3-beta.1",
diff --git a/src/components/Trace/TraceList/index.js b/src/components/Trace/TraceList/index.js
index a6ba385..3cdc2f7 100644
--- a/src/components/Trace/TraceList/index.js
+++ b/src/components/Trace/TraceList/index.js
@@ -19,6 +19,7 @@
import React, { PureComponent } from 'react';
import { List, Avatar, Button } from 'antd';
import moment from 'moment';
+import Ellipsis from 'ant-design-pro/lib/Ellipsis';
import styles from './index.less';
@@ -35,7 +36,7 @@ class TraceList extends PureComponent {
}}
/>
<div className={styles.mainInfo}>
- <span>{opName}</span>
+ <Ellipsis length={100} tooltip style={{ width: 'initial' }}>{opName.join(' ')}</Ellipsis>
<span className={styles.duration}>{`${duration}ms`}</span>
</div>
</div>);
diff --git a/src/index.js b/src/index.js
index 460b7a5..b1a9aed 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,7 +26,10 @@ import createHistory from 'history/createHashHistory';
import createLoading from 'dva-loading';
import 'moment/locale/zh-cn';
+import 'ant-design-pro/dist/ant-design-pro.css';
+
import './index.less';
+
// 1. Initialize
const app = dva({
history: createHistory(),
diff --git a/src/routes/Trace/TraceSearch.js b/src/routes/Trace/TraceSearch.js
index 17ac1d5..48875e7 100644
--- a/src/routes/Trace/TraceSearch.js
+++ b/src/routes/Trace/TraceSearch.js
@@ -159,7 +159,7 @@ export default class Trace extends PureComponent {
return (
<Chart
data={dv}
- height={432}
+ height={680}
forceFit
scale={{
startTime: {