Fixdisplay second less one minute (#34)

* chore: update changeLog and version

* fix: display-second-less-one-minute

* 1.0.39-beta-2

* fix: can not  brush when there is only one bar

* 1.0.39-beta-3

* fix: keep default color and set throttle time to brush

* 1.0.39-beta-4

* chore: update package.json ane changeLog

Author: sherotree

CHANGELOG.md

@@ -1,12 +1,15 @@
 
 # github
-
-## [1.0.39](https://github.com/Erda-FE/dashboard-configuration/pull/31)(2021-10-11)
-
+## [1.0.40](https://github.com/Erda-FE/dashboard-configuration/pull/31)(2021-10-11)
+beta version
 ### Feature
 
 * support brush bar chart to get time range([aeb2bfa](https://github.com/Erda-FE/dashboard-configuration/commit/aeb2bfa91ac255c0c8d7a7a2928bc804a4821960))
 
+
+## [1.0.39](https://github.com/Erda-FE/dashboard-configuration/pull/31)(2021-9-30)
+beta version
+
 ## [1.0.38](https://github.com/Erda-FE/dashboard-configuration/pull/30)(2021-09-29)
 
 ### Feature

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@erda-ui/dashboard-configurator",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "Erda dashboard configurator powered by Echart",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package.json

@@ -50,6 +50,8 @@ export function getOption(data: DC.StaticData, config: DC.ChartConfig = {}) {
     defaultMoreThanOneDay = time[time.length - 1] - time[0] > 24 * 3600 * 1000;
   }
   const moreThanOneDay = isMoreThanOneDay || defaultMoreThanOneDay;
+  const isLessOneMinute = time?.length === 1 || (time?.[time?.length - 1] - time?.[0]) / (time?.length - 1) < 60 * 1000;
+
   const convertInvalidValueToZero = (dataList: any[]) => {
     return invalidToZero
       ? map(dataList, (item) => (typeof item === 'number' && item > 0 ? item : 0))
@@ -155,8 +157,19 @@ export function getOption(data: DC.StaticData, config: DC.ChartConfig = {}) {
 
   const brushFormatter = (param: DC.BrushTooltip[]) => {
     const { value = '', seriesName: _seriesName = '', axisValue = '' } = param?.[0];
+    const isOneBar = time?.length === 1;
     const timeGap = time?.[1] - time?.[0];
-    return `${textMap['start time']}: ${moment(Number(axisValue)).format('YYYY-MM-DD HH:mm:ss')}<br />${textMap['end time']}: ${moment(Number(axisValue) + Number(timeGap)).format('YYYY-MM-DD HH:mm:ss')}<br />${_seriesName}: ${value}  `;
+    return `${textMap['start time']}: ${moment(Number(axisValue)).format('YYYY-MM-DD HH:mm:ss')}<br />${textMap['end time']}: ${moment(Number(axisValue) + Number(isOneBar ? 0 : timeGap)).format('YYYY-MM-DD HH:mm:ss')}<br />${_seriesName}: ${value}  `;
+  };
+
+  const axisLabelFormatter = () => {
+    if (moreThanOneDay) {
+      if (moreThanOneDayFormat) {
+        return moreThanOneDayFormat;
+      }
+      return isLessOneMinute ? 'M/D HH:mm:ss' : 'M/D HH:mm';
+    }
+    return isLessOneMinute ? 'HH:mm:ss' : 'HH:mm';
   };
 
   const computedOption = {
@@ -173,7 +186,7 @@ export function getOption(data: DC.StaticData, config: DC.ChartConfig = {}) {
         axisLabel: {
           formatter: xData
             ? (value: string) => value
-            : (value: string) => moment(Number(value)).format(moreThanOneDay ? moreThanOneDayFormat || 'M/D HH:mm' : 'HH:mm'),
+            : (value: string) => moment(Number(value)).format(axisLabelFormatter()),
         },
       },
     ],
@@ -194,13 +207,15 @@ export function getOption(data: DC.StaticData, config: DC.ChartConfig = {}) {
   };
 
   if (useBrush) {
-    return merge(getDefaultOption(), computedOption, getCustomOption(data, config), option,
+    const canBrushOption = time?.length > 1 ? { brush: {
+      toolbox: [''],
+      throttleType: 'debounce',
+      throttleDelay: 300,
+      xAxisIndex: 0,
+    } } : {};
+
+    return merge(getDefaultOption(), computedOption, getCustomOption(data, config), option, canBrushOption,
       {
-        brush: {
-          toolbox: [''],
-          throttleType: 'debounce',
-          xAxisIndex: 0,
-        },
         series: [{
           itemStyle: {
             color: '#6CB38B',