vxe-gantt 3.6.9 → 3.7.0

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

@@ -53,17 +53,7 @@ export default defineVxeComponent({
             const taskBarSubviewOpts = $xeGantt.computeTaskBarSubviewOpts;
             const { showOverview, barStyle: subBarStyle } = taskBarSubviewOpts;
             const scaleUnit = $xeGantt.computeScaleUnit;
-            const barParams = { $gantt: $xeGantt, row, scaleType: scaleUnit };
-            const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
-            const isBarRowStyle = XEUtils.isFunction(barStyle);
-            const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {};
-            const { round } = barStyObj;
-            const rowRest = fullAllDataRowIdData[rowid] || {};
-            const cellHeight = resizeHeightFlag ? getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
-            let title = getStringValue(XEUtils.get(row, titleField));
-            const progressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(row, progressField)))) : 0;
-            const renderTaskType = getTaskType(XEUtils.get(row, typeField));
-            const ctParams = {
+            const barParams = {
                 $gantt: $xeGantt,
                 source: sourceType,
                 type: viewType,
@@ -73,18 +63,30 @@ export default defineVxeComponent({
                 rowIndex,
                 _rowIndex
             };
+            const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
+            const barStyObj = (barStyle ? (XEUtils.isFunction(barStyle) ? barStyle(barParams) : barStyle) : {}) || {};
+            const barRound = barStyObj.round;
+            const barBgColor = barStyObj.bgColor;
+            const barCompletedBgColor = barStyObj.completedBgColor;
+            const barHtmlStyle = barStyObj.style;
+            const rowRest = fullAllDataRowIdData[rowid] || {};
+            const cellHeight = resizeHeightFlag ? getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
+            let title = getStringValue(XEUtils.get(row, titleField));
+            const progressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(row, progressField)))) : 0;
+            const renderTaskType = getTaskType(XEUtils.get(row, typeField));
+            const ctParams = Object.assign({}, barParams);
             const vbStyle = {};
             const vpStyle = {
                 width: `${progressValue || 0}%`
             };
