vxe-gantt 3.0.0-beta.3 → 3.0.0-beta.5

package/lib/index.umd.js

@@ -7584,7 +7584,7 @@ var core_ = __webpack_require__(4345);
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
 var log = core_.VxeUI.log;
-var version = "gantt v".concat("3.0.0-beta.3");
+var version = "gantt v".concat("3.0.0-beta.5");
 var warnLog = log.create('warn', version);
 var errLog = log.create('error', version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -7593,7 +7593,7 @@ var errLog = log.create('error', version);
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon,
   checkVersion = core_.VxeUI.checkVersion;
-core_.VxeUI.ganttVersion = "3.0.0-beta.3";
+core_.VxeUI.ganttVersion = "3.0.0-beta.5";
 setConfig({
   gantt: {
     // size: null,
@@ -8420,6 +8420,8 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       var $xeGantt = _vm.$xeGantt;
       var tableProps = $xeTable;
       var treeConfig = tableProps.treeConfig;
+      var tableReactData = $xeTable;
+      var resizeHeightFlag = tableReactData.resizeHeightFlag;
       var tableInternalData = $xeTable;
       var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
       var cellOpts = $xeTable.computeCellOpts;
@@ -8435,6 +8437,8 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       var _ref = barStyle || {},
         round = _ref.round;
       var rowRest = fullAllDataRowIdData[rowid] || {};
+      var resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
+      var isRsHeight = resizeHeight > 0;
       var cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
       var title = getStringValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, titleField));
       var progressValue = showProgress ? Math.min(100, Math.max(0, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, progressField)))) : 0;
