vxe-gantt 4.0.5 → 4.0.6

package/lib/index.umd.js

@@ -2780,7 +2780,7 @@ var core_ = __webpack_require__(4345);
 const {
   log
 } = core_.VxeUI;
-const version = `gantt v${"4.0.5"}`;
+const version = `gantt v${"4.0.6"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 ;// ./packages/ui/index.ts
@@ -2791,7 +2791,7 @@ const {
   setIcon,
   checkVersion
 } = core_.VxeUI;
-core_.VxeUI.ganttVersion = "4.0.5";
+core_.VxeUI.ganttVersion = "4.0.6";
 setConfig({
   gantt: {
     // size: null,
@@ -3289,7 +3289,7 @@ const tableEmits = ['update:data', 'keydown-start', 'keydown', 'keydown-end', 'p
 const gridEmits = [...tableEmits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 ;// ./packages/gantt/src/emits.ts
 
-const ganttEmits = [...gridEmits, 'task-cell-click', 'task-cell-dblclick', 'task-bar-click', 'task-bar-dblclick'];
+const ganttEmits = [...gridEmits, 'task-cell-click', 'task-cell-dblclick', 'task-bar-click', 'task-bar-dblclick', 'task-view-cell-click', 'task-view-cell-dblclick'];
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.find.js
 var es_iterator_find = __webpack_require__(116);
 ;// ./packages/gantt/src/util.ts
@@ -3323,6 +3323,7 @@ const {
 /* harmony default export */ var gantt_header = (defineVxeComponent({
   name: 'VxeGanttViewHeader',
   setup() {
+    const $xeGantt = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGantt', {});
     const $xeGanttView = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGanttView', {});
     const {
       reactData,
@@ -3364,12 +3365,17 @@ const {
       }, $rowIndex) => {
         const {
           type,
-          titleMethod
+          titleMethod,
+          slots
         } = scaleItem;
+        const titleSlot = slots ? slots.title : null;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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') {
@@ -3378,20 +3384,24 @@ const {
               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);
+          } else if (titleMethod) {
+            cellVNs = `${titleMethod(ctParams)}`;
           }
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
             key: cIndex,
             class: 'vxe-gantt-view--header-column',
-            colspan: column.childCount || null,
-            title: label
-          }, label);
+            colspan: childCount || null,
+            title: titleSlot ? null : label
+          }, cellVNs);
         }));
       }))])])]);
     };
@@ -3478,15 +3488,36 @@ const {
         contentMethod,
         barStyle
       } = taskBarOpts;
+      const isBarRowStyle = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle);
+      const barStyObj = (barStyle ? isBarRowStyle ? barStyle({
+        row,
+        $gantt: $xeGantt
+      }) : barStyle : {}) || {};
       const {
         round
-      } = barStyle || {};
+      } = 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(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, titleField));
       const progressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, progressField)))) : 0;
+      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,
@@ -3505,6 +3536,7 @@ const {
         }
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: taskBarSlot ? 'vxe-gantt-view--chart-custom-bar' : 'vxe-gantt-view--chart-bar',
+        style: vbStyle,
         rowid,
         onClick(evnt) {
           $xeGantt.handleTaskBarClickEvent(evnt, {
@@ -3520,9 +3552,7 @@ const {
         row
       }) : [showProgress ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-gantt-view--chart-progress',
-        style: {
-          width: `${progressValue || 0}%`
-        }
+        style: vpStyle
       }) : renderEmptyElement($xeGantt), showContent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-gantt-view--chart-content'
       }, title) : renderEmptyElement($xeGantt)])]);
@@ -4151,47 +4181,47 @@ const maxYHeight = 5e6;
             year: {
               field: yyyy,
               title: yyyy,
-              params: dateObj
+              dateObj
             },
             quarter: {
               field: `${yyyy}_q${q}`,
-              title: q,
-              params: dateObj
+              title: `${q}`,
+              dateObj
             },
             month: {
               field: `${yyyy}_${MM}`,
               title: MM,
-              params: dateObj
+              dateObj
             },
             week: {
               field: `${yyyy}_W${W}`,
-              title: W,
-              params: dateObj
+              title: `${W}`,
+              dateObj
             },
             day: {
               field: `${yyyy}_${MM}_${dd}_E${E}`,
-              title: E,
-              params: dateObj
+              title: `${E}`,
+              dateObj
             },
             date: {
               field: `${yyyy}_${MM}_${dd}`,
               title: dd,
-              params: dateObj
+              dateObj
             },
             hour: {
               field: `${yyyy}_${MM}_${dd}_${HH}`,
               title: HH,
-              params: dateObj
+              dateObj
             },
             minute: {
               field: `${yyyy}_${MM}_${dd}_${HH}_${mm}`,
               title: mm,
-              params: dateObj
+              dateObj
             },
             second: {
               field: `${yyyy}_${MM}_${dd}_${HH}_${mm}_${ss}`,
               title: ss,
-              params: dateObj
+              dateObj
             }
           };
           const minCol = colMaps[minSType];
@@ -5174,7 +5204,7 @@ function getViewTypeLevel(type) {
           stys.maxHeight = maxHeight === 'auto' || maxHeight === '100%' ? '100%' : toCssUnit(maxHeight);
         }
       }
-      if (barStyle) {
+      if (barStyle && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle)) {
         const {
           bgColor,
           completedBgColor