vxe-table 3.10.0-beta.3 → 3.10.0-beta.5

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.0-beta.3";
+const version = "3.10.0-beta.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.0-beta.3"}`;
+const log_version = `table v${"3.10.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11370,7 +11370,12 @@ const Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad() {
+    const $xeTable = this;
+    const props = $xeTable;
     return this.$nextTick().then(() => {
+      const {
+        showOverflow
+      } = props;
       const {
         sYOpts,
         sXOpts,
@@ -11384,7 +11389,9 @@ const Methods = {
         const {
           visibleSize: visibleXSize
         } = handleVirtualXVisible(this);
-        const offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
+        // 动态列缓冲量
+        const bufferSize = showOverflow ? 0 : 2;
+        const offsetXSize = Math.max(bufferSize, sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0);
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
@@ -11401,7 +11408,9 @@ const Methods = {
         visibleSize: visibleYSize
       } = handleVirtualYVisible(this);
       if (scrollYLoad) {
-        const offsetYSize = sYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sYOpts.oSize) : browse.msie ? 20 : browse.edge ? 10 : 0;
+        // 动态高缓冲量
+        const bufferSize = showOverflow ? 0 : 2;
+        const offsetYSize = Math.max(bufferSize, sYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sYOpts.oSize) : browse.edge ? 10 : 0);
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
@@ -12287,7 +12296,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || scrollYRHeight || rowHeight}px` : ''
+      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || 24}px` : ''
     }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs);
@@ -15124,7 +15133,6 @@ const {
   },
   render(h) {
     const $xeTable = this.$xeTable;
-    const importOpts = $xeTable.importOpts;
     const {
       hasFile,
       parseTypeLabel,
@@ -15132,7 +15140,7 @@ const {
       storeData,
       selectName
     } = this;
-    const slots = importOpts.slots || {};
+    const slots = defaultOptions.slots || {};
     const topSlot = slots.top;
     const bottomSlot = slots.bottom;
     const defaultSlot = slots.default;
@@ -15166,8 +15174,8 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: importOpts,
-            params: importOpts.params
+            options: defaultOptions,
+            params: defaultOptions.params
           };
           return h('div', {
             class: 'vxe-table-export--panel'
@@ -15219,8 +15227,8 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: importOpts,
-            params: importOpts.params
+            options: defaultOptions,
+            params: defaultOptions.params
           };
           return h('div', {
             class: 'vxe-table-export--panel-footer'
@@ -15376,7 +15384,6 @@ const {
   },
   render(h) {
     const $xeTable = this.$xeTable;
-    const exportOpts = $xeTable.exportOpts;
     const {
       _e,
       checkedAll,
@@ -15398,7 +15405,7 @@ const {
     const {
       isHeader
     } = defaultOptions;
-    const slots = exportOpts.slots || {};
+    const slots = defaultOptions.slots || {};
     const topSlot = slots.top;
     const bottomSlot = slots.bottom;
     const defaultSlot = slots.default;
@@ -15470,9 +15477,9 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: exportOpts,
+            options: defaultOptions,
             columns,
-            params: exportOpts.params
+            params: defaultOptions.params
           };
           return h('div', {
             class: 'vxe-table-export--panel'
@@ -15650,9 +15657,9 @@ const {
           const params = {
             $table: $xeTable,
             $grid: $xeTable.xegrid,
-            options: exportOpts,
+            options: defaultOptions,
             columns,
-            params: exportOpts.params
+            params: defaultOptions.params
           };
           return h('div', {
             class: 'vxe-table-export--panel-footer'