vxe-gantt 4.0.7 → 4.0.9

package/lib/index.umd.js

@@ -2780,7 +2780,7 @@ var core_ = __webpack_require__(4345);
 const {
   log
 } = core_.VxeUI;
-const version = `gantt v${"4.0.7"}`;
+const version = `gantt v${"4.0.9"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 ;// ./packages/ui/index.ts
@@ -2791,7 +2791,7 @@ const {
   setIcon,
   checkVersion
 } = core_.VxeUI;
-core_.VxeUI.ganttVersion = "4.0.7";
+core_.VxeUI.ganttVersion = "4.0.9";
 setConfig({
   gantt: {
     // size: null,
@@ -3317,6 +3317,7 @@ function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
 
 
 
+
 const {
   getI18n
 } = core_.VxeUI;
@@ -3339,6 +3340,7 @@ const {
         viewCellWidth
       } = reactData;
       const {
+        todayDateMaps,
         visibleColumn
       } = internalData;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -3368,13 +3370,16 @@ const {
         const {
           type,
           titleMethod,
+          headerCellStyle,
           slots
         } = scaleItem;
         const titleSlot = slots ? slots.title : null;
+        const todayValue = $rowIndex === headerGroups.length - 1 ? todayDateMaps[type] : null;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
           key: $rowIndex
         }, columns.map((column, cIndex) => {
           const {
+            field,
             childCount,
             dateObj
           } = column;
@@ -3398,11 +3403,22 @@ const {
           } else if (titleMethod) {
             cellVNs = `${titleMethod(ctParams)}`;
           }
+          let cellStys = {};
+          if (headerCellStyle) {
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle)) {
+              cellStys = headerCellStyle(ctParams);
+            } else {
+              cellStys = headerCellStyle;
+            }
+          }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
             key: cIndex,
-            class: 'vxe-gantt-view--header-column',
+            class: ['vxe-gantt-view--header-column', {
+              'is--now': todayValue && todayValue === field
+            }],
             colspan: childCount || null,
-            title: titleSlot ? null : label
+            title: titleSlot ? null : label,
+            style: cellStys
           }, cellVNs);
         }));
       }))])])]);
@@ -3673,6 +3689,19 @@ const {
       const {
         isAllRowDrag
       } = resizableOpts;
+      const {
+        headerGroups
+      } = reactData;
+      const {
+        todayDateMaps
+      } = internalData;
+      const {
+        scaleItem
+      } = headerGroups[headerGroups.length - 1] || {};
+      const {
+        field
+      } = column;
+      const todayValue = scaleItem ? todayDateMaps[scaleItem.type] : null;
       const rowRest = fullAllDataRowIdData[rowid] || {};
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       const isRsHeight = resizeHeight > 0;
@@ -3712,6 +3741,7 @@ const {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
         key: $columnIndex,
         class: ['vxe-gantt-view--body-column', {
+          'is--now': todayValue === field,
           'col--rs-height': isRsHeight
         }],
         style: {
@@ -3950,6 +3980,7 @@ function createInternalData() {
     startMaps: {},
     endMaps: {},
     chartMaps: {},
+    todayDateMaps: {},
     elemStore: {},
     // 存放横向 X 虚拟滚动相关的信息
     scrollXStore: {
@@ -4046,6 +4077,30 @@ const maxYHeight = 5e6;
       } = taskOpts;
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(dateValue, dateFormat || null);
     };
+    const updateTodayData = () => {
+      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] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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}`
+      };
+    };
     const handleParseColumn = () => {
       const ganttProps = $xeGantt.props;
       const ganttReactData = $xeGantt.reactData;
@@ -4059,14 +4114,9 @@ const maxYHeight = 5e6;
         minViewDate,
         maxViewDate
       } = reactData;
-      const {
-        scrollXStore
-      } = internalData;
       const minScale = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(taskScaleList);
       const fullCols = [];
       const groupCols = [];
