vxe-gantt 3.2.6 → 3.3.0

package/lib/index.umd.js

@@ -8286,7 +8286,7 @@ var core_ = __webpack_require__(4345);
 
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon;
-core_.VxeUI.ganttVersion = "3.2.6";
+core_.VxeUI.ganttVersion = "3.3.0";
 var ymdFormat = 'yyyy-MM-dd';
 var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
@@ -8403,7 +8403,7 @@ var es_array_concat = __webpack_require__(8706);
 ;// ./packages/ui/src/log.ts
 
 var log = core_.VxeUI.log;
-var version = "gantt v".concat("3.2.6");
+var version = "gantt v".concat("3.3.0");
 var warnLog = log.create('warn', version);
 var errLog = log.create('error', version);
 ;// ./packages/ui/src/depend.ts
@@ -9349,8 +9349,6 @@ var viewType = 'header';
 
 
 
-
-
 var getIcon = core_.VxeUI.getIcon,
   renderEmptyElement = core_.VxeUI.renderEmptyElement;
 var gantt_chart_sourceType = 'gantt';
@@ -9386,12 +9384,14 @@ var gantt_chart_viewType = 'chart';
       var cellOpts = $xeTable.computeCellOpts;
       var rowOpts = $xeTable.computeRowOpts;
       var defaultRowHeight = $xeTable.computeDefaultRowHeight;
+      var treeOpts = $xeTable.computeTreeOpts;
+      var childrenField = treeOpts.children || treeOpts.childrenField;
       var ganttProps = $xeGantt;
       var ganttReactData = $xeGantt.reactData;
-      var ganttInternalData = $xeGantt.internalData;
       var ganttSlots = $xeGantt.$scopedSlots;
       var taskBarSlot = ganttSlots.taskBar || ganttSlots['task-bar'];
-      var taskBarMilestoneConfig = ganttProps.taskBarMilestoneConfig,
+      var treeConfig = ganttProps.treeConfig,
+        taskBarMilestoneConfig = ganttProps.taskBarMilestoneConfig,
         taskBarSubviewConfig = ganttProps.taskBarSubviewConfig;
       var activeLink = ganttReactData.activeLink,
         activeBarRowid = ganttReactData.activeBarRowid;
@@ -9421,8 +9421,6 @@ var gantt_chart_viewType = 'chart';
       var title = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, titleField));
       var progressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, progressField)))) : 0;
       var renderTaskType = getTaskType(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, typeField));
-      var isMilestone = !!(hasEnableConf(taskBarMilestoneConfig, taskBarMilestoneOpts) && hasMilestoneTask(renderTaskType));
-      var isSubview = !!(hasEnableConf(taskBarSubviewConfig, taskBarSubviewOpts) && hasSubviewTask(renderTaskType));
       var vbStyle = {};
       var vpStyle = {
         width: "".concat(progressValue || 0, "%")
@@ -9437,13 +9435,6 @@ var gantt_chart_viewType = 'chart';
           vpStyle.backgroundColor = completedBgColor;
         }
       }
-      if (contentMethod) {
-        title = getStringValue(contentMethod({
-          row: row,
-          title: title,
-          scaleType: scaleUnit
-        }));
-      }
       var ctParams = {
         $gantt: $xeGantt,
         source: gantt_chart_sourceType,
@@ -9454,139 +9445,163 @@ var gantt_chart_viewType = 'chart';
         rowIndex: rowIndex,
         _rowIndex: _rowIndex
       };
