Browse Source

优化组件

lighter 7 months ago
parent
commit
175c9e968a
2 changed files with 19 additions and 28 deletions
  1. 17 26
      src/components/cy/date-range/CyDateRange.vue
  2. 2 2
      src/utils/cy-use/useDateRange.tsx

+ 17 - 26
src/components/cy/date-range/CyDateRange.vue

@@ -13,46 +13,37 @@ import { useVModel } from "@vueuse/core";
 
 const shortcuts = [
   {
-    text: "今天",
-    value: [moment(), moment()],
+    text: '今天',
+    value: [moment(), moment()]
   },
   {
-    text: "最近一周",
-    value: [moment().subtract(7, "days"), moment()],
+    text: '最近一周',
+    value: [moment().subtract(7, 'days'), moment()]
   },
   {
-    text: "最近一个月",
-    value: [moment().startOf("month"), moment().endOf("month")],
+    text: '最近一个月',
+    value: [moment().subtract(1, 'months'), moment()]
   },
   {
-    text: "最近三个月",
-    value: [
-      moment().subtract(3, "months").startOf("month"),
-      moment().endOf("month"),
-    ],
+    text: '最近三个月',
+    value: [moment().subtract(3, 'months'), moment()]
   },
   {
-    text: "本月",
-    value: [moment().startOf("month"), moment().endOf("month")],
+    text: '本月',
+    value: [moment().startOf('month'), moment().endOf('month')]
   },
   {
-    text: "上个月",
-    value: [
-      moment().subtract(1, "month").startOf("month"),
-      moment().subtract(1, "month").endOf("month"),
-    ],
+    text: '上个月',
+    value: [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
   },
   {
-    text: "今年",
-    value: [moment().startOf("year"), moment()],
+    text: '今年',
+    value: [moment().startOf('year'), moment()]
   },
   {
-    text: "去年",
-    value: [
-      moment().subtract(1, "year").startOf("year"),
-      moment().subtract(1, "year").endOf("year"),
-    ],
-  },
+    text: '去年',
+    value: [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')]
+  }
 ];
 
 const props = withDefaults(

+ 2 - 2
src/utils/cy-use/useDateRange.tsx

@@ -17,11 +17,11 @@ export const shortcuts = [
     },
     {
         text: '最近一个月',
-        value: [moment().startOf('month'), moment().endOf('month')]
+        value: [moment().subtract(1, 'months'), moment()]
     },
     {
         text: '最近三个月',
-        value: [moment().subtract(3, 'months').startOf('month'), moment().endOf('month')]
+        value: [moment().subtract(3, 'months'), moment()]
     },
     {
         text: '本月',