vxe-gantt 4.9.0-beta.1 → 4.9.0-beta.3

package/dist/all.esm.js

@@ -1,4 +1,4 @@
-import { VxeUI } from '@vxe-ui/core';
+import { VxeUI, useFns as useFns$1 } from '@vxe-ui/core';
 export { VxeUI } from '@vxe-ui/core';
 import { defineComponent, inject, ref, onMounted, onUnmounted, h, reactive, computed, watch, nextTick, onBeforeUnmount, provide } from 'vue';
 import XEUtils from 'xe-utils';
@@ -6,7 +6,7 @@ import DomZIndex from 'dom-zindex';
 import { VxeTable } from 'vxe-table';
 
 const { setConfig: setConfig$1, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.9.0-beta.1";
+VxeUI.ganttVersion = "4.9.0-beta.3";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig$1({
@@ -130,7 +130,7 @@ setIcon({
 });
 
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"4.9.0-beta.1"}`;
+const ganttVersion = `gantt v${"4.9.0-beta.3"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
@@ -1400,8 +1400,7 @@ var GanttViewFooterComponent = defineVxeComponent({
     }
 });
 
-const { getConfig: getConfig$1, domUtils, scrollbarUtils, globalResize, globalEvents: globalEvents$1, renderEmptyElement: renderEmptyElement$1 } = VxeUI;
-const { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } = scrollbarUtils;
+const { getConfig: getConfig$1, domUtils, globalResize, globalEvents: globalEvents$1, renderEmptyElement: renderEmptyElement$1 } = VxeUI;
 const { FinishToStart, StartToFinish, StartToStart, FinishToFinish } = VxeGanttDependencyType;
 const sourceType = 'gantt';
 const secondMs = 1000;
@@ -1438,6 +1437,27 @@ function createInternalData$1() {
         xThumbLeft: 0,
         lastScrollTop: 0,
         lastScrollLeft: 0
+        // 刷新布局
+        // rceTimeout: undefined,
+        // rceRunTime: undefined,
+        // // 滚动属性
+        // intoRunScroll: false,
+        // inVirtualScroll: false,
+        // inWheelScroll: false,
+        // inHeaderScroll: false,
+        // inBodyScroll: false,
+        // inFooterScroll: false,
+        // scrollRenderType: '',
+        // isSyncTableScrollTop: false,
+        // // 同步滚动
+        // lcsTimeout: undefined,
+        // lcsRunTime: undefined,
+        // // 横向虚拟
+        // lxRunTime: undefined,
+        // lxTimeout: undefined,
+        // // 纵向虚拟
+        // lyRunTime: undefined,
+        // lyTimeout: undefined
     };
 }
 function createReactData$1() {
@@ -1488,10 +1508,6 @@ var GanttViewComponent = defineVxeComponent({
         const ganttInternalData = $xeGantt.internalData;
         const { computeDateFormat, computeTaskBarOpts, computeTaskViewOpts, computeStartField, computeEndField, computeTypeField, computeScrollbarOpts, computeScaleUnit, computeWeekScale, computeMinScale, computeTaskNowLineOpts, computeScaleStep, computeIsVScrollbar } = $xeGantt.getComputeMaps();
         const refElem = ref();
-        const refTrackXElem = ref();
-        const refTrackYElem = ref();
-        const refThumbXElem = ref();
-        const refThumbYElem = ref();
         const refScrollXVirtualElem = ref();
         const refScrollYVirtualElem = ref();
         const refScrollXHandleElem = ref();
@@ -1745,6 +1761,7 @@ var GanttViewComponent = defineVxeComponent({
             getRefMaps: () => refMaps,
             getComputeMaps: () => computeMaps
         };
+        const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } = useFns$1.useInitVScrollbar($xeGanttView);
         const parseStringDate = (dateValue) => {
             const dateFormat = computeDateFormat.value;
             return XEUtils.toStringDate(dateValue, dateFormat);
@@ -3229,6 +3246,7 @@ var GanttViewComponent = defineVxeComponent({
                 clearTimeout(lcsTimeout);
             }
             internalData.lcsTimeout = setTimeout(() => {
+                const $xeTable = internalData.xeTable;
                 internalData.lcsRunTime = Date.now();
                 internalData.lcsTimeout = undefined;
                 internalData.intoRunScroll = false;
@@ -3238,6 +3256,10 @@ var GanttViewComponent = defineVxeComponent({
                 internalData.inBodyScroll = false;
                 internalData.inFooterScroll = false;
                 reactData.lazScrollLoading = false;
+                if ($xeTable) {
+                    const tableInternalData = $xeTable.internalData;
+                    tableInternalData.isSyncGanttScrollTop = false;
+                }
             }, 200);
         };
         const handleScrollData = (isRollY, isRollX, scrollTop, scrollLeft) => {
@@ -3312,7 +3334,10 @@ var GanttViewComponent = defineVxeComponent({
                     }
                 }
             }
-            updateThumbOffset();
+            const isVScrollbar = computeGanttIsVScrollbar.value;
+            if (isVScrollbar) {
+                updateThumbOffset();
+            }
             handleScrollData(isRollY, isRollX, scrollTop, scrollLeft);
             const evntParams = {
                 source: sourceType,
@@ -3336,6 +3361,11 @@ var GanttViewComponent = defineVxeComponent({
             $xeGantt.dispatchEvent('scroll', evntParams, evnt);
         };
         const ganttViewMethods = {
+            getScrollViewElem() {
+                const { elemStore } = internalData;
+                const viewEl = getRefElem(elemStore['main-body-scroll']);
+                return viewEl;
+            },
             refreshData() {
                 handleUpdateData();
                 handleRecalculateStyle();
@@ -3373,14 +3403,15 @@ var GanttViewComponent = defineVxeComponent({
          * 同步表格滚动
          */
         const syncTableScrollTop = (scrollTop) => {
+            const { isSyncTableScrollTop } = internalData;
+            if (isSyncTableScrollTop) {
+                return;
+            }
             const $xeTable = internalData.xeTable;
             if ($xeTable) {
                 const tableInternalData = $xeTable.internalData;
-                const { elemStore: tableElemStore } = tableInternalData;
-                const tableBodyScrollElem = getRefElem(tableElemStore['main-body-scroll']);
-                if (tableBodyScrollElem) {
-                    tableBodyScrollElem.scrollTop = scrollTop;
-                }
+                tableInternalData.isSyncGanttScrollTop = true;
+                $xeTable.handleSyncScrollTop({ scrollTop });
             }
         };
         const ganttViewPrivateMethods = {
@@ -3415,6 +3446,14 @@ var GanttViewComponent = defineVxeComponent({
                     }
                 }
             },
+            handleSyncScrollTop(params) {
+                const { scrollTop } = params;
+                const { elemStore } = internalData;
+                const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+                if (bodyScrollElem) {
+                    bodyScrollElem.scrollTop = scrollTop;
+                }
+            },
             triggerHeaderScrollEvent(evnt) {
                 const { elemStore, inVirtualScroll, inBodyScroll, inFooterScroll } = internalData;
                 if (inVirtualScroll) {
@@ -3541,15 +3580,21 @@ var GanttViewComponent = defineVxeComponent({
             }
         };
         const updateScrollbar = () => {
-            updateThumbSize();
-            updateThumbOffset();
+            const isVScrollbar = computeGanttIsVScrollbar.value;
+            if (isVScrollbar) {
+                return nextTick().then(() => {
+                    updateThumbSize();
+                    updateThumbOffset();
+                });
+            }
+            return Promise.resolve();
         };
         const handleGlobalResizeEvent = () => {
             handleLazyRecalculate();
         };
         const bindScrollbarResize = () => {
             const { elemStore, scrollObserver } = internalData;
-            const isVScrollbar = computeIsVScrollbar.value;
+            const isVScrollbar = computeGanttIsVScrollbar.value;
             if (isVScrollbar) {
                 if (!scrollObserver) {
                     const el = refElem.value;
@@ -3571,168 +3616,6 @@ var GanttViewComponent = defineVxeComponent({
                 }
             }
         };
-        const updateThumbSize = () => {
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            if (!viewEl.clientHeight || !viewEl.clientHeight) {
-                return;
-            }
-            const trackXEl = refTrackXElem.value;
-            const xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
-            const thumbXElem = refThumbXElem.value;
-            if (thumbXElem) {
-                thumbXElem.style.width = xThumbWidth + 'px';
-            }
-            reactData.xThumbWidth = xThumbWidth;
-            const trackYEl = refTrackYElem.value;
-            const yThumbHeight = trackYEl ? getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
-            const thumbYElem = refThumbYElem.value;
-            if (thumbYElem) {
-                thumbYElem.style.height = yThumbHeight + 'px';
-            }
-            reactData.yThumbHeight = yThumbHeight;
-        };
-        const updateThumbOffset = () => {
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            if (!viewEl.clientHeight || !viewEl.clientHeight) {
-                return;
-            }
-            const { xThumbWidth, yThumbHeight } = reactData;
-            const trackXEl = refTrackXElem.value;
-            const thumbXElem = refThumbXElem.value;
-            const xThumbLeft = trackXEl && xThumbWidth ? getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
-            internalData.xThumbLeft = xThumbLeft;
-            if (thumbXElem && xThumbWidth) {
-                thumbXElem.style.width = xThumbWidth + 'px';
-                thumbXElem.style.transform = `translateX(${xThumbLeft}px)`;
-            }
-            const trackYEl = refTrackYElem.value;
-            const thumbYElem = refThumbYElem.value;
-            const yThumbTop = trackYEl && yThumbHeight ? getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
-            internalData.yThumbTop = yThumbTop;
-            if (thumbYElem && yThumbHeight) {
-                thumbYElem.style.height = yThumbHeight + 'px';
-                thumbYElem.style.transform = `translateY(${yThumbTop}px)`;
-            }
-        };
-        const clickTrackXEvent = (evnt) => {
-            const trackEl = evnt.currentTarget;
-            if (trackEl !== evnt.target) {
-                return;
-            }
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            const { xThumbWidth } = reactData;
-            const trackRect = trackEl.getBoundingClientRect();
-            viewEl.scrollTo({
-                left: getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
-                behavior: 'auto'
-            });
-        };
-        const clickTrackYEvent = (evnt) => {
-            const trackEl = evnt.currentTarget;
-            if (trackEl !== evnt.target) {
-                return;
-            }
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            const { yThumbHeight } = reactData;
-            const trackRect = trackEl.getBoundingClientRect();
-            viewEl.scrollTo({
-                top: getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
-                behavior: 'auto'
-            });
-        };
-        const pointerdownThumbXEvent = (evnt) => {
-            const thumbEl = evnt.currentTarget;
-            internalData.isThumbDrag = true;
-            thumbEl.setPointerCapture(evnt.pointerId);
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            const { xThumbWidth } = reactData;
-            const trackEl = thumbEl.parentElement;
-            const trackRect = trackEl.getBoundingClientRect();
-            const pointerPosition = evnt.clientX - trackRect.left;
-            // 记录 thumb 的偏移
-            const thumbOffset = getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
-            internalData.thumbDragOffset = pointerPosition - thumbOffset;
-        };
-        const pointermoveThumbXEvent = (evnt) => {
-            const thumbEl = evnt.currentTarget;
-            if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
-                return;
-            }
-            const { elemStore, isThumbDrag, thumbDragOffset } = internalData;
-            if (isThumbDrag) {
-                const viewEl = getRefElem(elemStore['main-body-scroll']);
-                if (!viewEl) {
-                    return;
-                }
-                const { xThumbWidth } = reactData;
-                const thumbEl = evnt.currentTarget;
-                const trackEl = thumbEl.parentElement;
-                const trackRect = trackEl.getBoundingClientRect();
-                // 更新偏移
-                viewEl.scrollLeft = getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
-            }
-        };
-        const cleatPointerThumbEvent = (evnt) => {
-            const thumbEl = evnt.currentTarget;
-            thumbEl.releasePointerCapture(evnt.pointerId);
-            internalData.isThumbDrag = false;
-        };
-        const pointerdownThumbYEvent = (evnt) => {
-            const thumbEl = evnt.currentTarget;
-            internalData.isThumbDrag = true;
-            thumbEl.setPointerCapture(evnt.pointerId);
-            const { elemStore } = internalData;
-            const viewEl = getRefElem(elemStore['main-body-scroll']);
-            if (!viewEl) {
-                return;
-            }
-            const { yThumbHeight } = reactData;
-            const trackEl = thumbEl.parentElement;
-            const trackRect = trackEl.getBoundingClientRect();
-            const pointerPosition = evnt.clientY - trackRect.top;
-            // 记录 thumb 的偏移
-            const thumbOffset = getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
-            internalData.thumbDragOffset = pointerPosition - thumbOffset;
-        };
-        const pointermoveThumbYEvent = (evnt) => {
-            const thumbEl = evnt.currentTarget;
-            if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
-                return;
-            }
-            const { elemStore, isThumbDrag, thumbDragOffset } = internalData;
-            if (isThumbDrag) {
-                const viewEl = getRefElem(elemStore['main-body-scroll']);
-                if (!viewEl) {
-                    return;
-                }
-                const { yThumbHeight } = reactData;
-                const thumbEl = evnt.currentTarget;
-                const trackEl = thumbEl.parentElement;
-                const trackRect = trackEl.getBoundingClientRect();
-                // 更新偏移
-                viewEl.scrollTop = getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
-            }
-        };
         Object.assign($xeGanttView, ganttViewMethods, ganttViewPrivateMethods);
         const renderScrollX = () => {
             return h('div', {
@@ -3830,7 +3713,7 @@ var GanttViewComponent = defineVxeComponent({
         const renderVirtualBody = () => {
             const { showLeftView } = ganttReactData;
             const { xThumbWidth, yThumbHeight } = reactData;
-            const isVScrollbar = computeIsVScrollbar.value;
+            const isVScrollbar = computeGanttIsVScrollbar.value;
             const scrollbarOpts = computeScrollbarOpts.value;
             const scrollXAutoHide = computeScrollXAutoHide.value;
             const scrollYAutoHide = computeScrollYAutoHide.value;
@@ -3893,7 +3776,7 @@ var GanttViewComponent = defineVxeComponent({
         };
         const renderVN = () => {
             const { overflowX, overflowY, scrollXLoad, scrollYLoad } = reactData;
-            const isVScrollbar = computeIsVScrollbar.value;
+            const isVScrollbar = computeGanttIsVScrollbar.value;
             const scrollbarXToTop = computeScrollbarXToTop.value;
             return h('div', {
                 ref: refElem,