-      var ctOns = {};
-      if (showTooltip) {
-        ctOns.mouseover = function (evnt) {
-          var dragBarRow = ganttInternalData.dragBarRow;
-          var ttParams = Object.assign({
-            $event: evnt
-          }, ctParams);
-          if (!dragBarRow) {
-            $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
-          }
-          $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
-        };
-        ctOns.mouseleave = function (evnt) {
-          var dragBarRow = ganttInternalData.dragBarRow;
-          var ttParams = Object.assign({
-            $event: evnt
-          }, ctParams);
-          if (!dragBarRow) {
-            $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
-          }
-          $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
-        };
-      }
       var cbVNs = [];
       if ($xeGantt.renderGanttTaskBarContent) {
         cbVNs = $xeGantt.renderGanttTaskBarContent(h, ctParams, {
-          isMilestone: isMilestone,
-          title: title,
-          vbStyle: vbStyle,
-          vpStyle: vpStyle,
-          rowid: rowid,
-          ctOns: ctOns
+          $gantt: $xeGantt,
+          $table: $xeTable,
+          rowid: rowid
         });
-      } else if (taskBarSlot) {
-        cbVNs.push(h('div', {
-          key: 'cbc',
-          class: 'vxe-gantt-view--chart-custom-bar-content-wrapper',
-          on: ctOns
-        }, $xeGantt.callSlot(taskBarSlot, barParams, h)));
       } else {
-        if (isSubview && rowChildren && rowChildren.length) {
-          if (isExpandTree) {
-            if (taskBarSubviewOpts.showOverview) {
+        var isMilestone = !!(hasEnableConf(taskBarMilestoneConfig, taskBarMilestoneOpts) && hasMilestoneTask(renderTaskType));
+        var isSubview = !!(hasEnableConf(taskBarSubviewConfig, taskBarSubviewOpts) && hasSubviewTask(renderTaskType));
+        if (contentMethod) {
+          title = getStringValue(contentMethod({
+            row: row,
+            title: title,
+            scaleType: scaleUnit
+          }));
+        }
+        var ctOns = {};
+        if (showTooltip) {
+          ctOns.mouseover = function (evnt) {
+            var ttParams = Object.assign({
+              $event: evnt
+            }, ctParams);
+            $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
+          };
+          ctOns.mouseleave = function (evnt) {
+            var ttParams = Object.assign({
+              $event: evnt
+            }, ctParams);
+            $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
+          };
+        }
+        if (taskBarSlot) {
+          cbVNs.push(h('div', {
+            key: 'cbc',
+            class: 'vxe-gantt-view--chart-custom-bar-content-wrapper',
+            on: ctOns
+          }, $xeGantt.callSlot(taskBarSlot, barParams, h)));
+        } else {
+          if (isSubview && treeConfig && rowChildren && rowChildren.length) {
+            if (isExpandTree) {
+              if (taskBarSubviewOpts.showOverview) {
+                cbVNs.push(h('div', {
+                  key: 'vcso',
+                  class: 'vxe-gantt-view--chart-subview-wrapper is--overview'
+                }, [h('div', {
+                  key: rowid,
+                  attrs: {
+                    rowid: rowid
+                  },
+                  class: ['vxe-gantt-view--chart-subview-row', {
+                    'is--progress': showProgress,
+                    'is--round': round,
+                    'is--move': moveable
+                  }]
+                }, [h('div', {
+                  attrs: {
+                    rowid: rowid
+                  },
+                  class: 'vxe-gantt-view--chart-subview-bar'
+                }, [h('div', {
+                  class: 'vxe-gantt-view--chart-subview-bar-content-wrapper'
+                }, [showContent ? h('div', {
+                  class: 'vxe-gantt-view--chart-content'
+                }, title) : renderEmptyElement($xeGantt)])])])]));
+              }
+            } else {
+              var cbcVNs = [];
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rowChildren, function (childRow) {
+                var childRowid = $xeTable.getRowid(childRow);
+                var childTitle = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, titleField));
+                var childProgressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, progressField)))) : 0;
+                var childRenderTaskType = getTaskType(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, typeField));
+                var isChildSubview = !!(hasEnableConf(taskBarSubviewConfig, taskBarSubviewOpts) && hasSubviewTask(childRenderTaskType));
+                if (isChildSubview) {
+                  return;
+                }
+                var vpcStyle = {
+                  width: "".concat(childProgressValue || 0, "%")
+                };
+                if (isBarRowStyle) {
+                  var _completedBgColor = barStyObj.completedBgColor;
+                  if (_completedBgColor) {
+                    vpcStyle.backgroundColor = _completedBgColor;
+                  }
+                }
+                if (contentMethod) {
+                  childTitle = getStringValue(contentMethod({
+                    row: childRow,
+                    title: childTitle,
+                    scaleType: scaleUnit
+                  }));
+                }
+                cbcVNs.push(h('div', {
+                  key: childRowid,
+                  attrs: {
+                    rowid: childRowid
+                  },
+                  class: ['vxe-gantt-view--chart-subview-row', "is--".concat(childRenderTaskType), {
+                    'is--progress': showProgress,
+                    'is--round': round,
+                    'is--move': moveable,
+                    'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
+                  }]
+                }, [h('div', {
+                  attrs: {
+                    rowid: childRowid
+                  },
+                  class: 'vxe-gantt-view--chart-subview-bar'
+                }, [h('div', {
+                  class: 'vxe-gantt-view--chart-subview-bar-content-wrapper'
+                }, [showProgress ? h('div', {
+                  class: 'vxe-gantt-view--chart-progress',
+                  style: vpcStyle
+                }) : renderEmptyElement($xeGantt), showContent ? h('div', {
+                  class: 'vxe-gantt-view--chart-content'
+                }, childTitle) : renderEmptyElement($xeGantt)])])]));
+              }, {
+                children: childrenField
+              });
               cbVNs.push(h('div', {
-                key: 'vcso',
-                class: ['vxe-gantt-view--chart-subview-wrapper is--overview', {
-                  'is--round': round,
-                  'is--move': moveable
-                }]
-              }, [h('div', {
-                key: rowid,
-                attrs: {
-                  rowid: rowid
-                },
-                class: 'vxe-gantt-view--chart-subview-bar'
-              }, [h('div', {
-                class: 'vxe-gantt-view--chart-subview-bar-content-wrapper'
-              }, [showContent ? h('div', {
-                class: 'vxe-gantt-view--chart-content'
-              }, title) : renderEmptyElement($xeGantt)])])]));
+                key: 'vcsc',
+                class: 'vxe-gantt-view--chart-subview-wrappe is--inliner'
+              }, cbcVNs));
             }
