vxe-gantt 4.1.1 → 4.1.2

package/packages/gantt/src/gantt-body.ts

@@ -17,7 +17,7 @@ export default defineVxeComponent({
     const $xeGantt = inject('$xeGantt', {} as (VxeGanttConstructor & VxeGanttPrivateMethods))
     const $xeGanttView = inject('$xeGanttView', {} as VxeGanttViewConstructor & VxeGanttViewPrivateMethods)
 
-    const { computeTaskViewOpts } = $xeGantt.getComputeMaps()
+    const { computeTaskViewOpts, computeScaleUnit } = $xeGantt.getComputeMaps()
     const { reactData, internalData } = $xeGanttView
 
     const refElem = ref() as Ref<HTMLDivElement>
@@ -42,6 +42,7 @@ export default defineVxeComponent({
       const { todayDateMaps } = internalData
       const taskViewOpts = computeTaskViewOpts.value
       const { showNowLine, viewStyle } = taskViewOpts
+      const scaleUnit = computeScaleUnit.value
       const { scaleItem } = headerGroups[headerGroups.length - 1] || {}
       const { field, dateObj } = column
       const { cellClassName, cellStyle } = viewStyle || {}
@@ -88,7 +89,18 @@ export default defineVxeComponent({
           })
         )
       }
-      const ctParams = { source: sourceType, type: viewType, dateObj, row, column, $rowIndex, rowIndex, _rowIndex }
+      const ctParams = {
+        $gantt: $xeGantt,
+        source: sourceType,
+        type: viewType,
+        scaleType: scaleUnit,
+        dateObj,
+        row,
+        column,
+        $rowIndex,
+        rowIndex,
+        _rowIndex
+      }
       return h('td', {
         key: $columnIndex,
         class: [
@@ -133,6 +145,7 @@ export default defineVxeComponent({
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
 
+      const scaleUnit = computeScaleUnit.value
       const taskViewOpts = computeTaskViewOpts.value
       const { viewStyle } = taskViewOpts
       const { rowClassName, rowStyle } = viewStyle || {}
@@ -170,7 +183,16 @@ export default defineVxeComponent({
           trOns.onDragend = $xeTable.handleRowDragDragendEvent
           trOns.onDragover = $xeTable.handleRowDragDragoverEvent
         }
-        const rowParams = { source: sourceType, type: viewType, row, rowIndex, $rowIndex, _rowIndex }
+        const rowParams = {
+          $gantt: $xeGantt,
+          source: sourceType,
+          type: viewType,
+          scaleType: scaleUnit,
+          row,
+          rowIndex,
+          $rowIndex,
+          _rowIndex
+        }
         trVNs.push(
           h('tr', {
             key: treeConfig ? rowid : $rowIndex,

package/packages/gantt/src/gantt-chart.ts

@@ -21,7 +21,7 @@ export default defineVxeComponent({
     const $xeGanttView = inject('$xeGanttView', {} as VxeGanttViewConstructor & VxeGanttViewPrivateMethods)
 
     const { reactData, internalData } = $xeGanttView
-    const { computeProgressField, computeTitleField, computeTaskBarOpts } = $xeGantt.getComputeMaps()
+    const { computeProgressField, computeTitleField, computeTaskBarOpts, computeScaleUnit } = $xeGantt.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
 
@@ -43,7 +43,8 @@ export default defineVxeComponent({
       const titleField = computeTitleField.value
       const progressField = computeProgressField.value
       const taskBarOpts = computeTaskBarOpts.value
-      const barParams = { $gantt: $xeGantt, row }
+      const scaleUnit = computeScaleUnit.value
+      const barParams = { $gantt: $xeGantt, row, scaleType: scaleUnit }
       const { showProgress, showContent, contentMethod, barStyle, drag, showTooltip } = taskBarOpts
       const isBarRowStyle = XEUtils.isFunction(barStyle)
       const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {}
@@ -72,10 +73,19 @@ export default defineVxeComponent({
       }
 
       if (contentMethod) {
-        title = getStringValue(contentMethod({ row, title }))
+        title = getStringValue(contentMethod({ row, title, scaleType: scaleUnit }))
       }
 
-      const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex, $gantt: $xeGantt }
+      const ctParams = {
+        $gantt: $xeGantt,
+        source: sourceType,
+        type: viewType,
+        scaleType: scaleUnit,
+        row,
+        $rowIndex,
+        rowIndex,
+        _rowIndex
+      }
       const ons: {
         onClick: any
         onDblclick: any

package/packages/gantt/src/gantt.ts

@@ -1762,7 +1762,10 @@ export default defineVxeComponent({
         const { row } = params
         let content = formatText(XEUtils.get(row, titleField))
         if (contentMethod) {
-          content = formatText(contentMethod(params))
+          const customContnet = contentMethod(params)
+          if (!XEUtils.eqNull(customContnet)) {
+            content = `${customContnet}`
+          }
         }
         handleTargetEnterEvent(barTipStore.row !== row)
         const tipContent = formatText(content)