vxe-gantt 3.0.0-beta.5 → 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.5");
+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.5";
+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: {
     //
@@ -8569,10 +8565,6 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
       default: null
     }
   },
-  props: {},
-  data: function data() {
-    return {};
-  },
   computed: _objectSpread2({}, {}),
   methods: {
     //
@@ -8762,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
 
 
@@ -8775,6 +8818,7 @@ var renderEmptyElement = core_.VxeUI.renderEmptyElement;
 
 
 
+
 var globalEvents = core_.VxeUI.globalEvents;
 function createInternalData() {
   return {
@@ -9015,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;
@@ -9030,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");
@@ -9038,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';
@@ -9059,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) {
@@ -9599,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;
@@ -9949,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) {
@@ -11273,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)) {
@@ -11282,6 +11338,9 @@ function gantt_createInternalData() {
             }
           });
         }
+        if (type === 'expand') {
+          errLog('vxe.error.errProp', ['type=expand', 'type=seq,radio,checkbox,html']);
+        }
       });
       return $xeTable.loadColumn(columns);
     },
@@ -11721,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) {