vxe-gantt 3.2.6 → 3.3.0

package/lib/gantt/src/gantt-chart.js

@@ -51,12 +51,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       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;
@@ -86,8 +88,6 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var title = (0, _utils.getStringValue)(_xeUtils.default.get(row, titleField));
       var progressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(row, progressField)))) : 0;
       var renderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(row, typeField));
-      var isMilestone = !!((0, _utils.hasEnableConf)(taskBarMilestoneConfig, taskBarMilestoneOpts) && (0, _util.hasMilestoneTask)(renderTaskType));
-      var isSubview = !!((0, _utils.hasEnableConf)(taskBarSubviewConfig, taskBarSubviewOpts) && (0, _util.hasSubviewTask)(renderTaskType));
       var vbStyle = {};
       var vpStyle = {
         width: "".concat(progressValue || 0, "%")
@@ -102,13 +102,6 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           vpStyle.backgroundColor = completedBgColor;
         }
       }
-      if (contentMethod) {
-        title = (0, _utils.getStringValue)(contentMethod({
-          row: row,
-          title: title,
-          scaleType: scaleUnit
-        }));
-      }
       var ctParams = {
         $gantt: $xeGantt,
         source: sourceType,
@@ -119,139 +112,163 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         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 = !!((0, _utils.hasEnableConf)(taskBarMilestoneConfig, taskBarMilestoneOpts) && (0, _util.hasMilestoneTask)(renderTaskType));
+        var isSubview = !!((0, _utils.hasEnableConf)(taskBarSubviewConfig, taskBarSubviewOpts) && (0, _util.hasSubviewTask)(renderTaskType));
+        if (contentMethod) {
+          title = (0, _utils.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 = [];
+              _xeUtils.default.eachTree(rowChildren, function (childRow) {
+                var childRowid = $xeTable.getRowid(childRow);
+                var childTitle = (0, _utils.getStringValue)(_xeUtils.default.get(childRow, titleField));
+                var childProgressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(childRow, progressField)))) : 0;
+                var childRenderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(childRow, typeField));
+                var isChildSubview = !!((0, _utils.hasEnableConf)(taskBarSubviewConfig, taskBarSubviewOpts) && (0, _util.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 = (0, _utils.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(_xeUtils.default.isFunction(iconStatus) ? iconStatus(tbmParams) : iconStatus) : ''],
+              style: iconStyle ? Object.assign({}, _xeUtils.default.isFunction(iconStyle) ? iconStyle(tbmParams) : iconStyle) : undefined
+            }, [h('i', {
+              class: (icon ? _xeUtils.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 = (0, _utils.getStringValue)(_xeUtils.default.get(childRow, titleField));
-              var childProgressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(childRow, progressField)))) : 0;
-              var childRenderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(childRow, typeField));
-              var vpcStyle = {
-                width: "".concat(childProgressValue || 0, "%")
-              };
-              if (isBarRowStyle) {
-                var _completedBgColor = barStyObj.completedBgColor;
-                if (_completedBgColor) {
-                  vpcStyle.backgroundColor = _completedBgColor;
-                }
-              }
-              if (contentMethod) {
-                childTitle = (0, _utils.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(_xeUtils.default.isFunction(iconStatus) ? iconStatus(tbmParams) : iconStatus) : ''],
-            style: iconStyle ? Object.assign({}, _xeUtils.default.isFunction(iconStyle) ? iconStyle(tbmParams) : iconStyle) : undefined
-          }, [h('i', {
-            class: (icon ? _xeUtils.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', {
@@ -260,6 +277,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           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

package/lib/gantt/src/gantt-chart.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,a=Array(t);r<t;r++)a[r]=e[r];return a}var getIcon=_core.VxeUI.getIcon,renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(o,s,e,t,r,a,n,i,U){var l=this.$xeGantt,c=s.resizeHeightFlag,V=s.pendingRowFlag,u=s.fullAllDataRowIdData,G=s.pendingRowMaps,d=s.computeCellOpts,p=s.computeRowOpts,v=s.computeDefaultRowHeight,w=l.reactData,h=l.internalData,f=l.$scopedSlots,f=f.taskBar||f["task-bar"],m=l.taskBarMilestoneConfig,g=l.taskBarSubviewConfig,y=w.activeLink,w=w.activeBarRowid,k=l.computeTitleField,x=l.computeProgressField,b=l.computeTypeField,T=l.computeTaskBarOpts,_=l.computeTaskBarMilestoneOpts,F=l.computeTaskBarSubviewOpts,E=l.computeScaleUnit,C={$gantt:l,row:e,scaleType:E},B=T.showProgress,S=T.showContent,A=T.contentMethod,I=T.barStyle,L=T.moveable,T=T.showTooltip,$=_xeUtils.default.isFunction(I),D=(I?$?I(C):I:{})||{},I=D.round,u=u[t]||{},c=c?(0,_util.getCellRestHeight)(u,d,p,v):0,u=(0,_utils.getStringValue)(_xeUtils.default.get(e,k)),d=B?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,x)))):0,p=(0,_util.getTaskType)(_xeUtils.default.get(e,b)),v=!(!(0,_utils.hasEnableConf)(m,_)||!(0,_util.hasMilestoneTask)(p)),m=!(!(0,_utils.hasEnableConf)(g,F)||!(0,_util.hasSubviewTask)(p)),g={},d={width:"".concat(d||0,"%")},M=($&&(O=D.bgColor,R=D.completedBgColor,O&&(g.backgroundColor=O),R)&&(d.backgroundColor=R),A&&(u=(0,_utils.getStringValue)(A({row:e,title:u,scaleType:E}))),{$gantt:l,source:sourceType,type:viewType,scaleType:E,row:e,$rowIndex:a,rowIndex:r,_rowIndex:n}),O={},R=(T&&(O.mouseover=function(e){var t=h.dragBarRow,r=Object.assign({$event:e},M);t||l.triggerTaskBarTooltipEvent(e,r),l.dispatchEvent("task-bar-mouseenter",r,e)},O.mouseleave=function(e){var t=h.dragBarRow,r=Object.assign({$event:e},M);t||l.handleTaskBarTooltipLeaveEvent(e,r),l.dispatchEvent("task-bar-mouseleave",r,e)}),[]);return l.renderGanttTaskBarContent?R=l.renderGanttTaskBarContent(o,M,{isMilestone:v,title:u,vbStyle:g,vpStyle:d,rowid:t,ctOns:O}):f?R.push(o("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:O},l.callSlot(f,C,o))):m&&i&&i.length?U?F.showOverview&&R.push(o("div",{key:"vcso",class:["vxe-gantt-view--chart-subview-wrapper is--overview",{"is--round":I,"is--move":L}]},[o("div",{key:t,attrs:{rowid:t},class:"vxe-gantt-view--chart-subview-bar"},[o("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[S?o("div",{class:"vxe-gantt-view--chart-content"},u):renderEmptyElement(l)])])])):R.push(o("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrapper is--inline"},i.map(function(e){var t,r=s.getRowid(e),a=(0,_utils.getStringValue)(_xeUtils.default.get(e,k)),n=B?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,x)))):0,i=(0,_util.getTaskType)(_xeUtils.default.get(e,b)),n={width:"".concat(n||0,"%")};return $&&(t=D.completedBgColor)&&(n.backgroundColor=t),A&&(a=(0,_utils.getStringValue)(A({row:e,title:a,scaleType:E}))),o("div",{key:r,attrs:{rowid:r},class:["vxe-gantt-view--chart-subview-bar","is--".concat(i)]},[o("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[B?o("div",{class:"vxe-gantt-view--chart-progress",style:n}):renderEmptyElement(l),S?o("div",{class:"vxe-gantt-view--chart-content"},a):renderEmptyElement(l)])])}))):v?(a=_.icon,r=_.iconStatus,n=_.iconStyle,T={$gantt:l,row:e},R.push(o("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:O},[o("div",{class:["vxe-gantt-view--chart-milestone-icon",r?"theme--".concat(_xeUtils.default.isFunction(r)?r(T):r):""],style:n?Object.assign({},_xeUtils.default.isFunction(n)?n(T):n):void 0},[o("i",{class:(a?_xeUtils.default.isFunction(a)?a(T):a:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),S?o("div",{class:"vxe-gantt-view--chart-milestone-content"},u):renderEmptyElement(l)]))):R.push(o("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:O},[B?o("div",{class:"vxe-gantt-view--chart-progress",style:d}):renderEmptyElement(l),S?o("div",{class:"vxe-gantt-view--chart-content"},u):renderEmptyElement(l)])),o("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(p),{"row--pending":!!V&&!!G[t],"is--round":I,"is--move":L}],style:{height:"".concat(c,"px")},on:{contextmenu:function(e){l.handleTaskBarContextmenuEvent(e,M)}}},[o("div",{class:[f?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(p),{"is--active":w===t,"active--link":y&&(t==="".concat(y.from)||t==="".concat(y.to))}],style:g,attrs:{rowid:t},on:{click:function(e){l.handleTaskBarClickEvent(e,C)},dblclick:function(e){l.handleTaskBarDblclickEvent(e,C)},mousedown:function(e){l.handleTaskBarMousedownEvent&&l.handleTaskBarMousedownEvent(e,C)}}},R)])},renderTaskRows:function(s,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,p=l.fullAllDataRowIdData,v=l.treeExpandedMaps,r=l.computeTreeOpts,w=r.transform,h=r.children||r.childrenField,f=t.scrollYLoad,m=[];return e.forEach(function(e,t){var r=l.getRowid(e),a=p[r]||{},n=t,i=-1,a=(a&&(n=a.index,i=a._index),!1),o=[];u&&(o=e[h],a=!!d&&o&&0<o.length&&!!v[r]),m.push(c.renderTaskBar(s,l,e,r,n,t,i,o,a)),u&&a&&!f&&!w&&m.push.apply(m,_toConsumableArray(c.renderTaskRows(s,l,o)))}),m},renderVN:function(e){var t=this.$xeGantt,r=this.$xeGanttView,a=t.reactData,n=r.internalData.xeTable,a=a.dragLinkFromStore,r=r.reactData.tableData,i=t.computeTaskLinkOpts,o=i.isCurrent,s=t.computeTaskBarOpts.linkCreatable;return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":a.rowid}]},[t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":o,"link--hover":i.isHover}]},n&&(0,_utils.isEnableConf)(i)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":o,"link--create":s}]},n?this.renderTaskRows(e,n,r):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(i)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"task-wrapper")]=this.$refs.refTaskWrapperElem,e["".concat(t,"before-wrapper")]=this.$refs.refChartBeforeWrapperElem,e["".concat(t,"after-wrapper")]=this.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"task-wrapper")]=null,e["".concat(t,"before-wrapper")]=null,e["".concat(t,"after-wrapper")]=null},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,a=Array(t);r<t;r++)a[r]=e[r];return a}var getIcon=_core.VxeUI.getIcon,renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(s,o,e,t,r,a,n,i,G){var l,c,u=this.$xeGantt,d=o.resizeHeightFlag,p=o.pendingRowFlag,v=o.fullAllDataRowIdData,M=o.pendingRowMaps,w=o.computeCellOpts,h=o.computeRowOpts,f=o.computeDefaultRowHeight,m=o.computeTreeOpts,m=m.children||m.childrenField,g=u.reactData,x=u.$scopedSlots,x=x.taskBar||x["task-bar"],R=u.treeConfig,y=u.taskBarMilestoneConfig,F=u.taskBarSubviewConfig,b=g.activeLink,g=g.activeBarRowid,L=u.computeTitleField,W=u.computeProgressField,j=u.computeTypeField,k=u.computeTaskBarOpts,_=u.computeTaskBarMilestoneOpts,T=u.computeTaskBarSubviewOpts,E=u.computeScaleUnit,C={$gantt:u,row:e,scaleType:E},S=k.showProgress,A=k.showContent,B=k.contentMethod,$=k.barStyle,I=k.moveable,k=k.showTooltip,U=_xeUtils.default.isFunction($),O=($?U?$(C):$:{})||{},V=O.round,$=v[t]||{},v=d?(0,_util.getCellRestHeight)($,w,h,f):0,d=(0,_utils.getStringValue)(_xeUtils.default.get(e,L)),$=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,W)))):0,w=(0,_util.getTaskType)(_xeUtils.default.get(e,j)),h={},f={width:"".concat($||0,"%")},D=(U&&($=O.bgColor,l=O.completedBgColor,$&&(h.backgroundColor=$),l)&&(f.backgroundColor=l),{$gantt:u,source:sourceType,type:viewType,scaleType:E,row:e,$rowIndex:a,rowIndex:r,_rowIndex:n}),$=[];return u.renderGanttTaskBarContent?$=u.renderGanttTaskBarContent(s,D,{$gantt:u,$table:o,rowid:t}):(l=!(!(0,_utils.hasEnableConf)(y,_)||!(0,_util.hasMilestoneTask)(w)),a=!(!(0,_utils.hasEnableConf)(F,T)||!(0,_util.hasSubviewTask)(w)),B&&(d=(0,_utils.getStringValue)(B({row:e,title:d,scaleType:E}))),r={},k&&(r.mouseover=function(e){var t=Object.assign({$event:e},D);u.dispatchEvent("task-bar-mouseenter",t,e)},r.mouseleave=function(e){var t=Object.assign({$event:e},D);u.dispatchEvent("task-bar-mouseleave",t,e)}),x?$.push(s("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:r},u.callSlot(x,C,s))):a&&R&&i&&i.length?G?T.showOverview&&$.push(s("div",{key:"vcso",class:"vxe-gantt-view--chart-subview-wrapper is--overview"},[s("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-subview-row",{"is--progress":S,"is--round":V,"is--move":I}]},[s("div",{attrs:{rowid:t},class:"vxe-gantt-view--chart-subview-bar"},[s("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[A?s("div",{class:"vxe-gantt-view--chart-content"},d):renderEmptyElement(u)])])])])):(c=[],_xeUtils.default.eachTree(i,function(e){var t,r=o.getRowid(e),a=(0,_utils.getStringValue)(_xeUtils.default.get(e,L)),n=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,W)))):0,i=(0,_util.getTaskType)(_xeUtils.default.get(e,j));(!(0,_utils.hasEnableConf)(F,T)||!(0,_util.hasSubviewTask)(i))&&(n={width:"".concat(n||0,"%")},U&&(t=O.completedBgColor)&&(n.backgroundColor=t),B&&(a=(0,_utils.getStringValue)(B({row:e,title:a,scaleType:E}))),c.push(s("div",{key:r,attrs:{rowid:r},class:["vxe-gantt-view--chart-subview-row","is--".concat(i),{"is--progress":S,"is--round":V,"is--move":I,"row--pending":!!p&&!!M[r]}]},[s("div",{attrs:{rowid:r},class:"vxe-gantt-view--chart-subview-bar"},[s("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[S?s("div",{class:"vxe-gantt-view--chart-progress",style:n}):renderEmptyElement(u),A?s("div",{class:"vxe-gantt-view--chart-content"},a):renderEmptyElement(u)])])])))},{children:m}),$.push(s("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrappe is--inliner"},c))):l?(n=_.icon,y=_.iconStatus,k=_.iconStyle,a={$gantt:u,row:e},$.push(s("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:r},[s("div",{class:["vxe-gantt-view--chart-milestone-icon",y?"theme--".concat(_xeUtils.default.isFunction(y)?y(a):y):""],style:k?Object.assign({},_xeUtils.default.isFunction(k)?k(a):k):void 0},[s("i",{class:(n?_xeUtils.default.isFunction(n)?n(a):n:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),A?s("div",{class:"vxe-gantt-view--chart-milestone-content"},d):renderEmptyElement(u)]))):$.push(s("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:r},[S?s("div",{class:"vxe-gantt-view--chart-progress",style:f}):renderEmptyElement(u),A?s("div",{class:"vxe-gantt-view--chart-content"},d):renderEmptyElement(u)]))),s("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(w),{"is--progress":S,"row--pending":!!p&&!!M[t],"is--round":V,"is--move":I}],style:{height:"".concat(v,"px")},on:{contextmenu:function(e){u.handleTaskBarContextmenuEvent(e,D)}}},[s("div",{class:[x?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(w),{"is--active":g===t,"active--link":b&&(t==="".concat(b.from)||t==="".concat(b.to))}],style:h,attrs:{rowid:t},on:{click:function(e){u.handleTaskBarClickEvent(e,C)},dblclick:function(e){u.handleTaskBarDblclickEvent(e,C)},mousedown:function(e){u.handleTaskBarMousedownEvent&&u.handleTaskBarMousedownEvent(e,C)}}},$)])},renderTaskRows:function(o,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,p=l.fullAllDataRowIdData,v=l.treeExpandedMaps,r=l.computeTreeOpts,w=r.transform,h=r.children||r.childrenField,f=t.scrollYLoad,m=[];return e.forEach(function(e,t){var r=l.getRowid(e),a=p[r]||{},n=t,i=-1,a=(a&&(n=a.index,i=a._index),!1),s=[];u&&(s=e[h],a=!!d&&s&&0<s.length&&!!v[r]),m.push(c.renderTaskBar(o,l,e,r,n,t,i,s,a)),u&&a&&!f&&!w&&m.push.apply(m,_toConsumableArray(c.renderTaskRows(o,l,s)))}),m},renderVN:function(e){var t=this.$xeGantt,r=this.$xeGanttView,a=t.reactData,n=r.internalData.xeTable,a=a.dragLinkFromStore,r=r.reactData.tableData,i=t.computeTaskLinkOpts,s=i.isCurrent,o=t.computeTaskBarOpts.linkCreatable;return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":a.rowid}]},[t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":s,"link--hover":i.isHover}]},n&&(0,_utils.isEnableConf)(i)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":s,"link--create":o}]},n?this.renderTaskRows(e,n,r):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(i)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"task-wrapper")]=this.$refs.refTaskWrapperElem,e["".concat(t,"before-wrapper")]=this.$refs.refChartBeforeWrapperElem,e["".concat(t,"after-wrapper")]=this.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"task-wrapper")]=null,e["".concat(t,"before-wrapper")]=null,e["".concat(t,"after-wrapper")]=null},render:function(e){return this.renderVN(e)}});

