vxe-gantt 3.0.7 → 3.0.9

package/packages/gantt/src/gantt-view.ts

@@ -20,6 +20,7 @@ function createInternalData (): GanttViewInternalData {
     startMaps: {},
     endMaps: {},
     chartMaps: {},
+    todayDateMaps: {},
     elemStore: {},
     // 存放横向 X 虚拟滚动相关的信息
     scrollXStore: {
@@ -47,6 +48,32 @@ function parseStringDate ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPr
   return XEUtils.toStringDate(dateValue, dateFormat || null)
 }
 
+function updateTodayData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
+  const $xeGantt = $xeGanttView.$xeGantt
+  const internalData = $xeGanttView.internalData
+
+  const ganttReactData = $xeGantt.reactData
+  const { taskScaleList } = ganttReactData
+  const weekScale = taskScaleList.find(item => item.type === 'week')
+  const itemDate = new Date()
+  const [yyyy, MM, dd, HH, mm, ss] = XEUtils.toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-')
+  const e = itemDate.getDay()
+  const E = e + 1
+  const q = Math.ceil((itemDate.getMonth() + 1) / 3)
+  const W = XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)
+  internalData.todayDateMaps = {
+    year: yyyy,
+    quarter: `${yyyy}_q${q}`,
+    month: `${yyyy}_${MM}`,
+    week: `${yyyy}_W${W}`,
+    day: `${yyyy}_${MM}_${dd}_E${E}`,
+    date: `${yyyy}_${MM}_${dd}`,
+    hour: `${yyyy}_${MM}_${dd}_${HH}`,
+    minute: `${yyyy}_${MM}_${dd}_${HH}_${mm}`,
+    second: `${yyyy}_${MM}_${dd}_${HH}_${mm}_${ss}`
+  }
+}
+
 function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
   const $xeGantt = $xeGanttView.$xeGantt
   const reactData = $xeGanttView.reactData
@@ -57,12 +84,9 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
   const { treeConfig } = ganttProps
   const { taskScaleList } = ganttReactData
   const { minViewDate, maxViewDate } = reactData
-  const { scrollXStore } = internalData
   const minScale = XEUtils.last(taskScaleList)
   const fullCols: VxeGanttDefines.ViewColumn[] = []
   const groupCols: VxeGanttDefines.GroupColumn[] = []
-  scrollXStore.startIndex = 0
-  scrollXStore.endIndex = 1
   if (minScale && minViewDate && maxViewDate) {
     const minSType = minScale.type
     const weekScale = taskScaleList.find(item => item.type === 'week')
@@ -85,38 +109,6 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
     const diffDayNum = maxViewDate.getTime() - minViewDate.getTime()
     const countSize = Math.max(5, Math.floor(diffDayNum / gapTime) + 1)
 
-    // switch (minScale.type) {
-    //   case 'day':
-    //   case 'date':
-    //     if (diffDayNum > (1000 * 60 * 60 * 24 * 366 * 3)) {
-    //       reactData.tableColumn = []
-    //       reactData.headerGroups = []
-    //       return
-    //     }
-    //     break
-    //   case 'hour':
-    //     if (diffDayNum > (1000 * 60 * 60 * 24 * 31 * 3)) {
-    //       reactData.tableColumn = []
-    //       reactData.headerGroups = []
-    //       return
-    //     }
-    //     break
-    //   case 'minute':
-    //     if (diffDayNum > (1000 * 60 * 60 * 24 * 3)) {
-    //       reactData.tableColumn = []
-    //       reactData.headerGroups = []
-    //       return
-    //     }
-    //     break
-    //   case 'second':
-    //     if (diffDayNum > (1000 * 60 * 60 * 3)) {
-    //       reactData.tableColumn = []
-    //       reactData.headerGroups = []
-    //       return
-    //     }
-    //     break
-    // }
-
     const renderListMaps: Record<VxeGanttDefines.ColumnScaleType, VxeGanttDefines.ViewColumn[]> = {
       year: [],
       quarter: [],
@@ -269,8 +261,11 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
     if ($xeTable) {
       const startField = $xeGantt.computeStartField
       const endField = $xeGantt.computeEndField
+      const tableReactData = $xeTable as unknown as TableReactData
+      const { isRowGroupStatus } = tableReactData
       const tableInternalData = $xeTable as unknown as TableInternalData
-      const { afterFullData, afterTreeFullData } = tableInternalData
+      const { afterFullData, afterTreeFullData, afterGroupFullData } = tableInternalData
+      const aggregateOpts = $xeTable.computeAggregateOpts
       const treeOpts = $xeTable.computeTreeOpts
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -294,7 +289,14 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         }
       }
 
-      if (treeConfig) {
+      if (isRowGroupStatus) {
+      // 行分组
+        const mapChildrenField = aggregateOpts.mapChildrenField
+        if (mapChildrenField) {
+          XEUtils.eachTree(afterGroupFullData, handleParseRender, { children: mapChildrenField })
+        }
+      } else if (treeConfig) {
+      // 树结构
         XEUtils.eachTree(afterTreeFullData, handleParseRender, { children: transform ? treeOpts.mapChildrenField : childrenField })
       } else {
         afterFullData.forEach(handleParseRender)
@@ -304,6 +306,7 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
   }
   internalData.visibleColumn = fullCols
   reactData.headerGroups = groupCols
+  updateTodayData($xeGanttView)
   updateScrollXStatus($xeGanttView)
   handleTableColumn($xeGanttView)
 }
@@ -315,6 +318,7 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
 
   const ganttProps = $xeGantt
   const { treeConfig } = ganttProps
+  const { scrollXStore } = internalData
   const $xeTable = internalData.xeTable
   const sdMaps: Record<string, any> = {}
   const edMaps: Record<string, any> = {}
@@ -323,8 +327,11 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
   if ($xeTable) {
     const startField = $xeGantt.computeStartField
     const endField = $xeGantt.computeEndField
+    const tableReactData = $xeTable as unknown as TableReactData
+    const { isRowGroupStatus } = tableReactData
     const tableInternalData = $xeTable as unknown as TableInternalData
-    const { afterFullData, afterTreeFullData } = tableInternalData
+    const { afterFullData, afterTreeFullData, afterGroupFullData } = tableInternalData
+    const aggregateOpts = $xeTable.computeAggregateOpts
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -344,12 +351,21 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
       }
     }
 
