vxe-table 3.8.12 → 3.8.13

package/lib/index.umd.js

@@ -11512,7 +11512,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.12", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.13", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13207,7 +13207,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.12";
+var version = "3.8.13";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -19049,7 +19049,7 @@ var Methods = {
       var el = _this26.$el;
       if (el) {
         autoWidthColumnList.forEach(function (column) {
-          var cellElList = el.querySelectorAll(".vxe-body--column.".concat(column.id, ">.vxe-cell"));
+          var cellElList = el.querySelectorAll(".vxe-header--column.".concat(column.id, ">.vxe-cell,.vxe-body--column.").concat(column.id, ">.vxe-cell,.vxe-footer--column.").concat(column.id, ">.vxe-cell"));
           var firstCellEl = cellElList[0];
           var paddingSize = 0;
           if (firstCellEl) {
@@ -19184,19 +19184,23 @@ var Methods = {
     } else {
       this.headerHeight = 0;
     }
+    var overflowX = false;
+    var footerHeight = 0;
+    var scrollbarHeight = 0;
     if (footerElem) {
-      var footerHeight = footerElem.offsetHeight;
-      this.scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0);
-      this.overflowX = tableWidth > footerElem.clientWidth;
-      this.footerHeight = footerHeight;
+      footerHeight = footerElem.offsetHeight;
+      overflowX = tableWidth > footerElem.clientWidth;
+      scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0);
     } else {
-      this.footerHeight = 0;
-      this.scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0);
-      this.overflowX = tableWidth > bodyWidth;
+      overflowX = tableWidth > bodyWidth;
+      scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0);
     }
+    this.footerHeight = footerHeight;
+    this.overflowX = tableWidth > bodyWidth;
+    this.scrollbarHeight = scrollbarHeight;
     this.updateHeight();
     this.parentHeight = Math.max(this.headerHeight + this.footerHeight + 20, this.getParentHeight());
-    if (this.overflowX) {
+    if (overflowX) {
       this.checkScrolling();
     }
   },
@@ -24544,7 +24548,7 @@ var Table = VxeTable;
       var filterRender = column.filterRender;
       var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
       var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-      return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [h('div', {
+      return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
         class: 'vxe-table--filter-footer'
       }, [h('button', {
         class: {
@@ -24732,29 +24736,34 @@ var Table = VxeTable;
         this.initStore.filter = true;
         this.$nextTick(function () {
           var $refs = _this.$refs;
-          var bodyElem = $refs.tableBody.$el;
-          var filterWrapperElem = $refs.filterWrapper.$el;
-          var filterWidth = 0;
-          var filterHeight = 0;
-          var filterHeadElem = null;
-          var filterFootElem = null;
-          if (filterWrapperElem) {
-            filterWidth = filterWrapperElem.offsetWidth;
-            filterHeight = filterWrapperElem.offsetHeight;
-            filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
-            filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
+          var tableHeader = $refs.tableHeader,
+            tableBody = $refs.tableBody,
+            filterWrapper = $refs.filterWrapper;
+          var bodyElem = tableBody.$el;
+          var headerElem = tableHeader ? tableHeader.$el : null;
+          if (!bodyElem) {
+            return;
+          }
+          var filterWrapperElem = filterWrapper.$el;
+          if (!filterWrapperElem) {
+            return;
           }
+          var filterWidth = filterWrapperElem.offsetWidth;
+          var filterHeight = filterWrapperElem.offsetHeight;
+          var filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
+          var filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
           var centerWidth = filterWidth / 2;
           var minMargin = 10;
           var maxLeft = bodyElem.clientWidth - filterWidth - minMargin;
           var left, right;
           var style = {
-            top: "".concat(targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight + 8, "px")
+            top: "".concat(targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight, "px")
           };
           // 判断面板不能大于表格高度
           var maxHeight = null;
-          if (filterHeight >= bodyElem.clientHeight) {
-            maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
+          var bodyHeight = bodyElem.clientHeight - (headerElem ? headerElem.clientHeight / 2 : 0);
+          if (filterHeight >= bodyHeight) {
+            maxHeight = Math.max(40, bodyHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
           }
           if (column.fixed === 'left') {
             left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth;
@@ -26627,12 +26636,12 @@ var msgQueue = [];
   },
   data: function data() {
     return {
-      inited: false,
+      initialized: false,
       visible: false,
       contentVisible: false,
       modalTop: 0,
       modalZindex: 0,
-      zoomLocat: null,
+      revertLocat: null,
       firstOpen: true
     };
   },
@@ -26698,7 +26707,7 @@ var msgQueue = [];
       $scopedSlots = this.$scopedSlots,
       _this$slots = this.slots,
       slots = _this$slots === void 0 ? {} : _this$slots,
-      inited = this.inited,
+      initialized = this.initialized,
       vSize = this.vSize,
       className = this.className,
       type = this.type,
@@ -26711,7 +26720,7 @@ var msgQueue = [];
       status = this.status,
       iconStatus = this.iconStatus,
       showFooter = this.showFooter,
-      zoomLocat = this.zoomLocat,
+      revertLocat = this.revertLocat,
       modalTop = this.modalTop,
       dblclickZoom = this.dblclickZoom,
       contentVisible = this.contentVisible,
@@ -26739,7 +26748,7 @@ var msgQueue = [];
       headerOns.dblclick = this.toggleZoomEvent;
     }
     return h('div', {
-      class: ['vxe-modal--wrapper', "type--".concat(type), className || '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--resize', resize), 'is--mask', mask), 'is--maximize', zoomLocat), 'is--visible', contentVisible), 'is--active', visible), _defineProperty(_ref, 'is--loading', loading))],
+      class: ['vxe-modal--wrapper', "type--".concat(type), className || '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), "status--".concat(status), status), 'is--animat', animat), 'lock--scroll', lockScroll), 'lock--view', lockView), 'is--resize', resize), 'is--mask', mask), 'is--maximize', revertLocat), 'is--visible', contentVisible), 'is--active', visible), _defineProperty(_ref, 'is--loading', loading))],
       style: {
         zIndex: this.modalZindex,
         top: modalTop ? "".concat(modalTop, "px") : null
@@ -26759,7 +26768,7 @@ var msgQueue = [];
         'is--ellipsis': !isMsg && showTitleOverflow
       }],
       on: headerOns
-    }, headerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(headerSlot.call(this, {
+    }, headerSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(headerSlot.call(this, {
       $modal: this
     }, h)) : [h('div', {
       class: 'vxe-modal--header-title'
@@ -26772,9 +26781,9 @@ var msgQueue = [];
     }, getSlotVNs(cornerSlot({
       $modal: this
     }))) : _e(), showZoom ? h('i', {
-      class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? conf.icon.MODAL_ZOOM_OUT : conf.icon.MODAL_ZOOM_IN],
+      class: ['vxe-modal--zoom-btn', 'trigger--btn', revertLocat ? conf.icon.MODAL_ZOOM_OUT : conf.icon.MODAL_ZOOM_IN],
       attrs: {
-        title: conf.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In'))
+        title: conf.i18n("vxe.modal.zoom".concat(revertLocat ? 'Out' : 'In'))
       },
       on: {
         click: this.toggleZoomEvent
@@ -26795,7 +26804,7 @@ var msgQueue = [];
       class: ['vxe-modal--status-icon', iconStatus || conf.icon["MODAL_".concat(status).toLocaleUpperCase()]]
     })]) : null, h('div', {
       class: 'vxe-modal--content'
-    }, defaultSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(defaultSlot.call(this, {
+    }, defaultSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(defaultSlot.call(this, {
       $modal: this
     }, h)) : getFuncText(content)),
     /**
@@ -26808,7 +26817,7 @@ var msgQueue = [];
       }
     }) : null]), showFooter ? h('div', {
       class: 'vxe-modal--footer'
-    }, footerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(footerSlot.call(this, {
+    }, footerSlot ? !initialized || destroyOnClose && !visible ? [] : getSlotVNs(footerSlot.call(this, {
       $modal: this
     }, h)) : [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCancelButton) ? showCancelButton : type === 'confirm' ? h('vxe-button', {
       key: 1,
@@ -26916,14 +26925,14 @@ var msgQueue = [];
       var $refs = this.$refs,
         _this$events5 = this.events,
         events = _this$events5 === void 0 ? {} : _this$events5,
-        inited = this.inited,
+        initialized = this.initialized,
         duration = this.duration,
         visible = this.visible,
         isMsg = this.isMsg,
         remember = this.remember,
         showFooter = this.showFooter;
-      if (!inited) {
-        this.inited = true;
+      if (!initialized) {
+        this.initialized = true;
         if (this.transfer) {
           document.body.appendChild(this.$el);
         }
@@ -27074,7 +27083,7 @@ var msgQueue = [];
             }
             _this5.contentVisible = false;
             if (!remember) {
-              _this5.zoomLocat = null;
+              _this5.revertLocat = null;
             }
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(allActivedModals, function (item) {
               return item === _this5;
@@ -27116,18 +27125,18 @@ var msgQueue = [];
       return this.$refs.modalBox;
     },
     isMaximized: function isMaximized() {
-      return !!this.zoomLocat;
+      return !!this.revertLocat;
     },
     maximize: function maximize() {
       var _this7 = this;
       return this.$nextTick().then(function () {
-        if (!_this7.zoomLocat) {
+        if (!_this7.revertLocat) {
           var marginSize = Math.max(0, _this7.marginSize);
           var modalBoxElem = _this7.getBox();
           var _DomTools$getDomNode = dom.getDomNode(),
             visibleHeight = _DomTools$getDomNode.visibleHeight,
             visibleWidth = _DomTools$getDomNode.visibleWidth;
-          _this7.zoomLocat = {
+          _this7.revertLocat = {
             top: modalBoxElem.offsetTop,
             left: modalBoxElem.offsetLeft,
             width: modalBoxElem.offsetWidth + (modalBoxElem.style.width ? 0 : 1),
@@ -27146,15 +27155,15 @@ var msgQueue = [];
     revert: function revert() {
       var _this8 = this;
       return this.$nextTick().then(function () {
-        var zoomLocat = _this8.zoomLocat;
-        if (zoomLocat) {
+        var revertLocat = _this8.revertLocat;
+        if (revertLocat) {
           var modalBoxElem = _this8.getBox();
-          _this8.zoomLocat = null;
+          _this8.revertLocat = null;
           Object.assign(modalBoxElem.style, {
-            top: "".concat(zoomLocat.top, "px"),
-            left: "".concat(zoomLocat.left, "px"),
-            width: "".concat(zoomLocat.width, "px"),
-            height: "".concat(zoomLocat.height, "px")
+            top: "".concat(revertLocat.top, "px"),
+            left: "".concat(revertLocat.left, "px"),
+            width: "".concat(revertLocat.width, "px"),
+            height: "".concat(revertLocat.height, "px")
           });
           _this8.savePosStorage();
         }
@@ -27162,18 +27171,18 @@ var msgQueue = [];
     },
     zoom: function zoom() {
       var _this9 = this;
-      return this[this.zoomLocat ? 'revert' : 'maximize']().then(function () {
+      return this[this.revertLocat ? 'revert' : 'maximize']().then(function () {
         return _this9.isMaximized();
       });
     },
     toggleZoomEvent: function toggleZoomEvent(evnt) {
       var _this10 = this;
       var $listeners = this.$listeners,
-        zoomLocat = this.zoomLocat,
+        revertLocat = this.revertLocat,
         _this$events7 = this.events,
         events = _this$events7 === void 0 ? {} : _this$events7;
       var params = {
-        type: zoomLocat ? 'revert' : 'max',
+        type: revertLocat ? 'revert' : 'max',
         $modal: this,
         $event: evnt
       };
@@ -27222,9 +27231,9 @@ var msgQueue = [];
       var remember = this.remember,
         storage = this.storage,
         marginSize = this.marginSize,
-        zoomLocat = this.zoomLocat;
+        revertLocat = this.revertLocat;
       var modalBoxElem = this.getBox();
-      if (!zoomLocat && evnt.button === 0 && !dom.getEventTargetNode(evnt, modalBoxElem, 'trigger--btn').flag) {
+      if (!revertLocat && evnt.button === 0 && !dom.getEventTargetNode(evnt, modalBoxElem, 'trigger--btn').flag) {
         evnt.preventDefault();
         var domMousemove = document.onmousemove;
         var domMouseup = document.onmouseup;
@@ -27432,7 +27441,7 @@ var msgQueue = [];
         }
       };
       document.onmouseup = function () {
-        _this12.zoomLocat = null;
+        _this12.revertLocat = null;
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
         setTimeout(function () {
@@ -27486,7 +27495,7 @@ var msgQueue = [];
             modalBoxElem.style.height = "".concat(height, "px");
           }
           if (zoomLeft && zoomTop) {
-            this.zoomLocat = {
+            this.revertLocat = {
               left: zoomLeft,
               top: zoomTop,
               width: zoomWidth,
@@ -27501,11 +27510,11 @@ var msgQueue = [];
         remember = this.remember,
         storage = this.storage,
         storageKey = this.storageKey,
-        zoomLocat = this.zoomLocat;
+        revertLocat = this.revertLocat;
       if (remember && storage) {
         var modalBoxElem = this.getBox();
         var posStorageMap = this.getStorageMap(storageKey);
-        posStorageMap[id] = [modalBoxElem.style.left, modalBoxElem.style.top, modalBoxElem.style.width, modalBoxElem.style.height].concat(zoomLocat ? [zoomLocat.left, zoomLocat.top, zoomLocat.width, zoomLocat.height] : []).map(function (val) {
+        posStorageMap[id] = [modalBoxElem.style.left, modalBoxElem.style.top, modalBoxElem.style.width, modalBoxElem.style.height].concat(revertLocat ? [revertLocat.left, revertLocat.top, revertLocat.width, revertLocat.height] : []).map(function (val) {
           return val ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(val) : '';
         }).join(',');
         localStorage.setItem(storageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(posStorageMap));