Merge pull request #1258 from xieliuduo/dev29-hotFix-date

hotfix:  board rangeTime filter display

Author: scottsut

frontend/src/app/pages/DashBoardPage/utils/index.ts

@@ -302,6 +302,7 @@ export const getControllerDateValues = (obj: {
     timeValues[0] = time.format(TIME_FORMATTER);
   }
   if (endTime) {
+    //end 精确时间
     if (endTime.relativeOrExact === TimeFilterValueCategory.Exact) {
       timeValues[1] = endTime.exactValue as string;
       if (obj.execute) {
@@ -313,9 +314,12 @@ export const getControllerDateValues = (obj: {
         timeValues[1] = endTime.exactValue as string;
       }
     } else {
+      // end 相对时间
       const { amount, unit, direction } = endTime.relativeValue!;
-      const time = getTime(+(direction + amount), unit)(unit, false);
+      const isStart = !obj.execute;
+      const time = getTime(+(direction + amount), unit)(unit, isStart);
       timeValues[1] = time.format(TIME_FORMATTER);
+      debugger;
     }
   }
 

frontend/src/app/utils/time.ts

@@ -40,7 +40,7 @@ export function getTime(
   amount?: number | string,
   unit?: unitOfTime.DurationConstructor,
 ): (unitTime, isStart?: boolean) => Moment {
-  return (unitOfTime: unitOfTime.StartOf, isStart) => {
+  return (unitOfTime: unitOfTime.StartOf, isStart?: boolean) => {
     if (!!isStart) {
       return moment().add(amount, unit).startOf(unitOfTime);
     }