fix: 🐛今天线错位

xpyjs · May 11, 2023 · 45b15fe · 45b15fe
1 parent faebcc7
commit 45b15fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/composables/useToday.ts b/src/composables/useToday.ts
@@ -10,15 +10,16 @@ export default () => {
   const { ganttColumnWidth, currentMillisecond } = useGanttWidth();
 
   const today = new XDate();
-  today.date.setHours(0);
-  today.date.setMinutes(0);
-  today.date.setSeconds(0);
+  today.startOf();
 
-  const todayLeft = computed(
-    () =>
-      (today.intervalTo($data.start) / currentMillisecond.value) *
+  const todayLeft = computed(() => {
+    const start = $data.start?.clone();
+    start?.startOf();
+    return (
+      (today.intervalTo(start) / currentMillisecond.value) *
       ganttColumnWidth.value
-  );
+    );
+  });
 
   const showToday = computed(() => {
     function isInArea(date: XDate) {

diff --git a/src/models/param/date.ts b/src/models/param/date.ts
@@ -123,4 +123,14 @@ export class XDate {
     const d = day(this.date).day();
     return d === 6 || d === 0;
   }
+
+  /**
+   * 将日期置为当日最开始（0点0分0秒）
+   */
+  startOf() {
+    this.date.setHours(0);
+    this.date.setMinutes(0);
+    this.date.setSeconds(0);
+    this.date.setMilliseconds(0);
+  }
 }