vxe-gantt 3.0.0-beta.4 → 3.0.0

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.4");
+var version = "gantt v".concat("3.0.0");
 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.4";
+core_.VxeUI.ganttVersion = "3.0.0";
 setConfig({
   gantt: {
     // size: null,
@@ -8295,7 +8295,7 @@ function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
 
 
 /* harmony default export */ var gantt_header = (defineVxeComponent({
-  name: 'VxeGanttView',
+  name: 'VxeGanttViewHeader',
   inject: {
     $xeGantt: {
       default: null
@@ -8304,10 +8304,6 @@ function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
       default: null
     }
   },
-  props: {},
-  data: function data() {
-    return {};
-  },
   computed: _objectSpread2({}, {}),
   methods: {
     //
@@ -8420,6 +8416,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 +8433,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 +8450,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")
@@ -8564,10 +8565,6 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       default: null
     }
   },
-  props: {},
-  data: function data() {
-    return {};
-  },
   computed: _objectSpread2({}, {}),
   methods: {
     //
@@ -8576,16 +8573,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 +8615,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 +8644,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 +8664,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
@@ -8736,6 +8754,57 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
     return this.renderVN(h);
   }
 }));
+;// CONCATENATED MODULE: ./packages/gantt/src/gantt-footer.ts
+
+
+/* harmony default export */ var gantt_footer = (defineVxeComponent({
+  name: 'VxeGanttViewHeader',
+  inject: {
+    $xeGantt: {
+      default: null
+    },
+    $xeGanttView: {
+      default: null
+    }
+  },
+  props: {},
+  computed: _objectSpread2({}, {}),
+  methods: {
+    //
+    // Render
+    //
+    renderVN: function renderVN(h) {
+      return h('div', {
+        ref: 'refElem',
+        class: 'vxe-gantt-view--footer-wrapper'
+      }, [h('div', {
+        ref: 'refHeaderScroll',
+        class: 'vxe-gantt-view--footer-inner-wrapper'
+      }, [])]);
+    }
+  },
+  mounted: function mounted() {
+    var _vm = this;
+    var $xeGanttView = _vm.$xeGanttView;
+    var internalData = $xeGanttView.internalData;
+    var elemStore = internalData.elemStore;
+    var prefix = 'main-footer-';
+    elemStore["".concat(prefix, "wrapper")] = _vm.$refs.refElem;
+    elemStore["".concat(prefix, "scroll")] = _vm.$refs.refHeaderScroll;
+  },
+  destroyed: function destroyed() {
+    var _vm = this;
+    var $xeGanttView = _vm.$xeGanttView;
+    var internalData = $xeGanttView.internalData;
+    var elemStore = internalData.elemStore;
+    var prefix = 'main-headefooterr-';
+    elemStore["".concat(prefix, "wrapper")] = null;
+    elemStore["".concat(prefix, "scroll")] = null;
+  },
+  render: function render(h) {
+    return this.renderVN(h);
+  }
+}));
 ;// CONCATENATED MODULE: ./packages/gantt/src/gantt-view.ts
 
 
@@ -8749,6 +8818,7 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
 
 
 
+
 var globalEvents = core_.VxeUI.globalEvents;
 function createInternalData() {
   return {
@@ -8989,7 +9059,9 @@ function updateStyle($xeGanttView) {
   if (!el || !el.clientHeight) {
     return;
   }
+  var scrollbarOpts = $xeGantt.computeScrollbarOpts;
   var scrollbarXToTop = $xeGantt.computeScrollbarXToTop;
+  var scrollbarYToLeft = $xeGantt.computeScrollbarYToLeft;
   var xLeftCornerEl = $xeGanttView.$refs.refScrollXLeftCornerElem;
   var xRightCornerEl = $xeGanttView.$refs.refScrollXRightCornerElem;
   var scrollXVirtualEl = $xeGanttView.$refs.refScrollXVirtualElem;
@@ -9004,6 +9076,11 @@ function updateStyle($xeGanttView) {
     tHeaderHeight = tableInternalData.tHeaderHeight;
     tFooterHeight = tableInternalData.tFooterHeight;
   }
+  var yScrollbarVisible = 'visible';
+  if (scrollbarYToLeft && scrollbarOpts.y && scrollbarOpts.y.visible === false) {
+    osbWidth = 0;
+    yScrollbarVisible = 'hidden';
+  }
   var headerScrollElem = getRefElem(elemStore['main-header-scroll']);
   if (headerScrollElem) {
     headerScrollElem.style.height = "".concat(tHeaderHeight, "px");
@@ -9012,6 +9089,10 @@ function updateStyle($xeGanttView) {
   if (bodyScrollElem) {
     bodyScrollElem.style.height = "".concat(tbHeight, "px");
   }
+  var footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
+  if (footerScrollElem) {
+    footerScrollElem.style.height = "".concat(tFooterHeight, "px");
+  }
   if (scrollXVirtualEl) {
     scrollXVirtualEl.style.height = "".concat(osbHeight, "px");
     scrollXVirtualEl.style.visibility = 'visible';
@@ -9033,7 +9114,7 @@ function updateStyle($xeGanttView) {
   if (scrollYVirtualEl) {
     scrollYVirtualEl.style.width = "".concat(osbWidth, "px");
     scrollYVirtualEl.style.height = "".concat(tbHeight + tHeaderHeight + tFooterHeight, "px");
-    scrollYVirtualEl.style.visibility = 'visible';
+    scrollYVirtualEl.style.visibility = yScrollbarVisible;
   }
   var yTopCornerEl = $xeGanttView.$refs.refScrollYTopCornerElem;
   if (yTopCornerEl) {
@@ -9128,7 +9209,7 @@ function _handleLazyRecalculate($xeGanttView) {
 //     updateStyle($xeGanttView)
 //   })
 // }
-function _updateScrollYSpace($xeGanttView) {
+function updateScrollYSpace($xeGanttView) {
   var reactData = $xeGanttView.reactData;
   var internalData = $xeGanttView.internalData;
   var scrollYLoad = reactData.scrollYLoad,
@@ -9482,11 +9563,32 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
         handleScrollEvent($xeGanttView, evnt, isRollY, isRollX, currTopNum, wrapperEl.scrollLeft);
       }
     },
-    updateScrollYSpace: function updateScrollYSpace() {
+    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 _updateScrollYSpace($xeGanttView);
+      return updateScrollYSpace($xeGanttView);
     },
-    updateScrollYStatus: function updateScrollYStatus(sYLoad) {
+    handleUpdateSYStatus: function handleUpdateSYStatus(sYLoad) {
       var $xeGanttView = this;
       var reactData = $xeGanttView.reactData;
       reactData.scrollYLoad = sYLoad;
@@ -9552,7 +9654,7 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
     renderViewport: function renderViewport(h) {
       return h('div', {
         class: 'vxe-gantt-view--viewport-wrapper'
-      }, [h(gantt_header), h(gantt_body)]);
+      }, [h(gantt_header), h(gantt_body), h(gantt_footer)]);
     },
     renderBody: function renderBody(h) {
       var $xeGanttView = this;
@@ -9902,10 +10004,10 @@ function gantt_createInternalData() {
       var pagerOpts = $xeGantt.computePagerOpts;
       var isLoading = $xeGantt.computeIsLoading;
       var tProps = Object.assign({}, tableExtendProps, {
+        // 不支持修改的属性
         showOverflow: true,
         showHeaderOverflow: true,
-        showFooterOverflow: true,
-        showFooter: false
+        showFooterOverflow: true
       });
       if (isZMax) {
         if (tableExtendProps.maxHeight) {
@@ -11183,6 +11285,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;
         // 如果是当前行
@@ -11193,6 +11300,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);
     },
@@ -11213,6 +11328,7 @@ function gantt_createInternalData() {
       var slots = $xeGantt.$scopedSlots;
       var $xeTable = $xeGantt.$refs.refTable;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, function (column) {
+        var type = column.type;
         if (column.slots) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(column.slots, function (func) {
             if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(func)) {
@@ -11222,6 +11338,9 @@ function gantt_createInternalData() {
             }
           });
         }
+        if (type === 'expand') {
+          errLog('vxe.error.errProp', ['type=expand', 'type=seq,radio,checkbox,html']);
+        }
       });
       return $xeTable.loadColumn(columns);
     },
@@ -11585,7 +11704,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));
@@ -11621,9 +11742,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;
@@ -11661,6 +11780,12 @@ function gantt_createInternalData() {
     if (proxyOpts.props) {
       warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']);
     }
+    if (props.expandConfig) {
+      warnLog('vxe.error.notProp', ['expand-config']);
+    }
+    if (props.aggregateConfig) {
+      warnLog('vxe.error.notProp', ['aggregate-config']);
+    }
     $xeGantt.$nextTick(function () {
       if (props.formConfig) {
         if (!VxeUIFormComponent) {