vxe-gantt 4.6.9 → 4.7.0

package/dist/all.esm.js

@@ -6,7 +6,7 @@ import DomZIndex from 'dom-zindex';
 import { VxeTable } from 'vxe-table';
 
 const { setConfig: setConfig$1, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.6.9";
+VxeUI.ganttVersion = "4.7.0";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig$1({
@@ -115,7 +115,7 @@ setIcon({
 });
 
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"4.6.9"}`;
+const ganttVersion = `gantt v${"4.7.0"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
@@ -628,17 +628,7 @@ var GanttViewChartComponent = defineVxeComponent({
             const taskBarSubviewOpts = computeTaskBarSubviewOpts.value;
             const { showOverview, barStyle: subBarStyle } = taskBarSubviewOpts;
             const scaleUnit = computeScaleUnit.value;
-            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) || undefined : 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$3,
                 type: viewType$2,
@@ -648,18 +638,31 @@ var GanttViewChartComponent = defineVxeComponent({
                 rowIndex,
                 _rowIndex
             };
+            const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
+            const isBarRowStyle = XEUtils.isFunction(barStyle);
+            const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) || undefined : 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 = XEUtils.isFunction(bgColor) ? bgColor(ctParams) : 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) {
@@ -706,7 +709,7 @@ var GanttViewChartComponent = defineVxeComponent({
                                     rowid: rowid,
                                     class: ['vxe-gantt-view--chart-subview-row', {
                                             'is--progress': showProgress,
-                                            'is--round': round,
+                                            'is--round': barRound,
                                             'is--move': moveable
                                         }]
                                 }, [
@@ -736,9 +739,21 @@ var GanttViewChartComponent = 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$3,
+                                type: viewType$2,
+                                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;
@@ -747,21 +762,25 @@ var GanttViewChartComponent = defineVxeComponent({
                             if (isChildSubview) {
                                 return;
                             }
+                            const childVbStyle = {};
                             const childVpStyle = {
                                 width: `${childProgressValue || 0}%`
                             };
-                            if (isBarRowStyle) {
-                                const { bgColor, completedBgColor } = childBarStyObj;
-                                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 }));
                             }
@@ -770,7 +789,7 @@ var GanttViewChartComponent = defineVxeComponent({
                                 rowid: childRowid,
                                 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]
                                     }]
@@ -778,7 +797,7 @@ var GanttViewChartComponent = defineVxeComponent({
                                 h('div', {
                                     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) : subBarStyle) : undefined,
+                                    style: childVbStyle,
                                     onClick(evnt) {
                                         evnt.stopPropagation();
                                         $xeGantt.handleTaskBarClickEvent(evnt, childCtParams);
@@ -864,7 +883,7 @@ var GanttViewChartComponent = 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: {
@@ -1511,11 +1530,13 @@ var GanttViewComponent = 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];
@@ -2575,7 +2596,7 @@ var GanttViewComponent = defineVxeComponent({
             reactData.scrollXWidth = viewTableWidth;
             return Promise.all([
                 updateTaskChartStyle(),
-                $xeGantt.handleUpdateTaskLinkStyle ? $xeGantt.handleUpdateTaskLinkStyle($xeGanttView) : null
+                $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null
             ]);
         };
         const handleRecalculateStyle = () => {
@@ -3587,7 +3608,7 @@ var VxeGanttComponent = defineVxeComponent({
                 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;
@@ -5791,8 +5812,8 @@ var VxeGanttComponent = defineVxeComponent({
             $xeGantt.refreshTaskView();
         });
         watch(computeTaskLinkStyle, () => {
-            if ($xeGantt.handleUpdateTaskLinkData) {
-                $xeGantt.handleUpdateTaskLinkData();
+            if ($xeGantt.handleUpTaskLinkData) {
+                $xeGantt.handleUpTaskLinkData();
             }
         });
         hooks.forEach((options) => {
@@ -5812,7 +5833,17 @@ var VxeGanttComponent = defineVxeComponent({
         handleTaskScaleConfig();
         initPages();
         onMounted(() => {
-            if (!$xeGantt.handleUpdateTaskLinkData) {
+            const taskBarSubviewOpts = computeTaskBarSubviewOpts.value;
+            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 (!$xeGantt.handleUpTaskLinkData) {
                 if (props.links) {
                     warnLog('vxe.error.notProp', ['links']);
                 }

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

@@ -46,17 +46,7 @@ export default defineVxeComponent({
             const taskBarSubviewOpts = computeTaskBarSubviewOpts.value;
             const { showOverview, barStyle: subBarStyle } = taskBarSubviewOpts;
             const scaleUnit = computeScaleUnit.value;
-            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) || undefined : 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,
@@ -66,18 +56,31 @@ export default defineVxeComponent({
                 rowIndex,
                 _rowIndex
             };
+            const { showProgress, showContent, contentMethod, barStyle, moveable, showTooltip } = taskBarOpts;
+            const isBarRowStyle = XEUtils.isFunction(barStyle);
+            const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) || undefined : 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 = XEUtils.isFunction(bgColor) ? bgColor(ctParams) : 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) {
@@ -124,7 +127,7 @@ export default defineVxeComponent({
                                     rowid: rowid,
                                     class: ['vxe-gantt-view--chart-subview-row', {
                                             'is--progress': showProgress,
-                                            'is--round': round,
+                                            'is--round': barRound,
                                             'is--move': moveable
                                         }]
                                 }, [
@@ -154,9 +157,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;
@@ -169,21 +184,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 }));
                             }
@@ -192,7 +207,7 @@ export default defineVxeComponent({
                                 rowid: childRowid,
                                 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]
                                     }]
@@ -200,7 +215,7 @@ export default defineVxeComponent({
                                 h('div', {
                                     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) : subBarStyle) : undefined,
+                                    style: childVbStyle,
                                     onClick(evnt) {
                                         evnt.stopPropagation();
                                         $xeGantt.handleTaskBarClickEvent(evnt, childCtParams);
@@ -286,7 +301,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

@@ -215,11 +215,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];
@@ -1279,7 +1281,7 @@ export default defineVxeComponent({
             reactData.scrollXWidth = viewTableWidth;
             return Promise.all([
                 updateTaskChartStyle(),
-                $xeGantt.handleUpdateTaskLinkStyle ? $xeGantt.handleUpdateTaskLinkStyle($xeGanttView) : null
+                $xeGantt.handleUpTaskLinkStyle ? $xeGantt.handleUpTaskLinkStyle($xeGanttView) : null
             ]);
         };
         const handleRecalculateStyle = () => {

package/es/gantt/src/gantt.js

@@ -320,7 +320,7 @@ export default defineVxeComponent({
                 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;
@@ -2524,8 +2524,8 @@ export default defineVxeComponent({
             $xeGantt.refreshTaskView();
         });
         watch(computeTaskLinkStyle, () => {
-            if ($xeGantt.handleUpdateTaskLinkData) {
-                $xeGantt.handleUpdateTaskLinkData();
+            if ($xeGantt.handleUpTaskLinkData) {
+                $xeGantt.handleUpTaskLinkData();
             }
         });
         hooks.forEach((options) => {
@@ -2545,7 +2545,17 @@ export default defineVxeComponent({
         handleTaskScaleConfig();
         initPages();
         onMounted(() => {
-            if (!$xeGantt.handleUpdateTaskLinkData) {
+            const taskBarSubviewOpts = computeTaskBarSubviewOpts.value;
+            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 (!$xeGantt.handleUpTaskLinkData) {
                 if (props.links) {
                     warnLog('vxe.error.notProp', ['links']);
                 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { setConfig, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.6.9";
+VxeUI.ganttVersion = "4.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${"4.6.9"}`;
+const ganttVersion = `gantt v${"4.7.0"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';

package/es/ui/src/utils.js

@@ -23,6 +23,12 @@ export function nextZIndex() {
 export function getLastZIndex() {
     return DomZIndex.getCurrent();
 }
+export function getGlobalDefaultConfig(value, globalValue) {
+    if (XEUtils.eqNull(value)) {
+        return globalValue;
+    }
+    return value;
+}
 export function hasChildrenList(item) {
     return item && item.children && item.children.length > 0;
 }

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

@@ -99,8 +99,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const scaleUnit = computeScaleUnit.value;
       const barParams = {
         $gantt: $xeGantt,
+        source: sourceType,
+        type: viewType,
+        scaleType: scaleUnit,
         row,
-        scaleType: scaleUnit
+        $rowIndex,
+        rowIndex,
+        _rowIndex
       };
       const {
         showProgress,
@@ -112,39 +117,28 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       } = taskBarOpts;
       const isBarRowStyle = _xeUtils.default.isFunction(barStyle);
       const barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) || undefined : barStyle : {}) || {};
-      const {
-        round
-      } = barStyObj;
+      const barRound = barStyObj.round;
+      const barBgColor = barStyObj.bgColor;
+      const barCompletedBgColor = barStyObj.completedBgColor;
+      const barHtmlStyle = barStyObj.style;
       const rowRest = fullAllDataRowIdData[rowid] || {};
       const cellHeight = resizeHeightFlag ? (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight) : 0;
       let title = (0, _utils.getStringValue)(_xeUtils.default.get(row, titleField));
       const progressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(row, progressField)))) : 0;
       const renderTaskType = (0, _util.getTaskType)(_xeUtils.default.get(row, typeField));
-      const ctParams = {
-        $gantt: $xeGantt,
-        source: sourceType,
-        type: viewType,
-        scaleType: scaleUnit,
-        row,
-        $rowIndex,
-        rowIndex,
-        _rowIndex
-      };
+      const ctParams = Object.assign({}, barParams);
       const vbStyle = {};
       const vpStyle = {
         width: `${progressValue || 0}%`
       };
-      if (isBarRowStyle) {
-        const {
-          bgColor,
-          completedBgColor
-        } = barStyObj;
-        if (bgColor) {
-          vbStyle.backgroundColor = _xeUtils.default.isFunction(bgColor) ? bgColor(ctParams) : bgColor;
-        }
-        if (completedBgColor) {
-          vpStyle.backgroundColor = completedBgColor;
-        }
+      if (barBgColor) {
+        vbStyle.backgroundColor = barBgColor;
+      }
+      if (barCompletedBgColor) {
+        vpStyle.backgroundColor = barCompletedBgColor;
+      }
+      if (barHtmlStyle) {
+        _xeUtils.default.assign(vbStyle, barHtmlStyle);
       }
       let cbVNs = [];
       if ($xeGantt.renderGanttTaskBarContent) {
@@ -201,7 +195,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                 rowid: rowid,
                 class: ['vxe-gantt-view--chart-subview-row', {
                   'is--progress': showProgress,
-                  'is--round': round,
+                  'is--round': barRound,
                   'is--move': moveable
                 }]
               }, [(0, _vue.h)('div', {
@@ -221,13 +215,19 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             _xeUtils.default.eachTree(rowChildren, childRow => {
               const 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)
               };
-              const childBarStyObj = (barStyle ? isBarRowStyle ? barStyle(childBarParams) : barStyle : {}) || {};
-              const {
-                round
-              } = childBarStyObj;
+              const childBarStyObj = _xeUtils.default.assign({}, (barStyle ? _xeUtils.default.isFunction(barStyle) ? barStyle(childBarParams) : barStyle : {}) || {}, (subBarStyle ? _xeUtils.default.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 = (0, _utils.getStringValue)(_xeUtils.default.get(childRow, titleField));
               const childProgressValue = showProgress ? Math.min(100, Math.max(0, _xeUtils.default.toNumber(_xeUtils.default.get(childRow, progressField)))) : 0;
@@ -240,24 +240,21 @@ var _default = exports.default = (0, _comp.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.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);
+              }
+              const childCtParams = Object.assign({}, childBarParams);
               if (contentMethod) {
                 childTitle = (0, _utils.getStringValue)(contentMethod({
                   row: childRow,
@@ -270,14 +267,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                 rowid: childRowid,
                 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]
                 }]
               }, [(0, _vue.h)('div', {
                 rowid: childRowid,
                 class: [taskBarSlot ? 'vxe-gantt-view--chart-subview-custom-bar' : 'vxe-gantt-view--chart-subview-bar', `is--${childRenderTaskType}`],
-                style: subBarStyle ? _xeUtils.default.isFunction(subBarStyle) ? subBarStyle(childCtParams) : subBarStyle : undefined,
+                style: childVbStyle,
                 onClick(evnt) {
                   evnt.stopPropagation();
                   $xeGantt.handleTaskBarClickEvent(evnt, childCtParams);
@@ -357,7 +354,7 @@ var _default = exports.default = (0, _comp.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: {