vxe-gantt 3.0.7 → 3.0.8

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.8");
 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.8";
 setConfig({
   gantt: {
     // size: null,
@@ -9097,12 +9097,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) {
@@ -9323,9 +9320,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 +9348,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
         });
@@ -9368,6 +9378,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 +9387,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 +9411,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 +9428,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 +9477,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 +12469,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) {