vxe-gantt 4.1.1 → 4.1.3

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

@@ -475,6 +475,7 @@ export default defineVxeComponent({
       refForm,
       refToolbar,
       refPager,
+      refGanttView,
       refGanttContainerElem,
       refClassifyWrapperElem,
       refPopupContainerElem
@@ -527,31 +528,24 @@ export default defineVxeComponent({
       const taskScaleConfs = computeTaskViewScales.value
       const taskViewScaleOpts = computeTaskViewScaleOpts.value
       const scaleConfs: VxeGanttDefines.ColumnScaleObj[] = []
-      if (taskScaleConfs) {
-        const keyMaps: Record<string, boolean> = {}
-        taskScaleConfs.forEach(conf => {
-          const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf
-          const { type } = sConf
-          if (!type || !viewTypeLevelMaps[type]) {
-            errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')])
-            return
-          }
-          if (keyMaps[type]) {
-            errLog('vxe.error.repeatProp', ['type', type])
-            return
-          }
-          keyMaps[type] = true
-          scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
-            level: getViewTypeLevel(type)
-          }))
-        })
-      }
-      if (!scaleConfs.length) {
-        scaleConfs.push(
-          { type: 'month', level: viewTypeLevelMaps.month },
-          { type: 'date', level: viewTypeLevelMaps.date }
-        )
-      }
+      const keyMaps: Record<string, boolean> = {}
+      const scaleList = (taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date'] as VxeGanttDefines.ColumnScaleType[])
+      scaleList.forEach(conf => {
+        const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf
+        const { type } = sConf
+        if (!type || !viewTypeLevelMaps[type]) {
+          errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')])
+          return
+        }
+        if (keyMaps[type]) {
+          errLog('vxe.error.repeatProp', ['type', type])
+          return
+        }
+        keyMaps[type] = true
+        scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
+          level: getViewTypeLevel(type)
+        }))
+      })
       reactData.taskScaleList = XEUtils.orderBy(scaleConfs, { field: 'level', order: 'desc' })
     }
 
@@ -1762,7 +1756,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)

package/packages/ui/index.ts

@@ -5,6 +5,9 @@ const { setConfig, setIcon, checkVersion } = VxeUI
 
 VxeUI.ganttVersion = process.env.VUE_APP_VXE_VERSION as string
 
+const ymdFormat = 'yyyy-MM-dd'
+const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss'
+
 setConfig({
   gantt: {
     // size: null,
@@ -47,8 +50,33 @@ setConfig({
       enterable: true
     },
     taskViewScaleConfig: {
+      year: {
+        valueFormat: ymdFormat
+      },
+      quarter: {
+        valueFormat: ymdFormat
+      },
+      month: {
+        valueFormat: ymdFormat
+      },
       week: {
-        startDay: 1
+        startDay: 1,
+        valueFormat: ymdFormat
+      },
+      day: {
+        valueFormat: ymdFormat
+      },
+      date: {
+        valueFormat: ymdFormat
+      },
+      hour: {
+        valueFormat: ymdhmsFormat
+      },
+      minute: {
+        valueFormat: ymdhmsFormat
+      },
+      second: {
+        valueFormat: ymdhmsFormat
       }
     },
     taskViewConfig: {