vxe-gantt 3.1.0 → 3.1.2

package/lib/index.umd.js

@@ -8182,7 +8182,7 @@ var core_ = __webpack_require__(4345);
 ;// ./packages/ui/src/log.ts
 
 var log = core_.VxeUI.log;
-var version = "gantt v".concat("3.1.0");
+var version = "gantt v".concat("3.1.2");
 var warnLog = log.create('warn', version);
 var errLog = log.create('error', version);
 ;// ./packages/ui/index.ts
@@ -8192,7 +8192,7 @@ var errLog = log.create('error', version);
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon,
   checkVersion = core_.VxeUI.checkVersion;
-core_.VxeUI.ganttVersion = "3.1.0";
+core_.VxeUI.ganttVersion = "3.1.2";
 setConfig({
   gantt: {
     // size: null,
@@ -8231,6 +8231,9 @@ setConfig({
       // beforeSave: null,
       // afterSave: null
     },
+    taskBarTooltipConfig: {
+      enterable: true
+    },
     taskViewScaleConfig: {
       week: {
         startDay: 1
@@ -8714,6 +8717,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 index_esm.getNext();
 }
@@ -8739,6 +8745,9 @@ function getFuncText(content, args) {
   }
   return '';
 }
+function formatText(value, placeholder) {
+  return '' + (isEmptyValue(value) ? placeholder ? core_.VxeUI.getConfig().emptyCell : '' : value);
+}
 /**
  * 判断值为：'' | null | undefined 时都属于空值
  */
@@ -9000,7 +9009,6 @@ function getStandardGapTime(type) {
 
 
 
-
 var getI18n = core_.VxeUI.getI18n;
 var sourceType = 'gantt';
 var viewType = 'header';
@@ -9071,15 +9079,17 @@ var viewType = 'header';
             childCount = column.childCount,
             dateObj = column.dateObj;
           var label = "".concat(column.title);
-          if ($rowIndex < headerGroups.length - 1) {
-            if (scaleItem.type === 'day') {
-              label = getI18n("vxe.gantt.dayss.w".concat(dateObj.e));
-            } else {
-              label = getI18n("vxe.gantt.".concat(!$rowIndex && headerGroups.length > 1 ? 'tFullFormat' : 'tSimpleFormat', ".").concat(type), dateObj);
-            }
+          if (scaleItem.type === 'day') {
+            label = getI18n("vxe.gantt.dayss.w".concat(dateObj.e));
           } else {
-            if (isLast && scaleItem.type === 'week') {
+            if ($rowIndex) {
               label = getI18n("vxe.gantt.tSimpleFormat.".concat(type), dateObj);
+            } else {
+              if (isLast && scaleItem.type === 'week') {
+                label = getI18n("vxe.gantt.tSimpleFormat.".concat(type), dateObj);
+              } else {
+                label = getI18n("vxe.gantt.tFullFormat.".concat(type), dateObj);
+              }
             }
           }
           var cellVNs = label;
@@ -9166,6 +9176,7 @@ var viewType = 'header';
 
 
 
+
 var renderEmptyElement = core_.VxeUI.renderEmptyElement;
 var gantt_chart_sourceType = 'gantt';
 var gantt_chart_viewType = 'chart';
@@ -9205,15 +9216,18 @@ var gantt_chart_viewType = 'chart';
       var titleField = $xeGantt.computeTitleField;
       var progressField = $xeGantt.computeProgressField;
       var taskBarOpts = $xeGantt.computeTaskBarOpts;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var barParams = {
         $gantt: $xeGantt,
-        row: row
+        row: row,
+        scaleType: scaleUnit
       };
       var showProgress = taskBarOpts.showProgress,
         showContent = taskBarOpts.showContent,
         contentMethod = taskBarOpts.contentMethod,
         barStyle = taskBarOpts.barStyle,
-        drag = taskBarOpts.drag;
+        drag = taskBarOpts.drag,
+        showTooltip = taskBarOpts.showTooltip;
       var isBarRowStyle = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle);
       var barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) : barStyle : {}) || {};
       var round = barStyObj.round;
@@ -9240,17 +9254,45 @@ var gantt_chart_viewType = 'chart';
       if (contentMethod) {
         title = getStringValue(contentMethod({
           row: row,
-          title: title
+          title: title,
+          scaleType: scaleUnit
         }));
       }
       var ctParams = {
+        $gantt: $xeGantt,
         source: gantt_chart_sourceType,
         type: gantt_chart_viewType,
+        scaleType: scaleUnit,
         row: row,
         $rowIndex: $rowIndex,
         rowIndex: rowIndex,
         _rowIndex: _rowIndex
       };
+      var ons = {
+        click: function click(evnt) {
+          $xeGantt.handleTaskBarClickEvent(evnt, barParams);
+        },
+        dblclick: function dblclick(evnt) {
+          $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
+        },
+        mousedown: function mousedown(evnt) {
+          if ($xeGantt.handleTaskBarMousedownEvent) {
+            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
+          }
+        }
+      };
+      if (showTooltip) {
+        ons.mouseover = function (evnt) {
+          $xeGantt.triggerTaskBarTooltipEvent(evnt, Object.assign({
+            $event: evnt
+          }, ctParams));
+        };
+        ons.mouseleave = function (evnt) {
+          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, Object.assign({
+            $event: evnt
+          }, ctParams));
+        };
+      }
       return h('div', {
         key: treeConfig ? rowid : $rowIndex,
         attrs: {
@@ -9275,19 +9317,7 @@ var gantt_chart_viewType = 'chart';
         attrs: {
           rowid: rowid
         },
-        on: {
-          click: function click(evnt) {
-            $xeGantt.handleTaskBarClickEvent(evnt, barParams);
-          },
-          dblclick: function dblclick(evnt) {
-            $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
-          },
-          mousedown: function mousedown(evnt) {
-            if ($xeGantt.handleTaskBarMousedownEvent) {
-              $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
-            }
-          }
-        }
+        on: ons
       }, taskBarSlot ? $xeGantt.callSlot(taskBarSlot, barParams, h) : [showProgress ? h('div', {
         class: 'vxe-gantt-view--chart-progress',
         style: vpStyle
@@ -9420,6 +9450,7 @@ var gantt_body_viewType = 'body';
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var showNowLine = taskViewOpts.showNowLine,
         viewStyle = taskViewOpts.viewStyle;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var _ref = headerGroups[headerGroups.length - 1] || {},
         scaleItem = _ref.scaleItem;
       var field = column.field,
@@ -9472,8 +9503,10 @@ var gantt_body_viewType = 'body';
         }));
       }
       var ctParams = {
+        $gantt: $xeGantt,
         source: gantt_body_sourceType,
         type: gantt_body_viewType,
+        scaleType: scaleUnit,
         dateObj: dateObj,
         row: row,
         column: column,
@@ -9536,6 +9569,7 @@ var gantt_body_viewType = 'body';
       var treeOpts = $xeTable.computeTreeOpts;
       var transform = treeOpts.transform;
       var childrenField = treeOpts.children || treeOpts.childrenField;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var viewStyle = taskViewOpts.viewStyle;
       var _ref3 = viewStyle || {},
@@ -9578,8 +9612,10 @@ var gantt_body_viewType = 'body';
           trOns.dragover = $xeTable.handleRowDragDragoverEvent;
         }
         var rowParams = {
+          $gantt: $xeGantt,
           source: gantt_body_sourceType,
           type: gantt_body_viewType,
+          scaleType: scaleUnit,
           row: row,
           rowIndex: rowIndex,
           $rowIndex: $rowIndex,
@@ -9976,7 +10012,7 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 17) {
         handleData('quarter', colMaps, minCol);
       }
-      if (minScale.level < 14) {
+      if (minScale.level < 15) {
         handleData('month', colMaps, minCol);
       }
       if (minScale.level < 13) {
@@ -9985,7 +10021,7 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 11) {
         handleData('day', colMaps, minCol);
       }
-      if (minScale.level < 12) {
+      if (minScale.level < 9) {
         handleData('date', colMaps, minCol);
       }
       if (minScale.level < 7) {
@@ -9994,6 +10030,9 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 5) {
         handleData('minute', colMaps, minCol);
       }
+      if (minScale.level < 3) {
+        handleData('second', colMaps, minCol);
+      }
       fullCols.push(minCol);
     }
     taskScaleList.forEach(function (scaleItem) {
@@ -11485,6 +11524,7 @@ function gantt_createInternalData() {
   return {
     uFoot: false,
     resizeTableWidth: 0
+    // barTipTimeout: undefined
   };
 }
 /* harmony default export */ var gantt = (/* define-vxe-component start */defineVxeComponent({
@@ -11502,6 +11542,7 @@ function gantt_createInternalData() {
     taskViewScaleConfig: Object,
     taskViewConfig: Object,
     taskBarConfig: Object,
+    taskBarTooltipConfig: Object,
     taskSplitConfig: Object,
     taskBarResizeConfig: Object,
     taskBarDragConfig: Object,
@@ -11540,7 +11581,13 @@ function gantt_createInternalData() {
       },
       showLeftView: true,
       showRightView: true,
-      taskScaleList: []
+      taskScaleList: [],
+      barTipStore: {
+        row: null,
+        content: '',
+        visible: false,
+        params: null
+      }
     };
     var internalData = gantt_createInternalData();
     return {
@@ -11620,6 +11667,11 @@ function gantt_createInternalData() {
       var props = $xeGantt;
       return Object.assign({}, gantt_getConfig().gantt.taskSplitConfig, props.taskSplitConfig);
     },
+    computeTaskBarTooltipOpts: function computeTaskBarTooltipOpts() {
+      var $xeGantt = this;
+      var props = $xeGantt;
+      return Object.assign({}, gantt_getConfig().gantt.taskBarTooltipConfig, props.taskBarTooltipConfig);
+    },
     computeScaleUnit: function computeScaleUnit() {
       var $xeGantt = this;
       var minScale = $xeGantt.computeMinScale;
@@ -11639,12 +11691,19 @@ function gantt_createInternalData() {
         return item.type === 'week';
       });
     },
-    computeTaskScaleConfs: function computeTaskScaleConfs() {
+    computeTaskViewScales: function computeTaskViewScales() {
       var $xeGantt = this;
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var scales = taskViewOpts.scales;
       return scales;
     },
+    /**
+     * 已废弃，保留兼容
+     * @deprecated
+     */
+    computeTaskScaleConfs: function computeTaskScaleConfs() {
+      return this.computeTaskViewScales;
+    },
     computeTitleField: function computeTitleField() {
       var $xeGantt = this;
       var taskOpts = $xeGantt.computeTaskOpts;
@@ -11902,7 +11961,7 @@ function gantt_createInternalData() {
       var $xeGantt = this;
       $xeGantt.initProxy();
     },
-    computeTaskScaleConfs: function computeTaskScaleConfs() {
+    computeTaskViewScales: function computeTaskViewScales() {
       var $xeGantt = this;
       $xeGantt.handleTaskScaleConfig();
       $xeGantt.refreshTaskView();
@@ -11919,7 +11978,7 @@ function gantt_createInternalData() {
     handleTaskScaleConfig: function handleTaskScaleConfig() {
       var $xeGantt = this;
       var reactData = $xeGantt.reactData;
-      var taskScaleConfs = $xeGantt.computeTaskScaleConfs;
+      var taskScaleConfs = $xeGantt.computeTaskViewScales;
       var taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts;
       var scaleConfs = [];
       if (taskScaleConfs) {
@@ -13152,6 +13211,27 @@ function gantt_createInternalData() {
       reactData.showRightView = false;
       return $xeGantt.$nextTick();
     },
+    /**
+       * 关闭 bar tooltip
+       */
+    closeTaskBarTooltip: function closeTaskBarTooltip() {
+      var $xeGantt = this;
+      var reactData = $xeGantt.reactData;
+      var barTipStore = reactData.barTipStore;
+      var $tooltip = $xeGantt.$refs.refTooltip;
+      if (barTipStore.visible) {
+        Object.assign(barTipStore, {
+          row: null,
+          content: null,
+          visible: false,
+          params: {}
+        });
+        if ($tooltip && $tooltip.close) {
+          $tooltip.close();
+        }
+      }
+      return $xeGantt.$nextTick();
+    },
     callSlot: function callSlot(slotFunc, params, h) {
       var $xeGantt = this;
       var slots = $xeGantt.$scopedSlots;
@@ -13286,6 +13366,72 @@ function gantt_createInternalData() {
       var $xeGantt = this;
       $xeGantt.dispatchEvent('task-bar-dblclick', params, evnt);
     },
+    triggerTaskBarTooltipEvent: function triggerTaskBarTooltipEvent(evnt, params) {
+      var $xeGantt = this;
+      var reactData = $xeGantt.reactData;
+      var barTipStore = reactData.barTipStore;
+      var taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
+      var titleField = $xeGantt.computeTitleField;
+      var contentMethod = taskBarTooltipOpts.contentMethod;
+      var row = params.row;
+      var content = formatText(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, titleField));
+      if (contentMethod) {
+        var customContnet = contentMethod(params);
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContnet)) {
+          content = "".concat(customContnet);
+        }
+      }
+      $xeGantt.handleTargetEnterEvent(barTipStore.row !== row);
+      var tipContent = formatText(content);
+      Object.assign(barTipStore, {
+        row: row,
+        visible: true,
+        content: tipContent,
+        params: params
+      });
+      $xeGantt.$nextTick(function () {
+        var $tooltip = $xeGantt.$refs.refTooltip;
+        if ($tooltip) {
+          if ($tooltip.openByEvent) {
+            $tooltip.openByEvent(evnt, evnt.currentTarget, tipContent);
+          } else if ($tooltip.open) {
+            $tooltip.open(evnt.currentTarget, tipContent);
+          }
+        }
+      });
+    },
+    handleTargetEnterEvent: function handleTargetEnterEvent(isClear) {
+      var $xeGantt = this;
+      var internalData = $xeGantt.internalData;
+      var $tooltip = $xeGantt.$refs.refTooltip;
+      clearTimeout(internalData.barTipTimeout);
+      if (isClear) {
+        $xeGantt.closeTaskBarTooltip();
+      } else {
+        if ($tooltip && $tooltip.setActived) {
+          $tooltip.setActived(true);
+        }
+      }
+    },
+    handleTaskBarTooltipLeaveEvent: function handleTaskBarTooltipLeaveEvent() {
+      var $xeGantt = this;
+      var internalData = $xeGantt.internalData;
+      var taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
+      var $tooltip = $xeGantt.$refs.refTooltip;
+      if ($tooltip && $tooltip.setActived) {
+        $tooltip.setActived(false);
+      }
+      if (taskBarTooltipOpts.enterable) {
+        internalData.barTipTimeout = setTimeout(function () {
+          $tooltip = $xeGantt.$refs.refTooltip;
+          if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
+            $xeGantt.closeTaskBarTooltip();
+          }
+        }, taskBarTooltipOpts.leaveDelay);
+      } else {
+        $xeGantt.closeTaskBarTooltip();
+      }
+    },
     handleTaskHeaderContextmenuEvent: function handleTaskHeaderContextmenuEvent(evnt, params) {
       var $xeGantt = this;
       var $xeTable = $xeGantt.$refs.refTable;
@@ -13736,14 +13882,19 @@ function gantt_createInternalData() {
       return childVNs;
     },
     renderLayout: function renderLayout(h) {
+      var VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
       var $xeGantt = this;
+      var reactData = $xeGantt.reactData;
       var slots = $xeGantt.$scopedSlots;
+      var barTipStore = reactData.barTipStore;
       var currLayoutConf = $xeGantt.computeCurrLayoutConf;
       var headKeys = currLayoutConf.headKeys,
         bodyKeys = currLayoutConf.bodyKeys,
         footKeys = currLayoutConf.footKeys;
+      var taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
       var asideLeftSlot = slots.asideLeft || slots['aside-left'];
       var asideRightSlot = slots.asideRight || slots['aside-right'];
+      var taskBarTooltipSlot = slots.taskBarTooltip || slots['task-bar-tooltip'];
       return [h('div', {
         class: 'vxe-gantt--layout-header-wrapper'
       }, $xeGantt.renderChildLayout(h, headKeys)), h('div', {
@@ -13758,7 +13909,41 @@ function gantt_createInternalData() {
         class: 'vxe-gantt--layout-footer-wrapper'
       }, $xeGantt.renderChildLayout(h, footKeys)), h('div', {
         ref: 'refPopupContainerElem'
-      })];
+      }), h('div', {}, [
+      /**
+        * 任务条提示
+        */
+      h(VxeUITooltipComponent, {
+        key: 'gtp',
+        ref: 'refTooltip',
+        props: {
+          theme: taskBarTooltipOpts.theme,
+          enterable: taskBarTooltipOpts.enterable,
+          enterDelay: taskBarTooltipOpts.enterDelay,
+          leaveDelay: taskBarTooltipOpts.leaveDelay,
+          useHTML: taskBarTooltipOpts.useHTML,
+          width: taskBarTooltipOpts.width,
+          height: taskBarTooltipOpts.height,
+          minWidth: taskBarTooltipOpts.minWidth,
+          minHeight: taskBarTooltipOpts.minHeight,
+          maxWidth: taskBarTooltipOpts.maxWidth,
+          maxHeight: taskBarTooltipOpts.maxHeight,
+          isArrow: false
+        },
+        scopedSlots: taskBarTooltipSlot ? {
+          content: function content() {
+            var row = barTipStore.row,
+              tooltipContent = barTipStore.content;
+            if (row) {
+              return h('div', {}, taskBarTooltipSlot(Object.assign({
+                tooltipContent: tooltipContent,
+                $gantt: $xeGantt
+              }, barTipStore.params)));
+            }
+            return gantt_renderEmptyElement($xeGantt);
+          }
+        } : {}
+      })])];
     },
     renderVN: function renderVN(h) {
       var $xeGantt = this;