vxe-gantt 3.0.27 → 3.1.1

package/lib/ui/index.js

@@ -15,7 +15,7 @@ var _log = require("./src/log");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon,
   checkVersion = _core.VxeUI.checkVersion;
-_core.VxeUI.ganttVersion = "3.0.27";
+_core.VxeUI.ganttVersion = "3.1.1";
 setConfig({
   gantt: {
     // size: null,
@@ -54,6 +54,9 @@ setConfig({
       // beforeSave: null,
       // afterSave: null
     },
+    taskBarTooltipConfig: {
+      enterable: true
+    },
     taskViewScaleConfig: {
       week: {
         startDay: 1

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.0.27",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"}},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,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);

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.0.27");
+var version = "gantt v".concat("3.1.1");
 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.0.27"),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.1"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/ui/src/utils.js

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.eqEmptyValue = eqEmptyValue;
+exports.formatText = formatText;
 exports.getClass = getClass;
 exports.getFuncText = getFuncText;
 exports.getGlobalDefaultConfig = getGlobalDefaultConfig;
 exports.getLastZIndex = getLastZIndex;
 exports.getStringValue = getStringValue;
 exports.getSubLastZIndex = getSubLastZIndex;
+exports.isEmptyValue = isEmptyValue;
 exports.isEnableConf = isEnableConf;
 exports.nextSubZIndex = nextSubZIndex;
 exports.nextZIndex = nextZIndex;
@@ -21,6 +23,9 @@ var getConfig = _core.VxeUI.getConfig;
 function isEnableConf(conf) {
   return conf && conf.enabled !== false;
 }
+function isEmptyValue(cellValue) {
+  return cellValue === null || cellValue === undefined || cellValue === '';
+}
 function nextZIndex() {
   return _domZindex.default.getNext();
 }
@@ -46,6 +51,9 @@ function getFuncText(content, args) {
   }
   return '';
 }
+function formatText(value, placeholder) {
+  return '' + (isEmptyValue(value) ? placeholder ? _core.VxeUI.getConfig().emptyCell : '' : value);
+}
 /**
  * 判断值为：'' | null | undefined 时都属于空值
  */

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.getClass=getClass,exports.getFuncText=getFuncText,exports.getGlobalDefaultConfig=getGlobalDefaultConfig,exports.getLastZIndex=getLastZIndex,exports.getStringValue=getStringValue,exports.getSubLastZIndex=getSubLastZIndex,exports.isEnableConf=isEnableConf,exports.nextSubZIndex=nextSubZIndex,exports.nextZIndex=nextZIndex;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var getConfig=_core.VxeUI.getConfig;function isEnableConf(e){return e&&!1!==e.enabled}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function nextSubZIndex(){return _domZindex.default.getSubNext()}function getSubLastZIndex(){return _domZindex.default.getSubCurrent()}function getGlobalDefaultConfig(e,t){return _xeUtils.default.eqNull(e)?t:e}function getFuncText(e,t){var n;return e?(n=getConfig().translate,_xeUtils.default.toValueString(n?n(""+e,t):e)):""}function eqEmptyValue(e){return null==e||""===e}function getStringValue(e){return eqEmptyValue(e)?"":e}function getClass(e,t){return e?_xeUtils.default.isFunction(e)?e(t):e:""}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.formatText=formatText,exports.getClass=getClass,exports.getFuncText=getFuncText,exports.getGlobalDefaultConfig=getGlobalDefaultConfig,exports.getLastZIndex=getLastZIndex,exports.getStringValue=getStringValue,exports.getSubLastZIndex=getSubLastZIndex,exports.isEmptyValue=isEmptyValue,exports.isEnableConf=isEnableConf,exports.nextSubZIndex=nextSubZIndex,exports.nextZIndex=nextZIndex;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var getConfig=_core.VxeUI.getConfig;function isEnableConf(e){return e&&!1!==e.enabled}function isEmptyValue(e){return null==e||""===e}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function nextSubZIndex(){return _domZindex.default.getSubNext()}function getSubLastZIndex(){return _domZindex.default.getSubCurrent()}function getGlobalDefaultConfig(e,t){return _xeUtils.default.eqNull(e)?t:e}function getFuncText(e,t){var n;return e?(n=getConfig().translate,_xeUtils.default.toValueString(n?n(""+e,t):e)):""}function formatText(e,t){return""+(isEmptyValue(e)?t?_core.VxeUI.getConfig().emptyCell:"":e)}function eqEmptyValue(e){return null==e||""===e}function getStringValue(e){return eqEmptyValue(e)?"":e}function getClass(e,t){return e?_xeUtils.default.isFunction(e)?e(t):e:""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.0.27",
+  "version": "3.1.1",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -64,8 +64,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.10.42",
-    "vxe-table": "^3.19.25"
+    "vxe-pc-ui": "^3.10.44",
+    "vxe-table": "^3.19.26"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -59,7 +59,7 @@ export default defineVxeComponent({
       const progressField = $xeGantt.computeProgressField
       const taskBarOpts = $xeGantt.computeTaskBarOpts
       const barParams = { $gantt: $xeGantt, row }
-      const { showProgress, showContent, contentMethod, barStyle, drag } = taskBarOpts
+      const { showProgress, showContent, contentMethod, barStyle, drag, showTooltip } = taskBarOpts
       const isBarRowStyle = XEUtils.isFunction(barStyle)
       const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {}
       const { round } = barStyObj
@@ -90,7 +90,34 @@ export default defineVxeComponent({
         title = getStringValue(contentMethod({ row, title }))
       }
 
-      const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex }
+      const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex, $gantt: $xeGantt }
+      const ons: {
+        click: any
+        dblclick: any
+        mousedown: any
+        mouseover?: any
+        mouseleave?: any
+      } = {
+        click (evnt: MouseEvent) {
+          $xeGantt.handleTaskBarClickEvent(evnt, barParams)
+        },
+        dblclick (evnt: MouseEvent) {
+          $xeGantt.handleTaskBarDblclickEvent(evnt, barParams)
+        },
+        mousedown (evnt: MouseEvent) {
+          if ($xeGantt.handleTaskBarMousedownEvent) {
+            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams)
+          }
+        }
+      }
+      if (showTooltip) {
+        ons.mouseover = (evnt: MouseEvent) => {
+          $xeGantt.triggerTaskBarTooltipEvent(evnt, Object.assign({ $event: evnt }, ctParams))
+        }
+        ons.mouseleave = (evnt: MouseEvent) => {
+          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, Object.assign({ $event: evnt }, ctParams))
+        }
+      }
       return h('div', {
         key: treeConfig ? rowid : $rowIndex,
         attrs: {
@@ -116,19 +143,7 @@ export default defineVxeComponent({
           attrs: {
             rowid
           },
-          on: {
-            click (evnt: MouseEvent) {
-              $xeGantt.handleTaskBarClickEvent(evnt, barParams)
-            },
-            dblclick (evnt: MouseEvent) {
-              $xeGantt.handleTaskBarDblclickEvent(evnt, barParams)
-            },
-            mousedown (evnt: MouseEvent) {
-              if ($xeGantt.handleTaskBarMousedownEvent) {
-                $xeGantt.handleTaskBarMousedownEvent(evnt, barParams)
-              }
-            }
-          }
+          on: ons
         }, taskBarSlot
           ? $xeGantt.callSlot(taskBarSlot, barParams, h)
           : [

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

@@ -70,19 +70,26 @@ export default defineVxeComponent({
               })
             })),
             h('thead', {}, headerGroups.map(({ scaleItem, columns }, $rowIndex) => {
-              const { type, titleMethod, headerCellStyle, slots } = scaleItem
+              const { type, titleFormat, titleMethod, headerCellStyle, slots } = scaleItem
               const titleSlot = slots ? slots.title : null
-              const todayValue = showNowLine && $rowIndex === headerGroups.length - 1 ? todayDateMaps[type] : null
+              const isLast = $rowIndex === headerGroups.length - 1
+              const todayValue = isLast && showNowLine ? todayDateMaps[type] : null
               return h('tr', {
                 key: $rowIndex
               }, columns.map((column, cIndex) => {
                 const { field, childCount, dateObj } = column
                 let label = `${column.title}`
-                if ($rowIndex < headerGroups.length - 1) {
-                  if (scaleItem.type === 'day') {
-                    label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`)
+                if (scaleItem.type === 'day') {
+                  label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`)
+                } else {
+                  if ($rowIndex) {
+                    label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj)
                   } else {
-                    label = getI18n(`vxe.gantt.${!$rowIndex && headerGroups.length > 1 ? 'tFullFormat' : 'tSimpleFormat'}.${type}`, dateObj)
+                    if (isLast && scaleItem.type === 'week') {
+                      label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj)
+                    } else {
+                      label = getI18n(`vxe.gantt.tFullFormat.${type}`, dateObj)
+                    }
                   }
                 }
                 let cellVNs: string | VxeComponentSlotType[] = label
@@ -91,6 +98,8 @@ export default defineVxeComponent({
                   cellVNs = $xeGantt.callSlot(titleSlot, ctParams, h)
                 } else if (titleMethod) {
                   cellVNs = `${titleMethod(ctParams)}`
+                } else if (titleFormat) {
+                  cellVNs = XEUtils.toDateString(dateObj.date, titleFormat)
                 }
                 let cellStys = {}
                 if (headerCellStyle) {