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 9b53a6c Add displaying right time scale basing on selected duration
9b53a6c is described below
commit 9b53a6cc7e8eab3fae285c69614b51566acc3dae
Author: hanahmily <[email protected]>
AuthorDate: Fri Jan 19 15:09:40 2018 +0800
Add displaying right time scale basing on selected duration
---
src/main/frontend/src/utils/utils.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/frontend/src/utils/utils.js
b/src/main/frontend/src/utils/utils.js
index 4664ac7..0cb3d9f 100644
--- a/src/main/frontend/src/utils/utils.js
+++ b/src/main/frontend/src/utils/utils.js
@@ -1,14 +1,15 @@
import moment from 'moment';
-function createTimeMeasure(measureType, step, format) {
+function createTimeMeasure(measureType, step, format, displayFormat = format) {
return {
- measureType, step, format,
+ measureType, step, format, displayFormat,
};
}
function getMeasureList() {
return [createTimeMeasure('months', 'MONTH', 'YYYY-MM'),
createTimeMeasure('days', 'DAY', 'YYYY-MM-DD'),
- createTimeMeasure('hours', 'HOUR', ' YYYY-MM-DD HH'),
createTimeMeasure('minutes', 'MINUTE', ' YYYY-MM-DD HHmm'),
createTimeMeasure('seconds', 'SECOND', ' YYYY-MM-DD HHmmss')];
+ createTimeMeasure('hours', 'HOUR', ' YYYY-MM-DD HH', 'YYYY-MM-DD
HH:00:00'), createTimeMeasure('minutes', 'MINUTE', ' YYYY-MM-DD HHmm',
'HH:mm:00'),
+ createTimeMeasure('seconds', 'SECOND', ' YYYY-MM-DD HHmmss', 'HH:mm:ss')];
}
export function fixedZero(val) {
@@ -111,7 +112,7 @@ export function timeRange({ display }) {
export function generateDuration({ from, to }) {
const start = from();
const end = to();
- const { measureType, step, format } = getMeasureList()
+ const { measureType, step, format, displayFormat } = getMeasureList()
.find(measure => (end.diff(start, measure.measureType) > 1));
return {
input: {
@@ -121,7 +122,7 @@ export function generateDuration({ from, to }) {
},
display: {
range: Array.from({ length: end.diff(start, measureType) + 1 },
- (v, i) => start.clone().add(i, measureType).format(format)),
+ (v, i) => start.clone().add(i, measureType).format(displayFormat)),
},
};
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