+          } else if (isMilestone) {
+            var icon = taskBarMilestoneOpts.icon,
+              iconStatus = taskBarMilestoneOpts.iconStatus,
+              iconStyle = taskBarMilestoneOpts.iconStyle;
+            var tbmParams = {
+              $gantt: $xeGantt,
+              row: row
+            };
+            cbVNs.push(h('div', {
+              key: 'vcm',
+              class: 'vxe-gantt-view--chart-milestone-wrapper',
+              on: ctOns
+            }, [h('div', {
+              class: ['vxe-gantt-view--chart-milestone-icon', iconStatus ? "theme--".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(iconStatus) ? iconStatus(tbmParams) : iconStatus) : ''],
+              style: iconStyle ? Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(iconStyle) ? iconStyle(tbmParams) : iconStyle) : undefined
+            }, [h('i', {
+              class: (icon ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(icon) ? icon(tbmParams) : icon : '') || getIcon().GANTT_VIEW_TASK_MILESTONE
+            })]), showContent ? h('div', {
+              class: 'vxe-gantt-view--chart-milestone-content'
+            }, title) : renderEmptyElement($xeGantt)]));
           } else {
             cbVNs.push(h('div', {
-              key: 'vcsc',
-              class: 'vxe-gantt-view--chart-subview-wrapper is--inline'
-            }, rowChildren.map(function (childRow) {
-              var childRowid = $xeTable.getRowid(childRow);
-              var childTitle = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, titleField));
-              var childProgressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, progressField)))) : 0;
-              var childRenderTaskType = getTaskType(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, typeField));
-              var vpcStyle = {
-                width: "".concat(childProgressValue || 0, "%")
-              };
-              if (isBarRowStyle) {
-                var _completedBgColor = barStyObj.completedBgColor;
-                if (_completedBgColor) {
-                  vpcStyle.backgroundColor = _completedBgColor;
-                }
-              }
-              if (contentMethod) {
-                childTitle = getStringValue(contentMethod({
-                  row: childRow,
-                  title: childTitle,
-                  scaleType: scaleUnit
-                }));
-              }
-              return h('div', {
-                key: childRowid,
-                attrs: {
-                  rowid: childRowid
-                },
-                class: ['vxe-gantt-view--chart-subview-bar', "is--".concat(childRenderTaskType)]
-              }, [h('div', {
-                class: 'vxe-gantt-view--chart-subview-bar-content-wrapper'
-              }, [showProgress ? h('div', {
-                class: 'vxe-gantt-view--chart-progress',
-                style: vpcStyle
-              }) : renderEmptyElement($xeGantt), showContent ? h('div', {
-                class: 'vxe-gantt-view--chart-content'
-              }, childTitle) : renderEmptyElement($xeGantt)])]);
-            })));
+              key: 'vbc',
+              class: 'vxe-gantt-view--chart-bar-content-wrapper',
+              on: ctOns
+            }, [showProgress ? h('div', {
+              class: 'vxe-gantt-view--chart-progress',
+              style: vpStyle
+            }) : renderEmptyElement($xeGantt), showContent ? h('div', {
+              class: 'vxe-gantt-view--chart-content'
+            }, title) : renderEmptyElement($xeGantt)]));
           }
