vxe-gantt 3.6.2 → 3.6.4

package/lib/index.umd.js

@@ -8468,7 +8468,7 @@ var core_ = __webpack_require__(4345);
 
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon;
-core_.VxeUI.ganttVersion = "3.6.2";
+core_.VxeUI.ganttVersion = "3.6.4";
 var ymdFormat = 'yyyy-MM-dd';
 var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
@@ -8593,7 +8593,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log = core_.VxeUI.log;
-var ganttVersion = "gantt v".concat("3.6.2");
+var ganttVersion = "gantt v".concat("3.6.4");
 function createComponentLog(name) {
   var uiVersion = core_.VxeUI.uiVersion ? "ui v".concat(core_.VxeUI.uiVersion) : '';
   var tableVersion = core_.VxeUI.tableVersion ? "table v".concat(core_.VxeUI.tableVersion) : '';
@@ -11345,6 +11345,7 @@ function calcScrollbar($xeGanttView) {
   var $xeGantt = $xeGanttView.$xeGantt;
   var reactData = $xeGanttView.reactData;
   var internalData = $xeGanttView.internalData;
+  var ganttReactData = $xeGantt.reactData;
   var scrollXWidth = reactData.scrollXWidth,
     scrollYHeight = reactData.scrollYHeight;
   var elemStore = internalData.elemStore;
@@ -11357,14 +11358,20 @@ function calcScrollbar($xeGanttView) {
   if (bodyWrapperElem) {
     overflowY = scrollYHeight > bodyWrapperElem.clientHeight;
     if (yHandleEl) {
-      reactData.scrollbarWidth = scrollbarOpts.width || yHandleEl.offsetWidth - yHandleEl.clientWidth || 14;
+      var scrollbarWidth = scrollbarOpts.width || yHandleEl.offsetWidth - yHandleEl.clientWidth || 14;
+      reactData.scrollbarWidth = scrollbarWidth;
+      ganttReactData.scrollbarWidth = scrollbarWidth;
     }
     reactData.overflowY = overflowY;
+    ganttReactData.overflowY = overflowY;
     overflowX = scrollXWidth > bodyWrapperElem.clientWidth;
     if (xHandleEl) {
-      reactData.scrollbarHeight = scrollbarOpts.height || xHandleEl.offsetHeight - xHandleEl.clientHeight || 14;
+      var scrollbarHeight = scrollbarOpts.height || xHandleEl.offsetHeight - xHandleEl.clientHeight || 14;
+      reactData.scrollbarHeight = scrollbarHeight;
+      ganttReactData.scrollbarHeight = scrollbarHeight;
     }
     reactData.overflowX = overflowX;
+    ganttReactData.overflowX = overflowX;
   }
 }
 function handleSubTaskMinMaxSize($xeGanttView, $xeTable, list) {
@@ -12646,6 +12653,14 @@ function gantt_createReactData() {
   return {
     tableLoading: false,
     proxyInited: false,
+    // 是否存在纵向滚动条
+    overflowY: false,
+    // 是否存在横向滚动条
+    overflowX: false,
+    // 纵向滚动条的宽度
+    scrollbarWidth: 0,
+    // 横向滚动条的高度
+    scrollbarHeight: 0,
     isZMax: false,
     tableLinks: [],
     tableData: [],
@@ -12921,7 +12936,7 @@ function gantt_createReactData() {
       var scrollbarOpts = $xeGantt.computeScrollbarOpts;
       return !!(scrollbarOpts.y && scrollbarOpts.y.position === 'left');
     },
-    computeStyles: function computeStyles() {
+    computeWrapperStyle: function computeWrapperStyle() {
       var $xeGantt = this;
       var props = $xeGantt;
       var reactData = $xeGantt.reactData;
@@ -12929,7 +12944,9 @@ function gantt_createReactData() {
         maxHeight = props.maxHeight,
         taskBarSubviewConfig = props.taskBarSubviewConfig;
       var isZMax = reactData.isZMax,
-        tZindex = reactData.tZindex;
+        tZindex = reactData.tZindex,
+        overflowY = reactData.overflowY,
+        scrollbarWidth = reactData.scrollbarWidth;
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var viewStyle = taskViewOpts.viewStyle,
         tableStyle = taskViewOpts.tableStyle;
@@ -12940,7 +12957,9 @@ function gantt_createReactData() {
       var nlfColor = taskNowLineOpts.fontColor,
         nlbgColor = taskNowLineOpts.bgColor,
         nlWidth = taskNowLineOpts.width;
-      var stys = {};
+      var stys = {
+        '--vxe-ui-gantt-scrollbar-width': (overflowY && scrollbarWidth ? scrollbarWidth : 0) + 'px'
+      };
       if (isZMax) {
         stys.zIndex = tZindex;
       } else {
@@ -15156,7 +15175,12 @@ function gantt_createReactData() {
     },
     renderChildLayout: function renderChildLayout(h, layoutKeys) {
       var $xeGantt = this;
+      var reactData = $xeGantt.reactData;
+      var showLeftView = reactData.showLeftView,
+        showRightView = reactData.showRightView;
       var taskSplitOpts = $xeGantt.computeTaskSplitOpts;
+      var scrollbarXToTop = $xeGantt.computeScrollbarXToTop;
+      var scrollbarYToLeft = $xeGantt.computeScrollbarYToLeft;
       var autoHideCollapseButton = taskSplitOpts.autoHideCollapseButton;
       var childVNs = [];
       layoutKeys.forEach(function (key) {
@@ -15174,7 +15198,11 @@ function gantt_createReactData() {
             childVNs.push(h('div', {
               ref: 'refGanttContainerElem',
               key: 'tv',
-              class: ['vxe-gantt--gantt-container', {
+              class: ['vxe-gantt--gantt-container', "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right'), {
+                'show--left': showLeftView,
+                'hide--left': !showLeftView,
+                'show--right': showRightView,
+                'hide--right': !showRightView,
                 'is--ah-split-btn': autoHideCollapseButton
               }]
             }, [$xeGantt.renderTableLeft(h), $xeGantt.renderTable(h), $xeGantt.renderSplitBar(h), $xeGantt.renderTaskView(h), $xeGantt.renderTableRight(h), h('div', {
@@ -15270,14 +15298,17 @@ function gantt_createReactData() {
       })])];
     },
     renderVN: function renderVN(h) {
+      var _ref5;
       var $xeGantt = this;
       var props = $xeGantt;
       var reactData = $xeGantt.reactData;
       var showLeftView = reactData.showLeftView,
         showRightView = reactData.showRightView,
+        overflowY = reactData.overflowY,
+        overflowX = reactData.overflowX,
         showSplitAnimat = reactData.showSplitAnimat;
       var vSize = $xeGantt.computeSize;
-      var styles = $xeGantt.computeStyles;
+      var wrapperStyle = $xeGantt.computeWrapperStyle;
       var isLoading = $xeGantt.computeIsLoading;
       var taskSplitOpts = $xeGantt.computeTaskSplitOpts;
       var tableBorder = $xeGantt.computeTableBorder;
@@ -15285,8 +15316,8 @@ function gantt_createReactData() {
       var scrollbarYToLeft = $xeGantt.computeScrollbarYToLeft;
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-gantt', "border--".concat(tableBorder), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right'), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--round', props.round), 'show--animat', taskSplitOpts.animation), 'is--maximize', reactData.isZMax), 'is--loading', isLoading), 'is--animat', showSplitAnimat), 'show--left', showLeftView), 'hide--left', !showLeftView), 'show--right', showRightView), 'hide--right', !showRightView)],
-        style: styles
+        class: ['vxe-gantt', "border--".concat(tableBorder), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right'), (_ref5 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref5, "size--".concat(vSize), vSize), 'is--round', props.round), 'show--animat', taskSplitOpts.animation), 'is--maximize', reactData.isZMax), 'is--loading', isLoading), 'is--animat', showSplitAnimat), 'show--left', showLeftView), 'hide--left', !showLeftView), 'show--right', showRightView), 'hide--right', !showRightView), _defineProperty(_defineProperty(_ref5, 'is--scroll-y', overflowY), 'is--scroll-x', overflowX))],
+        style: wrapperStyle
       }, $xeGantt.renderLayout(h));
     }
   }),