@mptw/skylens-ui 1.4.90 → 1.4.91

package/components/SLCalendarPopup.vue

@@ -319,19 +319,8 @@ export default defineComponent({
 
       return maxDays.value;
     });
-    const diffNow = computed(() => {
-      const now = new Date();
-      const diffNow = maxDate.value
-        ? differenceInCalendarDays(now, maxDate.value)
-        : 0;
-      return diffNow;
-    });
     const baseDate = computed(() => {
-      if (diffNow.value <= 0) {
-        return new Date();
-      }
-
-      return addDays(maxDate.value, 1);
+      return maxDate.value || new Date();
     });
     const baseDateString = computed(() => {
       return formatDate(baseDate.value, "yyyy/MM/dd");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mptw/skylens-ui",
   "type": "module",
-  "version": "1.4.90",
+  "version": "1.4.91",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/utils/index.ts

@@ -32,16 +32,13 @@ export const dateRangeToStatus = (dateRange: IDateRange | null, baseDate = new D
 
   const { start, end } = dateRange;
   const diff = differenceInCalendarDays(end, start);
-  const isYesterday = differenceInCalendarDays(baseDate, end) === 1;
+  const isEndDateEqualBaseDate = differenceInCalendarDays(baseDate, end) === 0;
 
-  // if (diff === 0 && isYesterday) {
-  //   return 'yesterday';
-  // }
-  if (diff === 6 && isYesterday) {
+  if (diff === 6 && isEndDateEqualBaseDate) {
     return 'last7Days';
-  } else if (diff === 29 && isYesterday) {
+  } else if (diff === 29 && isEndDateEqualBaseDate) {
     return 'last30Days';
-  } else if (diff === 89 && isYesterday) {
+  } else if (diff === 89 && isEndDateEqualBaseDate) {
     return 'last90Days';
   } else if (
     getYear(start) === getYear(end) &&
@@ -57,20 +54,17 @@ export const dateRangeToStatus = (dateRange: IDateRange | null, baseDate = new D
 };
 
 export const statusToDateRange = (status: string | null, baseDate = new Date()) => {
-  const yesterday = subDays(baseDate, 1);
   const lastMonth = subMonths(baseDate, 1);
 
   switch (status) {
-    // case 'yesterday':
-    //   return { start: yesterday, end: yesterday };
     case 'last30Days':
-      return { start: subDays(baseDate, 30), end: yesterday };
+      return { start: subDays(baseDate, 29), end: baseDate };
     case 'last90Days':
-      return { start: subDays(baseDate, 90), end: yesterday };
+      return { start: subDays(baseDate, 89), end: baseDate };
     case 'lastMonth':
       return { start: startOfMonth(lastMonth), end: endOfMonth(lastMonth) };
     case 'last7Days':
-      return { start: subDays(baseDate, 7), end: yesterday };
+      return { start: subDays(baseDate, 6), end: baseDate };
     default:
       return null;
   }