-        } else if (isMilestone) {
-          var icon = taskBarMilestoneOpts.icon,
-            iconStatus = taskBarMilestoneOpts.iconStatus,
-            iconStyle = taskBarMilestoneOpts.iconStyle;
-          var tbmParams = {
-            $gantt: $xeGantt,
-            row: row
-          };
-          cbVNs.push(h('div', {
-            key: 'vcm',
-            class: 'vxe-gantt-view--chart-milestone-wrapper',
-            on: ctOns
-          }, [h('div', {
-            class: ['vxe-gantt-view--chart-milestone-icon', iconStatus ? "theme--".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(iconStatus) ? iconStatus(tbmParams) : iconStatus) : ''],
-            style: iconStyle ? Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(iconStyle) ? iconStyle(tbmParams) : iconStyle) : undefined
-          }, [h('i', {
-            class: (icon ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(icon) ? icon(tbmParams) : icon : '') || getIcon().GANTT_VIEW_TASK_MILESTONE
-          })]), showContent ? h('div', {
-            class: 'vxe-gantt-view--chart-milestone-content'
-          }, title) : renderEmptyElement($xeGantt)]));
-        } else {
-          cbVNs.push(h('div', {
-            key: 'vbc',
-            class: 'vxe-gantt-view--chart-bar-content-wrapper',
-            on: ctOns
-          }, [showProgress ? h('div', {
-            class: 'vxe-gantt-view--chart-progress',
-            style: vpStyle
-          }) : renderEmptyElement($xeGantt), showContent ? h('div', {
-            class: 'vxe-gantt-view--chart-content'
-          }, title) : renderEmptyElement($xeGantt)]));
         }
       }
       return h('div', {
@@ -9595,6 +9610,7 @@ var gantt_chart_viewType = 'chart';
           rowid: rowid
         },
         class: ['vxe-gantt-view--chart-row', "is--".concat(renderTaskType), {
+          'is--progress': showProgress,
           'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
           'is--round': round,
           'is--move': moveable
@@ -10884,6 +10900,34 @@ function calcScrollbar($xeGanttView) {
     reactData.overflowX = overflowX;
   }
 }
+function handleSubTaskMinMaxSize($xeGanttView, $xeTable, list) {
+  var $xeGantt = $xeGanttView.$xeGantt;
+  var internalData = $xeGanttView.internalData;
+  var chartMaps = internalData.chartMaps;
+  var treeOpts = $xeTable.computeTreeOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  var typeField = $xeGantt.computeTypeField;
+  var minChildLeftSize = 0;
+  var maxChildLeftSize = 0;
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(list, function (childRow) {
+    var childRowid = $xeTable.getRowid(childRow);
+    var renderTaskType = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(childRow, typeField);
+    if (hasSubviewTask(renderTaskType)) {
+      return;
+    }
+    var childChartRest = childRowid ? chartMaps[childRowid] : null;
+    if (childChartRest) {
+      maxChildLeftSize = Math.max(maxChildLeftSize, childChartRest.oLeftSize + childChartRest.oWidthSize);
+      minChildLeftSize = minChildLeftSize ? Math.min(minChildLeftSize, childChartRest.oLeftSize) : childChartRest.oLeftSize;
+    }
+  }, {
+    children: childrenField
+  });
+  return {
+    minSize: minChildLeftSize,
+    maxSize: maxChildLeftSize
+  };
+}
 function updateTaskChartStyle($xeGanttView) {
   var $xeGantt = $xeGanttView.$xeGantt;
   var reactData = $xeGanttView.reactData;
@@ -10896,6 +10940,8 @@ function updateTaskChartStyle($xeGanttView) {
     chartMaps = internalData.chartMaps;
   var chartWrapper = getRefElem(elemStore['main-chart-task-wrapper']);
   if (chartWrapper && $xeTable) {
+    var treeOpts = $xeTable.computeTreeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(chartWrapper.children, function (rowEl) {
       var barEl = rowEl.children[0];
       if (!barEl) {
@@ -10906,20 +10952,49 @@ function updateTaskChartStyle($xeGanttView) {
         return;
       }
       var chartRest = rowid ? chartMaps[rowid] : null;
+      var row = chartRest ? chartRest.row : null;
       // 子任务视图
       if (hasClass(barEl, 'is--subview')) {
         var childWrapperEl = barEl.firstElementChild;
         if (childWrapperEl) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(childWrapperEl.children, function (childEl) {
-            var childBarEl = childEl;
-            var childRowid = childBarEl.getAttribute('rowid') || '';
-            var childChartRest = childRowid ? chartMaps[childRowid] : null;
-            childBarEl.style.left = "".concat(getTaskBarLeft(childChartRest, viewCellWidth), "px");
-            // 里程碑不需要宽度
-            if (!hasClass(childBarEl, 'is--milestone')) {
-              childBarEl.style.width = "".concat(getTaskBarWidth(childChartRest, viewCellWidth), "px");
+          // 行内展示
+          if (hasClass(childWrapperEl, 'is--inline')) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(childWrapperEl.children, function (childRowEl) {
+              var childBarEl = childRowEl.children[0];
+              var childRowid = childBarEl.getAttribute('rowid') || '';
+              var childChartRest = childRowid ? chartMaps[childRowid] : null;
+              if (childChartRest) {
+                var childRow = childChartRest.row;
+                // 如果是子视图
+                if (hasClass(childBarEl, 'is--subview')) {
+                  var subChildren = childRow[childrenField];
+                  var _handleSubTaskMinMaxS = handleSubTaskMinMaxSize($xeGanttView, $xeTable, subChildren),
+                    minChildLeftSize = _handleSubTaskMinMaxS.minSize,
+                    maxChildLeftSize = _handleSubTaskMinMaxS.maxSize;
+                  childBarEl.style.left = "".concat(viewCellWidth * minChildLeftSize, "px");
+                  childBarEl.style.width = "".concat(viewCellWidth * (maxChildLeftSize - minChildLeftSize), "px");
+                } else {
+                  childBarEl.style.left = "".concat(getTaskBarLeft(childChartRest, viewCellWidth), "px");
+                  if (!hasClass(childBarEl, 'is--milestone')) {
+                    // 里程碑不需要宽度
+                    childBarEl.style.width = "".concat(getTaskBarWidth(childChartRest, viewCellWidth), "px");
+                  }
+                }
+              }
+            });
+          } else {
+            // 如果展开子任务
+            var childRowEl = childWrapperEl.children[0];
+            var childBarEl = childRowEl ? childRowEl.children[0] : null;
+            if (childBarEl) {
+              var rowChildren = row ? row[childrenField] : [];
+              var _handleSubTaskMinMaxS2 = handleSubTaskMinMaxSize($xeGanttView, $xeTable, rowChildren),
+                minChildLeftSize = _handleSubTaskMinMaxS2.minSize,
+                maxChildLeftSize = _handleSubTaskMinMaxS2.maxSize;
+              childBarEl.style.left = "".concat(viewCellWidth * minChildLeftSize, "px");
+              childBarEl.style.width = "".concat(viewCellWidth * (maxChildLeftSize - minChildLeftSize), "px");
             }
-          });
+          }
         }
       } else {
         barEl.style.left = "".concat(getTaskBarLeft(chartRest, viewCellWidth), "px");