@@ -8450,7 +8454,8 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
           rowid: rowid
         },
         class: ['vxe-gantt-view--chart-row', {
-          'is--round': round
+          'is--round': round,
+          'col--rs-height': isRsHeight
         }],
         style: {
           height: "".concat(cellHeight, "px")
@@ -8576,16 +8581,22 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
     renderColumn: function renderColumn(h, $xeTable, row, rowid, $rowIndex, column, $columnIndex) {
       var _vm = this;
       var $xeGantt = _vm.$xeGantt;
+      var tableReactData = $xeTable;
+      var resizeHeightFlag = tableReactData.resizeHeightFlag;
       var tableInternalData = $xeTable;
       var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData;
       var cellOpts = $xeTable.computeCellOpts;
       var rowOpts = $xeTable.computeRowOpts;
       var defaultRowHeight = $xeTable.computeDefaultRowHeight;
       var rowRest = fullAllDataRowIdData[rowid] || {};
+      var resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
+      var isRsHeight = resizeHeight > 0;
       var cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
       return h('td', {
         key: $columnIndex,
-        class: 'vxe-gantt-view--body-column',
+        class: ['vxe-gantt-view--body-column', {
+          'col--rs-height': isRsHeight
+        }],
         style: {
           height: "".concat(cellHeight, "px")
         },
@@ -8612,12 +8623,18 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       var tableProps = $xeTable;
       var treeConfig = tableProps.treeConfig,
         stripe = tableProps.stripe,
-        highlightHoverRow = tableProps.highlightHoverRow;
+        highlightHoverRow = tableProps.highlightHoverRow,
+        editConfig = tableProps.editConfig;
       var tableReactData = $xeTable;
-      var treeExpandedFlag = tableReactData.treeExpandedFlag;
+      var treeExpandedFlag = tableReactData.treeExpandedFlag,
+        selectRadioRow = tableReactData.selectRadioRow,
+        pendingRowFlag = tableReactData.pendingRowFlag;
       var tableInternalData = $xeTable;
       var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData,
-        treeExpandedMaps = tableInternalData.treeExpandedMaps;
+        treeExpandedMaps = tableInternalData.treeExpandedMaps,
+        pendingRowMaps = tableInternalData.pendingRowMaps;
+      var radioOpts = $xeTable.computeRadioOpts;
+      var checkboxOpts = $xeTable.computeCheckboxOpts;
       var rowOpts = $xeTable.computeRowOpts;
       var treeOpts = $xeTable.computeTreeOpts;
       var transform = treeOpts.transform;
@@ -8635,6 +8652,11 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
           rowIndex = rowRest.index;
           _rowIndex = rowRest._index;
         }
+        // 是否新增行
+        var isNewRow = false;
+        if (editConfig) {
+          isNewRow = $xeTable.isInsertByRow(row);
+        }
         // 当前行事件
         if (rowOpts.isHover || highlightHoverRow) {
           trOns.mouseenter = function (evnt) {
@@ -8650,7 +8672,11 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
         trVNs.push(h('tr', {
           key: treeConfig ? rowid : $rowIndex,
           class: ['vxe-gantt-view--body-row', {
-            'row--stripe': stripe && (_rowIndex + 1) % 2 === 0
+            'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
+            'is--new': isNewRow,
+            'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
+            'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
+            'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
           }],
           attrs: {
             rowid: rowid
@@ -8780,7 +8806,7 @@ function createInternalData() {
   };
 }
 var maxYHeight = 5e6;
-var maxXWidth = 5e6;
+// const maxXWidth = 5e6
 function handleParseColumn($xeGanttView) {
   var $xeGantt = $xeGanttView.$xeGantt;
   var reactData = $xeGanttView.reactData;
@@ -9081,55 +9107,54 @@ function _handleLazyRecalculate($xeGanttView) {
   updateChart($xeGanttView);
   return $xeGanttView.$nextTick();
 }
-function _updateScrollXSpace($xeGanttView) {
-  var reactData = $xeGanttView.reactData;
-  var internalData = $xeGanttView.internalData;
-  var scrollXLoad = reactData.scrollXLoad,
-    scrollXWidth = reactData.scrollXWidth;
-  var elemStore = internalData.elemStore;
-  var bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
-  var bodyTableElem = getRefElem(elemStore['main-body-table']);
-  var xSpaceLeft = 0;
-  var clientWidth = 0;
-  if (bodyScrollElem) {
-    clientWidth = bodyScrollElem.clientWidth;
-  }
-  // 虚拟渲染
-  var isScrollXBig = false;
-  var ySpaceWidth = scrollXWidth;
-  if (scrollXWidth > maxXWidth) {
-    // 触右
-    if (bodyScrollElem && bodyTableElem && bodyScrollElem.scrollLeft + clientWidth >= maxXWidth) {
-      xSpaceLeft = maxXWidth - bodyTableElem.clientWidth;
-    } else {
-      xSpaceLeft = (maxXWidth - clientWidth) * (xSpaceLeft / (scrollXWidth - clientWidth));
-    }
-    ySpaceWidth = maxXWidth;
-    isScrollXBig = true;
-  }
-  if (bodyTableElem) {
-    bodyTableElem.style.transform = "translate(".concat(xSpaceLeft, "px, ").concat(reactData.scrollYTop || 0, "px)");
-  }
-  var layoutList = ['header', 'body', 'footer'];
-  layoutList.forEach(function (layout) {
-    var xSpaceElem = getRefElem(elemStore["main-".concat(layout, "-xSpace")]);
-    if (xSpaceElem) {
-      xSpaceElem.style.width = scrollXLoad ? "".concat(ySpaceWidth, "px") : '';
-    }
-  });
-  reactData.scrollXLeft = xSpaceLeft;
-  reactData.scrollXWidth = ySpaceWidth;
-  reactData.isScrollXBig = isScrollXBig;
-  var scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem;
-  if (scrollXSpaceEl) {
-    scrollXSpaceEl.style.width = "".concat(ySpaceWidth, "px");
-  }
-  calcScrollbar($xeGanttView);
-  return $xeGanttView.$nextTick().then(function () {
-    updateStyle($xeGanttView);
-  });
-}
-function _updateScrollYSpace($xeGanttView) {
+// function updateScrollXSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
+//   const reactData = $xeGanttView.reactData
+//   const internalData = $xeGanttView.internalData
+//   const { scrollXLoad, scrollXWidth } = reactData
+//   const { elemStore } = internalData
+//   const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+//   const bodyTableElem = getRefElem(elemStore['main-body-table'])
+//   let xSpaceLeft = 0
+//   let clientWidth = 0
+//   if (bodyScrollElem) {
+//     clientWidth = bodyScrollElem.clientWidth
+//   }
+//   // 虚拟渲染
+//   let isScrollXBig = false
+//   let ySpaceWidth = scrollXWidth
+//   if (scrollXWidth > maxXWidth) {
+//     // 触右
+//     if (bodyScrollElem && bodyTableElem && bodyScrollElem.scrollLeft + clientWidth >= maxXWidth) {
+//       xSpaceLeft = maxXWidth - bodyTableElem.clientWidth
+//     } else {
+//       xSpaceLeft = (maxXWidth - clientWidth) * (xSpaceLeft / (scrollXWidth - clientWidth))
+//     }
+//     ySpaceWidth = maxXWidth
+//     isScrollXBig = true
+//   }
+//   if (bodyTableElem) {
+//     bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`
+//   }
+//   const layoutList = ['header', 'body', 'footer']
+//   layoutList.forEach(layout => {
+//     const xSpaceElem = getRefElem(elemStore[`main-${layout}-xSpace`])
+//     if (xSpaceElem) {
+//       xSpaceElem.style.width = scrollXLoad ? `${ySpaceWidth}px` : ''
+//     }
+//   })
+//   reactData.scrollXLeft = xSpaceLeft
+//   reactData.scrollXWidth = ySpaceWidth
+//   reactData.isScrollXBig = isScrollXBig
+//   const scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem as HTMLDivElement
+//   if (scrollXSpaceEl) {
+//     scrollXSpaceEl.style.width = `${ySpaceWidth}px`
+//   }
+//   calcScrollbar($xeGanttView)
+//   return $xeGanttView.$nextTick().then(() => {
+//     updateStyle($xeGanttView)
+//   })
+// }
+function updateScrollYSpace($xeGanttView) {
   var reactData = $xeGanttView.reactData;
   var internalData = $xeGanttView.internalData;
   var scrollYLoad = reactData.scrollYLoad,
@@ -9165,16 +9190,17 @@ function _updateScrollYSpace($xeGanttView) {
   if (!(scrollYLoad && overflowY)) {
     scrollYTop = 0;
   }
+  var bodyChartWrapperElem = getRefElem(elemStore['main-chart-wrapper']);
   if (bodyTableElem) {
     bodyTableElem.style.transform = "translate(".concat(reactData.scrollXLeft || 0, "px, ").concat(scrollYTop, "px)");
   }
-  var layoutList = ['header', 'body', 'footer'];
-  layoutList.forEach(function (layout) {
-    var ySpaceElem = getRefElem(elemStore["main-".concat(layout, "-ySpace")]);
-    if (ySpaceElem) {
-      ySpaceElem.style.height = ySpaceHeight ? "".concat(ySpaceHeight, "px") : '';
-    }
-  });
+  if (bodyChartWrapperElem) {
+    bodyChartWrapperElem.style.transform = "translate(".concat(reactData.scrollXLeft || 0, "px, ").concat(scrollYTop, "px)");
+  }
+  var bodyYSpaceElem = getRefElem(elemStore['main-body-ySpace']);
+  if (bodyYSpaceElem) {
+    bodyYSpaceElem.style.height = ySpaceHeight ? "".concat(ySpaceHeight, "px") : '';
+  }
   var scrollYSpaceEl = $xeGanttView.$refs.refScrollYSpaceElem;
   if (scrollYSpaceEl) {
     scrollYSpaceEl.style.height = ySpaceHeight ? "".concat(ySpaceHeight, "px") : '';
@@ -9249,9 +9275,9 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
       // 是否启用了纵向 Y 可视渲染方式加载
       scrollYLoad: false,
       // 是否存在纵向滚动条
-      overflowY: false,
+      overflowY: true,
       // 是否存在横向滚动条
-      overflowX: false,
+      overflowX: true,
       // 纵向滚动条的宽度
       scrollbarWidth: 0,
       // 横向滚动条的高度
@@ -9482,13 +9508,35 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
         handleScrollEvent($xeGanttView, evnt, isRollY, isRollX, currTopNum, wrapperEl.scrollLeft);
       }
     },
-    updateScrollXSpace: function updateScrollXSpace() {
+    handleUpdateSXSpace: function handleUpdateSXSpace() {
+      var $xeGanttView = this;
+      var reactData = $xeGanttView.reactData;
+      var internalData = $xeGanttView.internalData;
+      var scrollXLoad = reactData.scrollXLoad,
+        scrollXWidth = reactData.scrollXWidth;
+      var elemStore = internalData.elemStore;
+      var layoutList = ['header', 'body', 'footer'];
+      layoutList.forEach(function (layout) {
+        var xSpaceElem = getRefElem(elemStore["main-".concat(layout, "-xSpace")]);
+        if (xSpaceElem) {
+          xSpaceElem.style.width = scrollXLoad ? "".concat(scrollXWidth, "px") : '';
+        }
+      });
+      var scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem;
+      if (scrollXSpaceEl) {
+        scrollXSpaceEl.style.width = "".concat(scrollXWidth, "px");
+      }
+      calcScrollbar($xeGanttView);
+      return $xeGanttView.$nextTick();
+    },
+    handleUpdateSYSpace: function handleUpdateSYSpace() {
       var $xeGanttView = this;
-      return _updateScrollXSpace($xeGanttView);
+      return updateScrollYSpace($xeGanttView);
     },
-    updateScrollYSpace: function updateScrollYSpace() {
+    handleUpdateSYStatus: function handleUpdateSYStatus(sYLoad) {
       var $xeGanttView = this;
-      return _updateScrollYSpace($xeGanttView);
+      var reactData = $xeGanttView.reactData;
+      reactData.scrollYLoad = sYLoad;
     },
     handleGlobalResizeEvent: function handleGlobalResizeEvent() {
       var $xeGanttView = this;
@@ -9648,17 +9696,19 @@ var tableProps = external_root_VxeUITable_commonjs_vxe_table_commonjs2_vxe_table
 var tableMethods = {};
 var propKeys = Object.keys(tableProps);
 var defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Gantt', 'Bottom', 'Pager']];
-function getTableOns(_vm) {
-  var $listeners = _vm.$listeners,
-    proxyConfig = _vm.proxyConfig,
-    proxyOpts = _vm.proxyOpts;
+function getTableOns($xeGantt) {
+  var _vm = $xeGantt;
+  var $listeners = _vm.$listeners;
+  var props = $xeGantt;
+  var proxyConfig = props.proxyConfig;
+  var proxyOpts = $xeGantt.computeProxyOpts;
   var ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each($listeners, function (cb, type) {
     ons[type] = function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      _vm.$emit.apply(_vm, [type].concat(args));
+      $xeGantt.$emit.apply($xeGantt, [type].concat(args));
     };
   });
   if (proxyConfig) {
@@ -11180,6 +11230,11 @@ function gantt_createInternalData() {
       if ($xeTable) {
         var _tableProps = $xeTable;
         var highlightCurrentRow = _tableProps.highlightCurrentRow;
+        var tableReactData = $xeTable;
+        var radioColumn = tableReactData.radioColumn,
+          checkboxColumn = tableReactData.checkboxColumn;
+        var radioOpts = $xeTable.computeRadioOpts;
+        var checkboxOpts = $xeTable.computeCheckboxOpts;
         var rowOpts = $xeTable.computeRowOpts;
         var row = params.row;
         // 如果是当前行
@@ -11190,6 +11245,14 @@ function gantt_createInternalData() {
             $rowIndex: $xeTable.getVMRowIndex(row)
           }, params));
         }
+        // 如果是单选框
+        if (radioColumn && radioOpts.trigger === 'row') {
+          $xeTable.triggerRadioRowEvent(evnt, params);
+        }
+        // 如果是复选框
+        if (checkboxColumn && checkboxOpts.trigger === 'row') {
+          $xeTable.handleToggleCheckRowEvent(evnt, params);
+        }
       }
       $xeGantt.dispatchEvent('task-cell-click', params, evnt);
     },
@@ -11582,7 +11645,9 @@ function gantt_createInternalData() {
               class: 'vxe-gantt--resizable-split-number-left'
             }, '10px'), h('div', {
               class: 'vxe-gantt--resizable-split-number-right'
-            }, '20px')])])]));
+            }, '20px')])]), h('div', {
+              class: 'vxe-gantt--border-line'
+            })]));
             break;
           case 'Bottom':
             childVNs.push($xeGantt.renderBottom(h));
@@ -11618,9 +11683,7 @@ function gantt_createInternalData() {
         class: 'vxe-gantt--layout-aside-right-wrapper'
       }, asideRightSlot({})) : gantt_renderEmptyElement($xeGantt)]), h('div', {
         class: 'vxe-gantt--layout-footer-wrapper'
-      }, $xeGantt.renderChildLayout(h, footKeys)), h('div', {
-        class: 'vxe-gantt--border-line'
-      })];
+      }, $xeGantt.renderChildLayout(h, footKeys))];
     },
     renderVN: function renderVN(h) {
       var $xeGantt = this;