package/lib/gantt/src/gantt-view.js

@@ -753,6 +753,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;
+  _xeUtils.default.eachTree(list, function (childRow) {
+    var childRowid = $xeTable.getRowid(childRow);
+    var renderTaskType = _xeUtils.default.get(childRow, typeField);
+    if ((0, _util.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;
@@ -765,6 +793,8 @@ function updateTaskChartStyle($xeGanttView) {
     chartMaps = internalData.chartMaps;
   var chartWrapper = (0, _util.getRefElem)(elemStore['main-chart-task-wrapper']);
   if (chartWrapper && $xeTable) {
+    var treeOpts = $xeTable.computeTreeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     _xeUtils.default.arrayEach(chartWrapper.children, function (rowEl) {
       var barEl = rowEl.children[0];
       if (!barEl) {
@@ -775,20 +805,49 @@ function updateTaskChartStyle($xeGanttView) {
         return;
       }
       var chartRest = rowid ? chartMaps[rowid] : null;
+      var row = chartRest ? chartRest.row : null;
       // 子任务视图
       if ((0, _dom.hasClass)(barEl, 'is--subview')) {
         var childWrapperEl = barEl.firstElementChild;
         if (childWrapperEl) {
-          _xeUtils.default.arrayEach(childWrapperEl.children, function (childEl) {
-            var childBarEl = childEl;
-            var childRowid = childBarEl.getAttribute('rowid') || '';
-            var childChartRest = childRowid ? chartMaps[childRowid] : null;
-            childBarEl.style.left = "".concat((0, _util.getTaskBarLeft)(childChartRest, viewCellWidth), "px");
-            // 里程碑不需要宽度
-            if (!(0, _dom.hasClass)(childBarEl, 'is--milestone')) {
-              childBarEl.style.width = "".concat((0, _util.getTaskBarWidth)(childChartRest, viewCellWidth), "px");
+          // 行内展示
+          if ((0, _dom.hasClass)(childWrapperEl, 'is--inline')) {
+            _xeUtils.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 ((0, _dom.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((0, _util.getTaskBarLeft)(childChartRest, viewCellWidth), "px");
+                  if (!(0, _dom.hasClass)(childBarEl, 'is--milestone')) {
+                    // 里程碑不需要宽度
+                    childBarEl.style.width = "".concat((0, _util.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((0, _util.getTaskBarLeft)(chartRest, viewCellWidth), "px");