-            if (isBarRowStyle) {
-                const { bgColor, completedBgColor } = barStyObj;
-                if (bgColor) {
-                    vbStyle.backgroundColor = bgColor;
-                }
-                if (completedBgColor) {
-                    vpStyle.backgroundColor = completedBgColor;
-                }
+            if (barBgColor) {
+                vbStyle.backgroundColor = barBgColor;
+            }
+            if (barCompletedBgColor) {
+                vpStyle.backgroundColor = barCompletedBgColor;
+            }
+            if (barHtmlStyle) {
+                XEUtils.assign(vbStyle, barHtmlStyle);
             }
             let cbVNs = [];
             if ($xeGantt.renderGanttTaskBarContent) {
@@ -133,7 +135,7 @@ export default defineVxeComponent({
                                     },
                                     class: ['vxe-gantt-view--chart-subview-row', {
                                             'is--progress': showProgress,
-                                            'is--round': round,
+                                            'is--round': barRound,
                                             'is--move': moveable
                                         }]
                                 }, [
@@ -165,9 +167,21 @@ export default defineVxeComponent({
                     else {
                         const cbcVNs = [];
                         XEUtils.eachTree(rowChildren, childRow => {
-                            const childBarParams = { $gantt: $xeGantt, row: childRow, scaleType: scaleUnit };
-                            const childBarStyObj = (barStyle ? (isBarRowStyle ? barStyle(childBarParams) : barStyle) : {}) || {};
-                            const { round } = childBarStyObj;
+                            const childBarParams = {
+                                $gantt: $xeGantt,
+                                source: sourceType,
+                                type: viewType,
+                                scaleType: scaleUnit,
+                                row: childRow,
+                                $rowIndex: $xeTable.getRowIndex(childRow),
+                                rowIndex: $xeTable.getVMRowIndex(childRow),
+                                _rowIndex: $xeTable.getVTRowIndex(childRow)
+                            };
+                            const childBarStyObj = XEUtils.assign({}, (barStyle ? (XEUtils.isFunction(barStyle) ? barStyle(childBarParams) : barStyle) : {}) || {}, (subBarStyle ? (XEUtils.isFunction(subBarStyle) ? subBarStyle(childBarParams) : subBarStyle) : {}) || {});
+                            const childRound = childBarStyObj.round;
+                            const childBgColor = childBarStyObj.bgColor;
+                            const childCompletedBgColor = childBarStyObj.completedBgColor;
+                            const childBarHtmlStyle = childBarStyObj.style;
                             const childRowid = $xeTable.getRowid(childRow);
                             let childTitle = getStringValue(XEUtils.get(childRow, titleField));
                             const childProgressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(childRow, progressField)))) : 0;
@@ -180,21 +194,21 @@ export default defineVxeComponent({
                             const childVpStyle = {
                                 width: `${childProgressValue || 0}%`
                             };
-                            if (isBarRowStyle) {
-                                const { bgColor, completedBgColor } = childBarStyObj;
-                                if (bgColor) {
-                                    childVbStyle.backgroundColor = bgColor;
-                                }
-                                if (completedBgColor) {
-                                    childVpStyle.backgroundColor = completedBgColor;
-                                }
+                            if (childBgColor) {
+                                childVbStyle.backgroundColor = childBgColor;
                             }
-                            const childCtParams = XEUtils.assign({}, ctParams, {
-                                row: childRow,
-                                rowIndex: $xeTable.getRowIndex(childRow),
-                                $rowIndex: $xeTable.getVMRowIndex(childRow),
-                                _rowIndex: $xeTable.getVTRowIndex(childRow)
-                            });
+                            if (childCompletedBgColor) {
+                                childVpStyle.backgroundColor = childCompletedBgColor;
+                            }
+                            //  已废弃
+                            if (childBarStyObj.top) {
+                                childVbStyle.top = childBarStyObj.top;
+                            }
+                            //  已废弃
+                            if (childBarHtmlStyle) {
+                                XEUtils.assign(childVbStyle, childBarHtmlStyle);
+                            }
+                            const childCtParams = Object.assign({}, childBarParams);
                             if (contentMethod) {
                                 childTitle = getStringValue(contentMethod({ row: childRow, title: childTitle, scaleType: scaleUnit }));
                             }
@@ -205,7 +219,7 @@ export default defineVxeComponent({
                                 },
                                 class: ['vxe-gantt-view--chart-subview-row', `is--${childRenderTaskType}`, {
                                         'is--progress': showProgress,
-                                        'is--round': round,
+                                        'is--round': childRound,
                                         'is--move': moveable,
                                         'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
                                     }]
@@ -215,7 +229,7 @@ export default defineVxeComponent({
                                         rowid: childRowid
                                     },
                                     class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', `is--${childRenderTaskType}`],
-                                    style: subBarStyle ? (XEUtils.isFunction(subBarStyle) ? subBarStyle(childCtParams) || undefined : subBarStyle) : undefined,
+                                    style: childVbStyle,
                                     on: {
                                         click(evnt) {
                                             evnt.stopPropagation();
@@ -324,7 +338,7 @@ export default defineVxeComponent({
                 class: ['vxe-gantt-view--chart-row', `is--${renderTaskType}`, {
                         'is--progress': showProgress,
                         'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
-                        'is--round': round,
+                        'is--round': barRound,
                         'is--move': moveable
                     }],
                 style: {

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

@@ -1112,7 +1112,7 @@ function updateStyle($xeGanttView) {
     reactData.scrollXWidth = viewTableWidth;
     return Promise.all([
         updateTaskChartStyle($xeGanttView),
-        $xeGantt.handleUpdateTaskLinkStyle ? $xeGantt.handleUpdateTaskLinkStyle($xeGanttView) : null
+        $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null
     ]);
 }
 function handleRecalculateStyle($xeGanttView) {
@@ -1648,11 +1648,13 @@ export default defineVxeComponent({
             let nlLeft = 0;
             if (showNowLine && minScale && minViewDate && maxViewDate && nowTime >= minViewDate.getTime() && nowTime <= maxViewDate.getTime()) {
                 const todayValue = todayDateMaps[minScale.type];
+                const todayDate = XEUtils.toStringDate(todayValue);
                 let currCol = null;
                 let nextCol = null;
                 for (let i = 0; i < visibleColumn.length; i++) {
                     const column = visibleColumn[i];
-                    if (column.field === todayValue) {
+                    const { startDateObj, endDateObj } = column;
+                    if (startDateObj.date <= todayDate && endDateObj.date >= todayDate) {
                         currCol = column;
                         nlLeft = i * viewCellWidth;
                         nextCol = visibleColumn[i + 1];

package/es/gantt/src/gantt.js

@@ -380,7 +380,7 @@ export default {
                 stys['--vxe-ui-gantt-view-task-now-line-background-color'] = nlbgColor;
             }
             if (nlWidth) {
-                stys['--vxe-ui-gantt-view-task-now-line-width'] = nlWidth;
+                stys['--vxe-ui-gantt-view-task-now-line-width'] = toCssUnit(nlWidth);
             }
             if (viewStyle) {
                 const { cellWidth } = viewStyle;
@@ -576,8 +576,8 @@ export default {
         },
         computeTaskLinkStyle() {
             const $xeGantt = this;
-            if ($xeGantt.handleUpdateTaskLinkData) {
-                $xeGantt.handleUpdateTaskLinkData();
+            if ($xeGantt.handleUpTaskLinkData) {
+                $xeGantt.handleUpTaskLinkData();
             }
         }
     },
@@ -2692,6 +2692,16 @@ export default {
         const $xeGantt = this;
         const props = $xeGantt;
         const proxyOpts = $xeGantt.computeProxyOpts;
+        const taskBarSubviewOpts = $xeGantt.computeTaskBarSubviewOpts;
+        const { barStyle } = taskBarSubviewOpts;
+        if (barStyle) {
+            if (barStyle.top) {
+                warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.top', 'task-bar-subview-config.barStyle.style.top']);
+            }
+            if (barStyle.backgroundColor) {
+                warnLog('vxe.error.delProp', ['task-bar-subview-config.barStyle.backgroundColor', 'task-bar-subview-config.barStyle.style.backgroundColor']);
+            }
+        }
         if (props.toolbar) {
             errLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
         }
@@ -2704,7 +2714,7 @@ export default {
         if (props.expandConfig) {
             warnLog('vxe.error.notProp', ['expand-config']);
         }
-        if (!$xeGantt.handleUpdateTaskLinkData) {
+        if (!$xeGantt.handleUpTaskLinkData) {
             if (props.taskLinkConfig) {
                 warnLog('vxe.error.notProp', ['task-link-config']);
             }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { setConfig, setIcon } = VxeUI;
-VxeUI.ganttVersion = "3.6.9";
+VxeUI.ganttVersion = "3.7.0";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"3.6.9"}`;
+const ganttVersion = `gantt v${"3.7.0"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';

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

@@ -75,8 +75,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var scaleUnit = $xeGantt.computeScaleUnit;
       var barParams = {
         $gantt: $xeGantt,
+        source: sourceType,
+        type: viewType,
+        scaleType: scaleUnit,
         row: row,
-        scaleType: scaleUnit
+        $rowIndex: $rowIndex,
+        rowIndex: rowIndex,
+        _rowIndex: _rowIndex
       };
       var showProgress = taskBarOpts.showProgress,
         showContent = taskBarOpts.showContent,
@@ -84,37 +89,29 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         barStyle = taskBarOpts.barStyle,
         moveable = taskBarOpts.moveable,
         showTooltip = taskBarOpts.showTooltip;
-      var isBarRowStyle = _xeUtils.default.isFunction(barStyle);
-      var barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) : barStyle : {}) || {};
-      var round = barStyObj.round;
+      var barStyObj = (barStyle ? _xeUtils.default.isFunction(barStyle) ? barStyle(barParams) : barStyle : {}) || {};
+      var barRound = barStyObj.round;
+      var barBgColor = barStyObj.bgColor;
+      var barCompletedBgColor = barStyObj.completedBgColor;
+      var barHtmlStyle = barStyObj.style;
       var rowRest = fullAllDataRowIdData[rowid] || {};
       var cellHeight = resizeHeightFlag ? (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
       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 ctParams = {
-        $gantt: $xeGantt,
-        source: sourceType,
-        type: viewType,
-        scaleType: scaleUnit,
-        row: row,
-        $rowIndex: $rowIndex,
-        rowIndex: rowIndex,
-        _rowIndex: _rowIndex
-      };
+      var ctParams = Object.assign({}, barParams);
       var vbStyle = {};
       var vpStyle = {
         width: "".concat(progressValue || 0, "%")
       };
-      if (isBarRowStyle) {
-        var bgColor = barStyObj.bgColor,
-          completedBgColor = barStyObj.completedBgColor;
-        if (bgColor) {
-          vbStyle.backgroundColor = bgColor;
-        }
-        if (completedBgColor) {
-          vpStyle.backgroundColor = completedBgColor;
-        }
+      if (barBgColor) {
+        vbStyle.backgroundColor = barBgColor;
+      }
+      if (barCompletedBgColor) {
+        vpStyle.backgroundColor = barCompletedBgColor;
+      }
+      if (barHtmlStyle) {
+        _xeUtils.default.assign(vbStyle, barHtmlStyle);
       }
       var cbVNs = [];
       if ($xeGantt.renderGanttTaskBarContent) {
@@ -169,7 +166,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                 },
                 class: ['vxe-gantt-view--chart-subview-row', {
                   'is--progress': showProgress,
-                  'is--round': round,
+                  'is--round': barRound,
                   'is--move': moveable
                 }]
               }, [h('div', {
@@ -191,11 +188,19 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             _xeUtils.default.eachTree(rowChildren, function (childRow) {
               var childBarParams = {
                 $gantt: $xeGantt,
+                source: sourceType,
+                type: viewType,
+                scaleType: scaleUnit,
                 row: childRow,
-                scaleType: scaleUnit
+                $rowIndex: $xeTable.getRowIndex(childRow),
+                rowIndex: $xeTable.getVMRowIndex(childRow),
+                _rowIndex: $xeTable.getVTRowIndex(childRow)
               };
-              var childBarStyObj = (barStyle ? isBarRowStyle ? barStyle(childBarParams) : barStyle : {}) || {};
-              var round = childBarStyObj.round;
+              var childBarStyObj = _xeUtils.default.assign({}, (barStyle ? _xeUtils.default.isFunction(barStyle) ? barStyle(childBarParams) : barStyle : {}) || {}, (subBarStyle ? _xeUtils.default.isFunction(subBarStyle) ? subBarStyle(childBarParams) : subBarStyle : {}) || {});
+              var childRound = childBarStyObj.round;
+              var childBgColor = childBarStyObj.bgColor;
+              var childCompletedBgColor = childBarStyObj.completedBgColor;
+              var childBarHtmlStyle = childBarStyObj.style;
               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;
@@ -208,22 +213,21 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               var childVpStyle = {
                 width: "".concat(childProgressValue || 0, "%")
               };
-              if (isBarRowStyle) {
-                var _bgColor = childBarStyObj.bgColor,
-                  _completedBgColor = childBarStyObj.completedBgColor;
-                if (_bgColor) {
-                  childVbStyle.backgroundColor = _bgColor;
-                }
-                if (_completedBgColor) {
-                  childVpStyle.backgroundColor = _completedBgColor;
-                }
+              if (childBgColor) {
+                childVbStyle.backgroundColor = childBgColor;
               }
-              var childCtParams = _xeUtils.default.assign({}, ctParams, {
-                row: childRow,
-                rowIndex: $xeTable.getRowIndex(childRow),
-                $rowIndex: $xeTable.getVMRowIndex(childRow),
-                _rowIndex: $xeTable.getVTRowIndex(childRow)
-              });
+              if (childCompletedBgColor) {
+                childVpStyle.backgroundColor = childCompletedBgColor;
+              }
+              //  已废弃
+              if (childBarStyObj.top) {
+                childVbStyle.top = childBarStyObj.top;
+              }
+              //  已废弃
+              if (childBarHtmlStyle) {
+                _xeUtils.default.assign(childVbStyle, childBarHtmlStyle);
+              }
+              var childCtParams = Object.assign({}, childBarParams);
               if (contentMethod) {
                 childTitle = (0, _utils.getStringValue)(contentMethod({
                   row: childRow,
@@ -238,7 +242,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                 },
                 class: ['vxe-gantt-view--chart-subview-row', "is--".concat(childRenderTaskType), {
                   'is--progress': showProgress,
-                  'is--round': round,
+                  'is--round': childRound,
                   'is--move': moveable,
                   'row--pending': !!pendingRowFlag && !!pendingRowMaps[childRowid]
                 }]
@@ -247,7 +251,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   rowid: childRowid
                 },
                 class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', "is--".concat(childRenderTaskType)],
-                style: subBarStyle ? _xeUtils.default.isFunction(subBarStyle) ? subBarStyle(childCtParams) || undefined : subBarStyle : undefined,
+                style: childVbStyle,
                 on: {
                   click: function click(evnt) {
                     evnt.stopPropagation();
@@ -334,7 +338,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         class: ['vxe-gantt-view--chart-row', "is--".concat(renderTaskType), {
           'is--progress': showProgress,
           'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid],
-          'is--round': round,
+          'is--round': barRound,
           'is--move': moveable
         }],
         style: {

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(l,c,e,t,r,a,n,o,V){var u,d,v=this.$xeGantt,O=c.resizeHeightFlag,G=c.pendingRowFlag,i=c.fullAllDataRowIdData,L=c.pendingRowMaps,s=c.computeCellOpts,p=c.computeRowOpts,w=c.computeDefaultRowHeight,g=c.computeTreeOpts,g=g.children||g.childrenField,h=v.reactData,f=v.internalData,m=v.$scopedSlots,b=m.taskBar||m["task-bar"],m=m.taskBarOverview||m["task-bar-overview"],F=v.treeConfig,x=v.taskBarMilestoneConfig,N=v.taskBarSubviewConfig,k=h.activeLink,h=h.activeBarRowid,W=v.computeTitleField,j=v.computeProgressField,q=v.computeTypeField,y=v.computeTaskBarOpts,T=v.computeTaskBarMilestoneOpts,_=v.computeTaskBarSubviewOpts,H=_.showOverview,E=_.barStyle,C=v.computeScaleUnit,B={$gantt:v,row:e,scaleType:C},S=y.showProgress,A=y.showContent,I=y.contentMethod,$=y.barStyle,R=y.moveable,y=y.showTooltip,D=_xeUtils.default.isFunction($),U=($?D?$(B):$:{})||{},P=U.round,i=i[t]||{},O=O?(0,_util.getCellRestHeight)(i,s,p,w):0,i=(0,_utils.getStringValue)(_xeUtils.default.get(e,W)),s=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,j)))):0,p=(0,_util.getTaskType)(_xeUtils.default.get(e,q)),M={$gantt:v,source:sourceType,type:viewType,scaleType:C,row:e,$rowIndex:a,rowIndex:r,_rowIndex:n},w={},a={width:"".concat(s||0,"%")},s=(D&&(r=U.bgColor,n=U.completedBgColor,r&&(w.backgroundColor=r),n)&&(a.backgroundColor=n),[]);return v.renderGanttTaskBarContent?s=v.renderGanttTaskBarContent(l,M,{$gantt:v,$table:c,rowid:t}):(U=!(!(0,_utils.hasEnableConf)(x,T)||!(0,_util.hasMilestoneTask)(p)),r=!(!(0,_utils.hasEnableConf)(N,_)||!(0,_util.hasSubviewTask)(p)),I&&(i=(0,_utils.getStringValue)(I({row:e,title:i,scaleType:C}))),u={},y&&(u.mouseover=function(e){var t=f.dragBarRow,r=Object.assign({$event:e},M);t||v.triggerTaskBarTooltipEvent(e,r),v.dispatchEvent("task-bar-mouseenter",r,e)},u.mouseleave=function(e){var t=f.dragBarRow,r=Object.assign({$event:e},M);t||v.handleTaskBarTooltipLeaveEvent(e,r),v.dispatchEvent("task-bar-mouseleave",r,e)}),r&&F&&o&&o.length?V?H&&s.push(l("div",{key:"vcso",class:"vxe-gantt-view--chart-subview-wrapper is--overview"},[l("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-subview-row",{"is--progress":S,"is--round":P,"is--move":R}]},[l("div",{attrs:{rowid:t},class:[m?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(p)]},[m?l("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper"},v.callSlot(m,B,l)):l("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[A?l("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(v)])])])])):(d=[],_xeUtils.default.eachTree(o,function(e){var t,r=($?D?$({$gantt:v,row:e,scaleType:C}):$:{})||{},a=r.round,n=c.getRowid(e),o=(0,_utils.getStringValue)(_xeUtils.default.get(e,W)),i=S?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,j)))):0,s=(0,_util.getTaskType)(_xeUtils.default.get(e,q));(!(0,_utils.hasEnableConf)(N,_)||!(0,_util.hasSubviewTask)(s))&&(i={width:"".concat(i||0,"%")},D&&(r.bgColor,r=r.completedBgColor)&&(i.backgroundColor=r),t=_xeUtils.default.assign({},M,{row:e,rowIndex:c.getRowIndex(e),$rowIndex:c.getVMRowIndex(e),_rowIndex:c.getVTRowIndex(e)}),I&&(o=(0,_utils.getStringValue)(I({row:e,title:o,scaleType:C}))),d.push(l("div",{key:n,attrs:{rowid:n},class:["vxe-gantt-view--chart-subview-row","is--".concat(s),{"is--progress":S,"is--round":a,"is--move":R,"row--pending":!!G&&!!L[n]}]},[l("div",{attrs:{rowid:n},class:[b?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(s)],style:E?_xeUtils.default.isFunction(E)?E(t)||void 0:E:void 0,on:{click:function(e){e.stopPropagation(),v.handleTaskBarClickEvent(e,t)},dblclick:function(e){e.stopPropagation(),v.handleTaskBarDblclickEvent(e,t)},mousedown:function(e){e.stopPropagation(),v.handleTaskBarMousedownEvent&&v.handleTaskBarMousedownEvent(e,t)}}},[b?l("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper",on:u},v.callSlot(b,t,l)):l("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper",on:u},[S?l("div",{class:"vxe-gantt-view--chart-progress",style:i}):renderEmptyElement(v),A?l("div",{class:"vxe-gantt-view--chart-content"},o):renderEmptyElement(v)])])])))},{children:g}),s.push(l("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrapper is--inline"},d))):b?s.push(l("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:u},v.callSlot(b,B,l))):U?(n=T.icon,x=T.iconStatus,y=T.iconStyle,r={$gantt:v,row:e},s.push(l("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:u},[l("div",{class:["vxe-gantt-view--chart-milestone-icon",x?"theme--".concat(_xeUtils.default.isFunction(x)?x(r):x):""],style:y?Object.assign({},_xeUtils.default.isFunction(y)?y(r):y):void 0},[l("i",{class:(n?_xeUtils.default.isFunction(n)?n(r):n:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),A?l("div",{class:"vxe-gantt-view--chart-milestone-content"},i):renderEmptyElement(v)]))):s.push(l("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:u},[S?l("div",{class:"vxe-gantt-view--chart-progress",style:a}):renderEmptyElement(v),A?l("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(v)]))),l("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(p),{"is--progress":S,"row--pending":!!G&&!!L[t],"is--round":P,"is--move":R}],style:{height:"".concat(O,"px")},on:{onDragstart:function(e){f.dragBarRow&&e.preventDefault()},contextmenu:function(e){v.handleTaskBarContextmenuEvent(e,M)}}},[l("div",{class:[b?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(p),{"is--active":h===t,"active--link":k&&(t==="".concat(k.from)||t==="".concat(k.to))}],style:w,attrs:{rowid:t},on:{click:function(e){v.handleTaskBarClickEvent(e,B)},dblclick:function(e){v.handleTaskBarDblclickEvent(e,B)},mousedown:function(e){v.handleTaskBarMousedownEvent&&v.handleTaskBarMousedownEvent(e,B)}}},s)])},renderTaskRows:function(s,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,v=l.fullAllDataRowIdData,p=l.treeExpandedMaps,r=l.computeTreeOpts,w=r.transform,g=r.children||r.childrenField,h=t.scrollYLoad,f=[];return e.forEach(function(e,t){var r=l.getRowid(e),a=v[r]||{},n=t,o=-1,a=(a&&(n=a.index,o=a._index),!1),i=[];u&&(i=e[g],a=!!d&&i&&0<i.length&&!!p[r]),f.push(c.renderTaskBar(s,l,e,r,n,t,o,i,a)),u&&a&&!h&&!w&&f.push.apply(f,_toConsumableArray(c.renderTaskRows(s,l,i)))}),f},renderVN:function(e){var t=this.$xeGantt,r=this.$xeGanttView,a=t.reactData,n=r.internalData.xeTable,o=t.$scopedSlots,a=a.dragLinkFromStore,i=r.reactData.tableData,s=t.computeTaskLinkOpts,r=r.computeNowLineLeft,l=s.isCurrent,c=s.isHover,u=t.computeTaskBarOpts.linkCreatable,o=o.taskNowLine||o["task-now-line"];return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":a.rowid}]},[0<r?e("div",{ref:"refNowLineElem",class:"vxe-gantt-view--chart-now-line",style:{left:r+"px"}},o?o({}):[]):renderEmptyElement(t),t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":l,"link--hover":c}]},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":l,"link--create":u}]},n?this.renderTaskRows(e,n,i):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,r="main-chart-";t["".concat(r,"now-line")]=e.$refs.refNowLineElem,t["".concat(r,"task-wrapper")]=e.$refs.refTaskWrapperElem,t["".concat(r,"before-wrapper")]=e.$refs.refChartBeforeWrapperElem,t["".concat(r,"after-wrapper")]=e.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"now-line")]=null,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 a;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(a="Object"===(a={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:a)||"Set"===a?Array.from(e):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?_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 a=0,r=Array(t);a<t;a++)r[a]=e[a];return r}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(v,w,e,t,a,r,n,o,M){var g,f,h=this.$xeGantt,V=w.resizeHeightFlag,G=w.pendingRowFlag,i=w.fullAllDataRowIdData,F=w.pendingRowMaps,s=w.computeCellOpts,l=w.computeRowOpts,c=w.computeDefaultRowHeight,u=w.computeTreeOpts,u=u.children||u.childrenField,d=h.reactData,p=h.internalData,m=h.$scopedSlots,b=m.taskBar||m["task-bar"],m=m.taskBarOverview||m["task-bar-overview"],x=h.treeConfig,k=h.taskBarMilestoneConfig,L=h.taskBarSubviewConfig,y=d.activeLink,d=d.activeBarRowid,j=h.computeTitleField,N=h.computeProgressField,W=h.computeTypeField,T=h.computeTaskBarOpts,_=h.computeTaskBarMilestoneOpts,E=h.computeTaskBarSubviewOpts,q=E.showOverview,C=E.barStyle,B=h.computeScaleUnit,S={$gantt:h,source:sourceType,type:viewType,scaleType:B,row:e,$rowIndex:r,rowIndex:a,_rowIndex:n},A=T.showProgress,I=T.showContent,$=T.contentMethod,U=T.barStyle,R=T.moveable,r=T.showTooltip,a=(U?_xeUtils.default.isFunction(U)?U(S):U:{})||{},n=a.round,T=a.bgColor,D=a.completedBgColor,a=a.style,i=i[t]||{},V=V?(0,_util.getCellRestHeight)(i,s,l,c):0,i=(0,_utils.getStringValue)(_xeUtils.default.get(e,j)),s=A?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,N)))):0,l=(0,_util.getTaskType)(_xeUtils.default.get(e,W)),O=Object.assign({},S),c={},s={width:"".concat(s||0,"%")},T=(T&&(c.backgroundColor=T),D&&(s.backgroundColor=D),a&&_xeUtils.default.assign(c,a),[]);return h.renderGanttTaskBarContent?T=h.renderGanttTaskBarContent(v,O,{$gantt:h,$table:w,rowid:t}):(D=!(!(0,_utils.hasEnableConf)(k,_)||!(0,_util.hasMilestoneTask)(l)),a=!(!(0,_utils.hasEnableConf)(L,E)||!(0,_util.hasSubviewTask)(l)),$&&(i=(0,_utils.getStringValue)($({row:e,title:i,scaleType:B}))),g={},r&&(g.mouseover=function(e){var t=p.dragBarRow,a=Object.assign({$event:e},O);t||h.triggerTaskBarTooltipEvent(e,a),h.dispatchEvent("task-bar-mouseenter",a,e)},g.mouseleave=function(e){var t=p.dragBarRow,a=Object.assign({$event:e},O);t||h.handleTaskBarTooltipLeaveEvent(e,a),h.dispatchEvent("task-bar-mouseleave",a,e)}),a&&x&&o&&o.length?M?q&&T.push(v("div",{key:"vcso",class:"vxe-gantt-view--chart-subview-wrapper is--overview"},[v("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-subview-row",{"is--progress":A,"is--round":n,"is--move":R}]},[v("div",{attrs:{rowid:t},class:[m?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(l)]},[m?v("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper"},h.callSlot(m,S,v)):v("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper"},[I?v("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(h)])])])])):(f=[],_xeUtils.default.eachTree(o,function(e){var t,a,r={$gantt:h,source:sourceType,type:viewType,scaleType:B,row:e,$rowIndex:w.getRowIndex(e),rowIndex:w.getVMRowIndex(e),_rowIndex:w.getVTRowIndex(e)},n=_xeUtils.default.assign({},(U?_xeUtils.default.isFunction(U)?U(r):U:{})||{},(C?_xeUtils.default.isFunction(C)?C(r):C:{})||{}),o=n.round,i=n.bgColor,s=n.completedBgColor,l=n.style,c=w.getRowid(e),u=(0,_utils.getStringValue)(_xeUtils.default.get(e,j)),d=A?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(e,N)))):0,p=(0,_util.getTaskType)(_xeUtils.default.get(e,W));(!(0,_utils.hasEnableConf)(L,E)||!(0,_util.hasSubviewTask)(p))&&(t={},d={width:"".concat(d||0,"%")},i&&(t.backgroundColor=i),s&&(d.backgroundColor=s),n.top&&(t.top=n.top),l&&_xeUtils.default.assign(t,l),a=Object.assign({},r),$&&(u=(0,_utils.getStringValue)($({row:e,title:u,scaleType:B}))),f.push(v("div",{key:c,attrs:{rowid:c},class:["vxe-gantt-view--chart-subview-row","is--".concat(p),{"is--progress":A,"is--round":o,"is--move":R,"row--pending":!!G&&!!F[c]}]},[v("div",{attrs:{rowid:c},class:[b?"vxe-gantt-view--chart-subview-custom-bar":"vxe-gantt-view--chart-subview-bar","is--".concat(p)],style:t,on:{click:function(e){e.stopPropagation(),h.handleTaskBarClickEvent(e,a)},dblclick:function(e){e.stopPropagation(),h.handleTaskBarDblclickEvent(e,a)},mousedown:function(e){e.stopPropagation(),h.handleTaskBarMousedownEvent&&h.handleTaskBarMousedownEvent(e,a)}}},[b?v("div",{key:"cbc",class:"vxe-gantt-view--chart-subview-custom-bar-content-wrapper",on:g},h.callSlot(b,a,v)):v("div",{class:"vxe-gantt-view--chart-subview-bar-content-wrapper",on:g},[A?v("div",{class:"vxe-gantt-view--chart-progress",style:d}):renderEmptyElement(h),I?v("div",{class:"vxe-gantt-view--chart-content"},u):renderEmptyElement(h)])])])))},{children:u}),T.push(v("div",{key:"vcsc",class:"vxe-gantt-view--chart-subview-wrapper is--inline"},f))):b?T.push(v("div",{key:"cbc",class:"vxe-gantt-view--chart-custom-bar-content-wrapper",on:g},h.callSlot(b,S,v))):D?(k=_.icon,r=_.iconStatus,a=_.iconStyle,x={$gantt:h,row:e},T.push(v("div",{key:"vcm",class:"vxe-gantt-view--chart-milestone-wrapper",on:g},[v("div",{class:["vxe-gantt-view--chart-milestone-icon",r?"theme--".concat(_xeUtils.default.isFunction(r)?r(x):r):""],style:a?Object.assign({},_xeUtils.default.isFunction(a)?a(x):a):void 0},[v("i",{class:(k?_xeUtils.default.isFunction(k)?k(x):k:"")||getIcon().GANTT_VIEW_TASK_MILESTONE})]),I?v("div",{class:"vxe-gantt-view--chart-milestone-content"},i):renderEmptyElement(h)]))):T.push(v("div",{key:"vbc",class:"vxe-gantt-view--chart-bar-content-wrapper",on:g},[A?v("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(h),I?v("div",{class:"vxe-gantt-view--chart-content"},i):renderEmptyElement(h)]))),v("div",{key:t,attrs:{rowid:t},class:["vxe-gantt-view--chart-row","is--".concat(l),{"is--progress":A,"row--pending":!!G&&!!F[t],"is--round":n,"is--move":R}],style:{height:"".concat(V,"px")},on:{onDragstart:function(e){p.dragBarRow&&e.preventDefault()},contextmenu:function(e){h.handleTaskBarContextmenuEvent(e,O)}}},[v("div",{class:[b?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar","is--".concat(l),{"is--active":d===t,"active--link":y&&(t==="".concat(y.from)||t==="".concat(y.to))}],style:c,attrs:{rowid:t},on:{click:function(e){h.handleTaskBarClickEvent(e,S)},dblclick:function(e){h.handleTaskBarDblclickEvent(e,S)},mousedown:function(e){h.handleTaskBarMousedownEvent&&h.handleTaskBarMousedownEvent(e,S)}}},T)])},renderTaskRows:function(s,l,e){var c=this,t=c.$xeGanttView.reactData,u=l.treeConfig,d=l.treeExpandedFlag,p=l.fullAllDataRowIdData,v=l.treeExpandedMaps,a=l.computeTreeOpts,w=a.transform,g=a.children||a.childrenField,f=t.scrollYLoad,h=[];return e.forEach(function(e,t){var a=l.getRowid(e),r=p[a]||{},n=t,o=-1,r=(r&&(n=r.index,o=r._index),!1),i=[];u&&(i=e[g],r=!!d&&i&&0<i.length&&!!v[a]),h.push(c.renderTaskBar(s,l,e,a,n,t,o,i,r)),u&&r&&!f&&!w&&h.push.apply(h,_toConsumableArray(c.renderTaskRows(s,l,i)))}),h},renderVN:function(e){var t=this.$xeGantt,a=this.$xeGanttView,r=t.reactData,n=a.internalData.xeTable,o=t.$scopedSlots,r=r.dragLinkFromStore,i=a.reactData.tableData,s=t.computeTaskLinkOpts,a=a.computeNowLineLeft,l=s.isCurrent,c=s.isHover,u=t.computeTaskBarOpts.linkCreatable,o=o.taskNowLine||o["task-now-line"];return e("div",{ref:"refElem",class:["vxe-gantt-view--chart-wrapper",{"is--cl-drag":r.rowid}]},[0<a?e("div",{ref:"refNowLineElem",class:"vxe-gantt-view--chart-now-line",style:{left:a+"px"}},o?o({}):[]):renderEmptyElement(t),t.renderGanttTaskChartBefores?e("div",{ref:"refChartBeforeWrapperElem",class:["vxe-gantt-view--chart-before-wrapper",{"link--current":l,"link--hover":c}]},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartBefores(e):[]):renderEmptyElement(t),e("div",{ref:"refTaskWrapperElem",class:["vxe-gantt-view--chart-task-wrapper",{"link--current":l,"link--create":u}]},n?this.renderTaskRows(e,n,i):[]),t.renderGanttTaskChartAfters?e("div",{ref:"refChartAfterWrapperElem",class:"vxe-gantt-view--chart-after-wrapper"},n&&(0,_utils.isEnableConf)(s)?t.renderGanttTaskChartAfters(e):[]):renderEmptyElement(t)])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,a="main-chart-";t["".concat(a,"now-line")]=e.$refs.refNowLineElem,t["".concat(a,"task-wrapper")]=e.$refs.refTaskWrapperElem,t["".concat(a,"before-wrapper")]=e.$refs.refChartBeforeWrapperElem,t["".concat(a,"after-wrapper")]=e.$refs.refChartAfterWrapperElem},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-chart-";e["".concat(t,"now-line")]=null,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

@@ -1213,7 +1213,7 @@ function updateStyle($xeGanttView) {
     bodyTableElem.style.width = "".concat(vmTableWidth, "px");
   }
   reactData.scrollXWidth = viewTableWidth;
-  return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.handleUpdateTaskLinkStyle ? $xeGantt.handleUpdateTaskLinkStyle($xeGanttView) : null]);
+  return Promise.all([updateTaskChartStyle($xeGanttView), $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null]);
 }
 function handleRecalculateStyle($xeGanttView) {
   var internalData = $xeGanttView.internalData;
@@ -1777,11 +1777,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var nlLeft = 0;
       if (showNowLine && minScale && minViewDate && maxViewDate && nowTime >= minViewDate.getTime() && nowTime <= maxViewDate.getTime()) {
         var todayValue = todayDateMaps[minScale.type];
+        var todayDate = _xeUtils.default.toStringDate(todayValue);
         var currCol = null;
         var nextCol = null;
         for (var i = 0; i < visibleColumn.length; i++) {
           var column = visibleColumn[i];
-          if (column.field === todayValue) {
+          var startDateObj = column.startDateObj,
+            endDateObj = column.endDateObj;
+          if (startDateObj.date <= todayDate && endDateObj.date >= todayDate) {
             currCol = column;
             nlLeft = i * viewCellWidth;
             nextCol = visibleColumn[i + 1];