vxe-gantt 3.1.1 → 3.1.3

package/lib/ui/index.js

@@ -15,7 +15,9 @@ var _log = require("./src/log");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon,
   checkVersion = _core.VxeUI.checkVersion;
-_core.VxeUI.ganttVersion = "3.1.1";
+_core.VxeUI.ganttVersion = "3.1.3";
+var ymdFormat = 'yyyy-MM-dd';
+var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
   gantt: {
     // size: null,
@@ -58,8 +60,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: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,iconPrefix=(_core.VxeUI.ganttVersion="3.1.1",setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskBarTooltipConfig:{enterable:!0},taskViewScaleConfig:{week:{startDay:1}},taskViewConfig:{showNowLine:!0},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),exports.default=_core.VxeUI);
+Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,ymdFormat=(_core.VxeUI.ganttVersion="3.1.3","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskBarTooltipConfig:{enterable:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),exports.default=_core.VxeUI);

package/lib/ui/src/log.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.warnLog = exports.errLog = void 0;
 var _core = require("@vxe-ui/core");
 var log = _core.VxeUI.log;
-var version = "gantt v".concat("3.1.1");
+var version = "gantt v".concat("3.1.3");
 var warnLog = exports.warnLog = log.create('warn', version);
 var errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.1"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.3"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -64,7 +64,7 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.10.44",
+    "vxe-pc-ui": "^3.10.45",
     "vxe-table": "^3.19.26"
   },
   "vetur": {

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

@@ -51,6 +51,7 @@ export default defineVxeComponent({
       const { todayDateMaps } = internalData
       const taskViewOpts = $xeGantt.computeTaskViewOpts
       const { showNowLine, viewStyle } = taskViewOpts
+      const scaleUnit = $xeGantt.computeScaleUnit
       const { scaleItem } = headerGroups[headerGroups.length - 1] || {}
       const { field, dateObj } = column
       const { cellClassName, cellStyle } = viewStyle || {}
@@ -99,7 +100,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: [
@@ -149,6 +161,7 @@ export default defineVxeComponent({
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
 
+      const scaleUnit = $xeGantt.computeScaleUnit
       const taskViewOpts = $xeGantt.computeTaskViewOpts
       const { viewStyle } = taskViewOpts
       const { rowClassName, rowStyle } = viewStyle || {}
@@ -186,7 +199,16 @@ export default defineVxeComponent({
           trOns.dragend = $xeTable.handleRowDragDragendEvent
           trOns.dragover = $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

@@ -58,7 +58,8 @@ export default defineVxeComponent({
       const titleField = $xeGantt.computeTitleField
       const progressField = $xeGantt.computeProgressField
       const taskBarOpts = $xeGantt.computeTaskBarOpts
-      const barParams = { $gantt: $xeGantt, row }
+      const scaleUnit = $xeGantt.computeScaleUnit
+      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) : {}) || {}
@@ -87,10 +88,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: {
         click: any
         dblclick: any

package/packages/gantt/src/gantt.ts

@@ -593,31 +593,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const taskScaleConfs = $xeGantt.computeTaskViewScales
       const taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts
       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' })
     },
     initToolbar () {
@@ -1901,7 +1894,10 @@ export default /* define-vxe-component start */ 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}`
+        }
       }
       $xeGantt.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: {