-      scrollXStore.startIndex = 0;
-      scrollXStore.endIndex = 1;
       if (minScale && minViewDate && maxViewDate) {
         const minSType = minScale.type;
         const weekScale = taskScaleList.find(item => item.type === 'week');
@@ -4089,37 +4139,6 @@ const maxYHeight = 5e6;
         const currTime = minViewDate.getTime();
         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 = {
           year: [],
           quarter: [],
@@ -4279,13 +4298,20 @@ const maxYHeight = 5e6;
           const startField = computeStartField.value;
           const endField = computeEndField.value;
           const {
+            computeAggregateOpts,
             computeTreeOpts
           } = $xeTable.getComputeMaps();
+          const tableReactData = $xeTable.reactData;
+          const {
+            isRowGroupStatus
+          } = tableReactData;
           const tableInternalData = $xeTable.internalData;
           const {
             afterFullData,
-            afterTreeFullData
+            afterTreeFullData,
+            afterGroupFullData
           } = tableInternalData;
+          const aggregateOpts = computeAggregateOpts.value;
           const treeOpts = computeTreeOpts.value;
           const {
             transform
@@ -4309,7 +4335,16 @@ const maxYHeight = 5e6;
               };
             }
           };
-          if (treeConfig) {
+          if (isRowGroupStatus) {
+            // 行分组
+            const mapChildrenField = aggregateOpts.mapChildrenField;
+            if (mapChildrenField) {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, handleParseRender, {
+                children: mapChildrenField
+              });
+            }
+          } else if (treeConfig) {
+            // 树结构
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, handleParseRender, {
               children: transform ? treeOpts.mapChildrenField : childrenField
             });
@@ -4321,6 +4356,7 @@ const maxYHeight = 5e6;
       }
       internalData.visibleColumn = fullCols;
       reactData.headerGroups = groupCols;
+      updateTodayData();
       updateScrollXStatus();
       handleTableColumn();
     };
@@ -4329,6 +4365,9 @@ const maxYHeight = 5e6;
       const {
         treeConfig
       } = ganttProps;
+      const {
+        scrollXStore
+      } = internalData;
       const $xeTable = internalData.xeTable;
       const sdMaps = {};
       const edMaps = {};
@@ -4338,13 +4377,20 @@ const maxYHeight = 5e6;
         const startField = computeStartField.value;
         const endField = computeEndField.value;
         const {
+          computeAggregateOpts,
           computeTreeOpts
         } = $xeTable.getComputeMaps();
+        const tableReactData = $xeTable.reactData;
+        const {
+          isRowGroupStatus
+        } = tableReactData;
         const tableInternalData = $xeTable.internalData;
         const {
           afterFullData,
-          afterTreeFullData
+          afterTreeFullData,
+          afterGroupFullData
         } = tableInternalData;
+        const aggregateOpts = computeAggregateOpts.value;
         const treeOpts = computeTreeOpts.value;
         const {
           transform
@@ -4364,7 +4410,16 @@ const maxYHeight = 5e6;
             }
           }
         };
-        if (treeConfig) {
+        if (isRowGroupStatus) {
+          // 行分组
+          const mapChildrenField = aggregateOpts.mapChildrenField;
+          if (mapChildrenField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterGroupFullData, handleMinMaxData, {
+              children: mapChildrenField
+            });
+          }
+        } else if (treeConfig) {
+          // 树结构
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, handleMinMaxData, {
             children: transform ? treeOpts.mapChildrenField : childrenField
           });
@@ -4372,6 +4427,8 @@ const maxYHeight = 5e6;
           afterFullData.forEach(handleMinMaxData);
         }
       }
+      scrollXStore.startIndex = 0;
+      scrollXStore.endIndex = Math.max(1, scrollXStore.visibleSize);
       reactData.minViewDate = minDate;
       reactData.maxViewDate = maxDate;
       internalData.startMaps = sdMaps;
@@ -4422,10 +4479,8 @@ const maxYHeight = 5e6;
           }
           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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -5194,7 +5249,7 @@ const {
 } = core_.VxeUI;
 const tableProps = external_root_VxeUITable_commonjs_vxe_table_commonjs2_vxe_table_amd_vxe_table_.VxeTable.props;
 const tableComponentPropKeys = Object.keys(tableProps);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Gantt', 'Bottom', 'Pager']];
 function gantt_createInternalData() {
   return {
@@ -7406,9 +7461,6 @@ function getViewTypeLevel(type) {
         if (props.expandConfig) {
           warnLog('vxe.error.notProp', ['expand-config']);
         }
-        if (props.aggregateConfig) {
-          warnLog('vxe.error.notProp', ['aggregate-config']);
-        }
         if (columns && columns.length) {
           $xeGantt.loadColumn(columns);
         }