vxe-gantt 3.0.7 → 3.0.9

package/lib/index.umd.js

@@ -7643,7 +7643,7 @@ var core_ = __webpack_require__(4345);
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
 var log = core_.VxeUI.log;
-var version = "gantt v".concat("3.0.7");
+var version = "gantt v".concat("3.0.9");
 var warnLog = log.create('warn', version);
 var errLog = log.create('error', version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -7653,7 +7653,7 @@ var errLog = log.create('error', version);
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon,
   checkVersion = core_.VxeUI.checkVersion;
-core_.VxeUI.ganttVersion = "3.0.7";
+core_.VxeUI.ganttVersion = "3.0.9";
 setConfig({
   gantt: {
     // size: null,
@@ -8426,6 +8426,7 @@ function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
 
 
 
+
 var getI18n = core_.VxeUI.getI18n;
 /* harmony default export */ var gantt_header = (defineVxeComponent({
   name: 'VxeGanttViewHeader',
@@ -8450,7 +8451,8 @@ var getI18n = core_.VxeUI.getI18n;
       var internalData = $xeGanttView.internalData;
       var headerGroups = reactData.headerGroups,
         viewCellWidth = reactData.viewCellWidth;
-      var visibleColumn = internalData.visibleColumn;
+      var todayDateMaps = internalData.todayDateMaps,
+        visibleColumn = internalData.visibleColumn;
       return h('div', {
         ref: 'refElem',
         class: 'vxe-gantt-view--header-wrapper'
@@ -8478,12 +8480,15 @@ var getI18n = core_.VxeUI.getI18n;
           columns = _ref.columns;
         var type = scaleItem.type,
           titleMethod = scaleItem.titleMethod,
+          headerCellStyle = scaleItem.headerCellStyle,
           slots = scaleItem.slots;
         var titleSlot = slots ? slots.title : null;
+        var todayValue = $rowIndex === headerGroups.length - 1 ? todayDateMaps[type] : null;
         return h('tr', {
           key: $rowIndex
         }, columns.map(function (column, cIndex) {
-          var childCount = column.childCount,
+          var field = column.field,
+            childCount = column.childCount,
             dateObj = column.dateObj;
           var label = "".concat(column.title);
           if ($rowIndex < headerGroups.length - 1) {
@@ -8505,13 +8510,24 @@ var getI18n = core_.VxeUI.getI18n;
           } else if (titleMethod) {
             cellVNs = "".concat(titleMethod(ctParams));
           }
+          var 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 h('th', {
             key: cIndex,
-            class: 'vxe-gantt-view--header-column',
+            class: ['vxe-gantt-view--header-column', {
+              'is--now': todayValue && todayValue === field
+            }],
             attrs: {
               colspan: childCount || null,
               title: titleSlot ? null : label
-            }
+            },
+            style: cellStys
           }, cellVNs);
         }));
       }))])])]);