-    if (treeConfig) {
+    if (isRowGroupStatus) {
+      // 行分组
+      const mapChildrenField = aggregateOpts.mapChildrenField
+      if (mapChildrenField) {
+        XEUtils.eachTree(afterGroupFullData, handleMinMaxData, { children: mapChildrenField })
+      }
+    } else if (treeConfig) {
+      // 树结构
       XEUtils.eachTree(afterTreeFullData, handleMinMaxData, { children: transform ? treeOpts.mapChildrenField : childrenField })
     } else {
       afterFullData.forEach(handleMinMaxData)
     }
   }
+  scrollXStore.startIndex = 0
+  scrollXStore.endIndex = Math.max(1, scrollXStore.visibleSize)
   reactData.minViewDate = minDate
   reactData.maxViewDate = maxDate
   internalData.startMaps = sdMaps
@@ -401,10 +417,8 @@ function updateChart ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivat
       }
       const rowid = rowEl.getAttribute('rowid')
       const rowRest = rowid ? chartMaps[rowid] : null
-      if (rowRest) {
-        barEl.style.left = `${viewCellWidth * rowRest.oLeftSize}px`
-        barEl.style.width = `${viewCellWidth * rowRest.oWidthSize}px`
-      }
+      barEl.style.left = `${rowRest ? viewCellWidth * rowRest.oLeftSize : 0}px`
+      barEl.style.width = `${rowRest ? viewCellWidth * rowRest.oWidthSize : 0}px`
     })
   }
   return $xeGanttView.$nextTick()

package/packages/gantt/src/gantt.ts

@@ -2221,9 +2221,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (props.expandConfig) {
       warnLog('vxe.error.notProp', ['expand-config'])
     }
-    if (props.aggregateConfig) {
-      warnLog('vxe.error.notProp', ['aggregate-config'])
-    }
 
     $xeGantt.$nextTick(() => {
       if (props.formConfig) {

package/styles/components/gantt.scss

@@ -76,14 +76,16 @@
   .vxe-gantt--view-split-bar {
     flex-shrink: 0;
     width: var(--vxe-ui-gantt-view-split-bar-width);
+    &.is--resize {
+      cursor: col-resize;
+    }
+  }
+  .vxe-gantt--view-split-bar-handle {
     background-color: var(--vxe-ui-gantt-view-split-bar-background-color);
     &:hover,
     &:active {
       background-color: var(--vxe-ui-gantt-view-split-bar-hover-background-color);
     }
-    &.is--resize {
-      cursor: col-resize;
-    }
   }
   &.show--left {
     .vxe-gantt--table-wrapper {
@@ -588,6 +590,22 @@
   text-align: center;
   font-size: 1em;
   height: var(--vxe-ui-gantt-view-cell-height, var(--vxe-ui-table-row-line-height));
+  &.is--now {
+    color: var(--vxe-ui-font-primary-color);
+  }
+}
+.vxe-gantt-view--body-column {
+  &.is--now {
+    &::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 1px;
+      height: 100%;
+      background-color: var(--vxe-ui-font-primary-color);
+    }
+  }
 }
 .vxe-gantt-view--header-column,
 .vxe-gantt-view--body-column,