vxe-gantt 3.0.5 → 3.0.7

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

@@ -41,13 +41,28 @@ export default defineVxeComponent({
             const progressField = $xeGantt.computeProgressField;
             const taskBarOpts = $xeGantt.computeTaskBarOpts;
             const { showProgress, showContent, contentMethod, barStyle } = taskBarOpts;
-            const { round } = barStyle || {};
+            const isBarRowStyle = XEUtils.isFunction(barStyle);
+            const barStyObj = (barStyle ? (isBarRowStyle ? barStyle({ row, $gantt: $xeGantt }) : barStyle) : {}) || {};
+            const { round } = barStyObj;
             const rowRest = fullAllDataRowIdData[rowid] || {};
             const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
             const isRsHeight = resizeHeight > 0;
             const cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
             let title = getStringValue(XEUtils.get(row, titleField));
             const progressValue = showProgress ? Math.min(100, Math.max(0, XEUtils.toNumber(XEUtils.get(row, progressField)))) : 0;
+            const vbStyle = {};
+            const vpStyle = {
+                width: `${progressValue || 0}%`
+            };
+            if (isBarRowStyle) {
+                const { bgColor, completedBgColor } = barStyObj;
+                if (bgColor) {
+                    vbStyle.backgroundColor = bgColor;
+                }
+                if (completedBgColor) {
+                    vpStyle.backgroundColor = completedBgColor;
+                }
+            }
             if (contentMethod) {
                 title = getStringValue(contentMethod({ row, title }));
             }
@@ -66,6 +81,7 @@ export default defineVxeComponent({
             }, [
                 h('div', {
                     class: taskBarSlot ? 'vxe-gantt-view--chart-custom-bar' : 'vxe-gantt-view--chart-bar',
+                    style: vbStyle,
                     attrs: {
                         rowid
                     },
@@ -83,9 +99,7 @@ export default defineVxeComponent({
                         showProgress
                             ? h('div', {
                                 class: 'vxe-gantt-view--chart-progress',
-                                style: {
-                                    width: `${progressValue}%`
-                                }
+                                style: vpStyle
                             })
                             : renderEmptyElement($xeGantt),
                         showContent

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

@@ -18,9 +18,12 @@ export default defineVxeComponent({
         //
         renderVN(h) {
             const _vm = this;
+            const $xeGantt = _vm.$xeGantt;
             const $xeGanttView = _vm.$xeGanttView;
-            const { reactData } = $xeGanttView;
-            const { tableColumn, headerGroups, viewCellWidth } = reactData;
+            const reactData = $xeGanttView.reactData;
+            const internalData = $xeGanttView.internalData;
+            const { headerGroups, viewCellWidth } = reactData;
+            const { visibleColumn } = internalData;
             return h('div', {
                 ref: 'refElem',
                 class: 'vxe-gantt-view--header-wrapper'
@@ -40,7 +43,7 @@ export default defineVxeComponent({
                         ref: 'refHeaderTable',
                         class: 'vxe-gantt-view--header-table'
                     }, [
-                        h('colgroup', {}, tableColumn.map((column, cIndex) => {
+                        h('colgroup', {}, visibleColumn.map((column, cIndex) => {
                             return h('col', {
                                 key: cIndex,
                                 style: {
@@ -49,11 +52,12 @@ export default defineVxeComponent({
                             });
                         })),
                         h('thead', {}, headerGroups.map(({ scaleItem, columns }, $rowIndex) => {
-                            const { type, titleMethod } = scaleItem;
+                            const { type, titleMethod, slots } = scaleItem;
+                            const titleSlot = slots ? slots.title : null;
                             return h('tr', {
                                 key: $rowIndex
                             }, columns.map((column, cIndex) => {
-                                const dateObj = column.params;
+                                const { childCount, dateObj } = column;
                                 let label = `${column.title}`;
                                 if ($rowIndex < headerGroups.length - 1) {
                                     if (scaleItem.type === 'day') {
@@ -63,17 +67,22 @@ export default defineVxeComponent({
                                         label = getI18n(`vxe.gantt.${!$rowIndex && headerGroups.length > 1 ? 'tFullFormat' : 'tSimpleFormat'}.${type}`, dateObj);
                                     }
                                 }
-                                if (titleMethod) {
-                                    label = `${titleMethod({ scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex })}`;
+                                let cellVNs = label;
+                                const ctParams = { scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex };
+                                if (titleSlot) {
+                                    cellVNs = $xeGantt.callSlot(titleSlot, ctParams, h);
+                                }
+                                else if (titleMethod) {
+                                    cellVNs = `${titleMethod(ctParams)}`;
                                 }
                                 return h('th', {
                                     key: cIndex,
                                     class: 'vxe-gantt-view--header-column',
                                     attrs: {
-                                        colspan: column.childCount || null,
-                                        title: label
+                                        colspan: childCount || null,
+                                        title: titleSlot ? null : label
                                     }
-                                }, label);
+                                }, cellVNs);
                             }));
                         }))
                     ])