@@ -8756,7 +8772,10 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
     //
     renderColumn: function renderColumn(h, $xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex, column, $columnIndex) {
       var _vm = this;
+      var $xeGanttView = _vm.$xeGanttView;
       var $xeGantt = _vm.$xeGantt;
+      var reactData = $xeGanttView.reactData,
+        internalData = $xeGanttView.internalData;
       var tableReactData = $xeTable;
       var resizeHeightFlag = tableReactData.resizeHeightFlag;
       var tableInternalData = $xeTable;
@@ -8767,6 +8786,12 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       var defaultRowHeight = $xeTable.computeDefaultRowHeight;
       var resizableOpts = $xeTable.computeResizableOpts;
       var isAllRowDrag = resizableOpts.isAllRowDrag;
+      var headerGroups = reactData.headerGroups;
+      var todayDateMaps = internalData.todayDateMaps;
+      var _ref = headerGroups[headerGroups.length - 1] || {},
+        scaleItem = _ref.scaleItem;
+      var field = column.field;
+      var todayValue = scaleItem ? todayDateMaps[scaleItem.type] : null;
       var rowRest = fullAllDataRowIdData[rowid] || {};
       var resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       var isRsHeight = resizeHeight > 0;
@@ -8812,6 +8837,7 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       return h('td', {
         key: $columnIndex,
         class: ['vxe-gantt-view--body-column', {
+          'is--now': todayValue === field,
           'col--rs-height': isRsHeight
         }],
         style: {
@@ -9063,6 +9089,7 @@ function createInternalData() {
     startMaps: {},
     endMaps: {},
     chartMaps: {},
+    todayDateMaps: {},
     elemStore: {},
     // 存放横向 X 虚拟滚动相关的信息
     scrollXStore: {
@@ -9087,6 +9114,39 @@ function parseStringDate($xeGanttView, dateValue) {
   var dateFormat = taskOpts.dateFormat;
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toStringDate(dateValue, dateFormat || null);
 }
+function updateTodayData($xeGanttView) {
+  var $xeGantt = $xeGanttView.$xeGantt;
+  var internalData = $xeGanttView.internalData;
+  var ganttReactData = $xeGantt.reactData;
+  var taskScaleList = ganttReactData.taskScaleList;
+  var weekScale = taskScaleList.find(function (item) {
+    return item.type === 'week';
+  });
+  var itemDate = new Date();
+  var _XEUtils$toDateString = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-'),
+    _XEUtils$toDateString2 = _slicedToArray(_XEUtils$toDateString, 6),
+    yyyy = _XEUtils$toDateString2[0],
+    MM = _XEUtils$toDateString2[1],
+    dd = _XEUtils$toDateString2[2],
+    HH = _XEUtils$toDateString2[3],
+    mm = _XEUtils$toDateString2[4],
+    ss = _XEUtils$toDateString2[5];
+  var e = itemDate.getDay();
+  var E = e + 1;
+  var q = Math.ceil((itemDate.getMonth() + 1) / 3);
+  var 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: "".concat(yyyy, "_q").concat(q),
+    month: "".concat(yyyy, "_").concat(MM),
+    week: "".concat(yyyy, "_W").concat(W),
+    day: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_E").concat(E),
+    date: "".concat(yyyy, "_").concat(MM, "_").concat(dd),
+    hour: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH),
+    minute: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH, "_").concat(mm),
+    second: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH, "_").concat(mm, "_").concat(ss)
+  };
+}
 function handleParseColumn($xeGanttView) {
   var $xeGantt = $xeGanttView.$xeGantt;
   var reactData = $xeGanttView.reactData;
@@ -9097,12 +9157,9 @@ function handleParseColumn($xeGanttView) {
   var taskScaleList = ganttReactData.taskScaleList;
   var minViewDate = reactData.minViewDate,
     maxViewDate = reactData.maxViewDate;
-  var scrollXStore = internalData.scrollXStore;
   var minScale = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().last(taskScaleList);
   var fullCols = [];
   var groupCols = [];
-  scrollXStore.startIndex = 0;
-  scrollXStore.endIndex = 1;
   if (minScale && minViewDate && maxViewDate) {
     var minSType = minScale.type;
     var weekScale = taskScaleList.find(function (item) {
@@ -9127,37 +9184,6 @@ function handleParseColumn($xeGanttView) {
     var currTime = minViewDate.getTime();
     var diffDayNum = maxViewDate.getTime() - minViewDate.getTime();
     var 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
-    // }
     var renderListMaps = {
       year: [],
       quarter: [],
@@ -9201,14 +9227,14 @@ function handleParseColumn($xeGanttView) {
     };
     for (var i = 0; i < countSize; i++) {
       var itemDate = new Date(currTime + i * gapTime);
-      var _XEUtils$toDateString = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-'),
-        _XEUtils$toDateString2 = _slicedToArray(_XEUtils$toDateString, 6),
-        yyyy = _XEUtils$toDateString2[0],
-        MM = _XEUtils$toDateString2[1],
-        dd = _XEUtils$toDateString2[2],
-        HH = _XEUtils$toDateString2[3],
-        mm = _XEUtils$toDateString2[4],
-        ss = _XEUtils$toDateString2[5];
+      var _XEUtils$toDateString3 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-'),
+        _XEUtils$toDateString4 = _slicedToArray(_XEUtils$toDateString3, 6),
+        yyyy = _XEUtils$toDateString4[0],
+        MM = _XEUtils$toDateString4[1],
+        dd = _XEUtils$toDateString4[2],
+        HH = _XEUtils$toDateString4[3],
+        mm = _XEUtils$toDateString4[4],
+        ss = _XEUtils$toDateString4[5];
       var e = itemDate.getDay();
       var E = e + 1;
       var q = Math.ceil((itemDate.getMonth() + 1) / 3);
@@ -9323,9 +9349,13 @@ function handleParseColumn($xeGanttView) {
     if ($xeTable) {
       var startField = $xeGantt.computeStartField;
       var endField = $xeGantt.computeEndField;
+      var tableReactData = $xeTable;
+      var isRowGroupStatus = tableReactData.isRowGroupStatus;
       var tableInternalData = $xeTable;
       var afterFullData = tableInternalData.afterFullData,
-        afterTreeFullData = tableInternalData.afterTreeFullData;
+        afterTreeFullData = tableInternalData.afterTreeFullData,
+        afterGroupFullData = tableInternalData.afterGroupFullData;
+      var aggregateOpts = $xeTable.computeAggregateOpts;
       var treeOpts = $xeTable.computeTreeOpts;
       var transform = treeOpts.transform;
       var childrenField = treeOpts.children || treeOpts.childrenField;
@@ -9347,7 +9377,16 @@ function handleParseColumn($xeGanttView) {
           };
         }
       };
-      if (treeConfig) {
+      if (isRowGroupStatus) {
+        // 行分组
+        var 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
         });
@@ -9359,6 +9398,7 @@ function handleParseColumn($xeGanttView) {
   }
   internalData.visibleColumn = fullCols;
   reactData.headerGroups = groupCols;
+  updateTodayData($xeGanttView);
   updateScrollXStatus($xeGanttView);
   handleTableColumn($xeGanttView);
 }
@@ -9368,6 +9408,7 @@ function handleUpdateData($xeGanttView) {
   var internalData = $xeGanttView.internalData;
   var ganttProps = $xeGantt;
   var treeConfig = ganttProps.treeConfig;
+  var scrollXStore = internalData.scrollXStore;
   var $xeTable = internalData.xeTable;
   var sdMaps = {};
   var edMaps = {};
@@ -9376,9 +9417,13 @@ function handleUpdateData($xeGanttView) {
   if ($xeTable) {
     var startField = $xeGantt.computeStartField;
     var endField = $xeGantt.computeEndField;
+    var tableReactData = $xeTable;
+    var isRowGroupStatus = tableReactData.isRowGroupStatus;
     var tableInternalData = $xeTable;
     var afterFullData = tableInternalData.afterFullData,
-      afterTreeFullData = tableInternalData.afterTreeFullData;
+      afterTreeFullData = tableInternalData.afterTreeFullData,
+      afterGroupFullData = tableInternalData.afterGroupFullData;
+    var aggregateOpts = $xeTable.computeAggregateOpts;
     var treeOpts = $xeTable.computeTreeOpts;
     var transform = treeOpts.transform;
     var childrenField = treeOpts.children || treeOpts.childrenField;
@@ -9396,7 +9441,16 @@ function handleUpdateData($xeGanttView) {
         }
       }
     };
-    if (treeConfig) {
+    if (isRowGroupStatus) {
+      // 行分组
+      var 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
       });
@@ -9404,6 +9458,8 @@ function handleUpdateData($xeGanttView) {
       afterFullData.forEach(handleMinMaxData);
     }
   }
+  scrollXStore.startIndex = 0;
+  scrollXStore.endIndex = Math.max(1, scrollXStore.visibleSize);
   reactData.minViewDate = minDate;
   reactData.maxViewDate = maxDate;
   internalData.startMaps = sdMaps;
@@ -9451,10 +9507,8 @@ function updateChart($xeGanttView) {
       }
       var rowid = rowEl.getAttribute('rowid');
       var rowRest = rowid ? chartMaps[rowid] : null;
-      if (rowRest) {
-        barEl.style.left = "".concat(viewCellWidth * rowRest.oLeftSize, "px");
-        barEl.style.width = "".concat(viewCellWidth * rowRest.oWidthSize, "px");
-      }
+      barEl.style.left = "".concat(rowRest ? viewCellWidth * rowRest.oLeftSize : 0, "px");
+      barEl.style.width = "".concat(rowRest ? viewCellWidth * rowRest.oWidthSize : 0, "px");
     });
   }
   return $xeGanttView.$nextTick();
@@ -12445,9 +12499,6 @@ function gantt_createInternalData() {
     if (props.expandConfig) {
       warnLog('vxe.error.notProp', ['expand-config']);
     }
-    if (props.aggregateConfig) {
-      warnLog('vxe.error.notProp', ['aggregate-config']);
-    }
     $xeGantt.$nextTick(function () {
       if (props.formConfig) {
         if (!VxeUIFormComponent) {