vxe-table 4.3.6 → 4.3.8

package/es/grid/src/grid.js

@@ -87,7 +87,9 @@ export default defineComponent({
                         args[_i] = arguments[_i];
                     }
                     var $xetable = refTable.value;
-                    return $xetable && $xetable[name].apply($xetable, args);
+                    if ($xetable && $xetable[name]) {
+                        return $xetable[name].apply($xetable, args);
+                    }
                 };
             });
             return funcs;
@@ -100,7 +102,9 @@ export default defineComponent({
                     args[_i] = arguments[_i];
                 }
                 var $xetable = refTable.value;
-                return $xetable && $xetable[name].apply($xetable, args);
+                if ($xetable && $xetable[name]) {
+                    return $xetable && $xetable[name].apply($xetable, args);
+                }
             };
         });
         var computeProxyOpts = computed(function () {
@@ -510,6 +514,7 @@ export default defineComponent({
             var proxyOpts = computeProxyOpts.value;
             var tableOns = Object.assign({}, tableCompEvents);
             var emptySlot = slots.empty;
+            var loadingSlot = slots.loading;
             if (proxyConfig) {
                 if (proxyOpts.sort) {
                     tableOns.onSortChange = sortChangeEvent;
@@ -518,10 +523,15 @@ export default defineComponent({
                     tableOns.onFilterChange = filterChangeEvent;
                 }
             }
+            var slotObj = {};
+            if (emptySlot) {
+                slotObj.empty = function () { return emptySlot({}); };
+            }
+            if (loadingSlot) {
+                slotObj.loading = function () { return loadingSlot({}); };
+            }
             return [
-                h(resolveComponent('vxe-table'), __assign(__assign({ ref: refTable }, tableProps), tableOns), emptySlot ? {
-                    empty: function () { return emptySlot({}); }
-                } : {})
+                h(resolveComponent('vxe-table'), __assign(__assign({ ref: refTable }, tableProps), tableOns), slotObj)
             ];
         };
         /**

package/es/header/src/header.js

@@ -12,7 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import { createCommentVNode, defineComponent, h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { convertToRows } from './util';
-import { getColMinWidth } from '../../table/src/util';
+import { getColReMinWidth } from '../../table/src/util';
 import { hasClass, getOffsetPos, addClass, removeClass } from '../../tools/dom';
 var renderType = 'header';
 export default defineComponent({
@@ -56,7 +56,7 @@ export default defineComponent({
             var pos = getOffsetPos(dragBtnElem, wrapperElem);
             var dragBtnWidth = dragBtnElem.clientWidth;
             var dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-            var minInterval = getColMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
+            var minInterval = getColReMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
             var dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
             var dragPosLeft = pos.left + dragBtnOffsetWidth;
             var domMousemove = document.onmousemove;