refactor: 🎨gantt区域时间往左缩进1单位

xpyjs · May 11, 2023 · 373ebd2 · 373ebd2
1 parent 3537a7a
commit 373ebd2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/components/common/LinkPath.vue b/src/components/common/LinkPath.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts" setup>
-import useData from '@/composables/useData';
+import useGanttHeader from '@/composables/useGanttHeader';
 import useGanttWidth from '@/composables/useGanttWidth';
 import useStyle from '@/composables/useStyle';
 import { LinkItem } from '@/models/data/links';
@@ -16,13 +16,13 @@ const props = defineProps({
   }
 });
 
-const { $data } = useData();
+const { ganttHeader } = useGanttHeader();
 const { ganttColumnWidth, currentMillisecond } = useGanttWidth();
 const { rowHeight } = useStyle();
 
 const x = computed(
   () =>
-    (props.link.fromRow.end.intervalTo($data.start) /
+    (props.link.fromRow.end.intervalTo(ganttHeader.start) /
       currentMillisecond.value) *
     ganttColumnWidth.value
 );
@@ -33,7 +33,7 @@ const y = computed(
 
 const x2 = computed(
   () =>
-    (props.link.toRow.start.intervalTo($data.start) /
+    (props.link.toRow.start.intervalTo(ganttHeader.start) /
       currentMillisecond.value) *
     ganttColumnWidth.value
 );

diff --git a/src/components/slider/index.vue b/src/components/slider/index.vue
@@ -92,11 +92,13 @@ const originData = computed(
 );
 
 // #region 计算滑块位置
-const { $data, toRowData } = useData();
+const { toRowData } = useData();
+const { ganttHeader } = useGanttHeader();
 const { ganttColumnWidth, currentMillisecond } = useGanttWidth();
 const sliderLeft = computed(
   () =>
-    (props.data!.start.intervalTo($data.start) / currentMillisecond.value) *
+    (props.data!.start.intervalTo(ganttHeader.start) /
+      currentMillisecond.value) *
     ganttColumnWidth.value
 );
 
@@ -108,7 +110,6 @@ const sliderWidth = computed(
 // #endregion
 
 // #region 移动滑块
-const { ganttHeader } = useGanttHeader();
 const canMove = computed(() => {
   if (isBoolean(props.move)) return props.move;
   if (isFunction(props.move)) {

diff --git a/src/composables/useToday.ts b/src/composables/useToday.ts
@@ -1,19 +1,17 @@
 import { XDate } from '@/models/param/date';
 import { computed } from 'vue';
-import useData from './useData';
 import useGanttHeader from './useGanttHeader';
 import useGanttWidth from './useGanttWidth';
 
 export default () => {
   const { ganttHeader } = useGanttHeader();
-  const { $data } = useData();
   const { ganttColumnWidth, currentMillisecond } = useGanttWidth();
 
   const today = new XDate();
   today.startOf();
 
   const todayLeft = computed(() => {
-    const start = $data.start?.clone();
+    const start = ganttHeader.start?.clone();
     start?.startOf();
     return (
       (today.intervalTo(start) / currentMillisecond.value) *

diff --git a/src/models/param/header.ts b/src/models/param/header.ts
@@ -213,9 +213,9 @@ class GanttHeader extends Header {
     end?: XDate,
     unit: HeaderDateUnit = 'day'
   ) {
-    this.start = start;
-    this.end = end;
     this.unit = unit;
+    this.start = start?.getOffset(-Variables.time.millisecondOf[this.unit]);
+    this.end = end;
     this.minLength = minLen;
 
     this.generate();