vxe-table 3.10.0-beta.4 → 3.10.0-beta.6

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.4";
+const version = "3.10.0-beta.6";
 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.4"}`;
+const log_version = `table v${"3.10.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -12278,6 +12278,14 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       }, errorValidItem.content)]));
     }
   }
+  let cellHeight = '';
+  if (hasEllipsis && (scrollYRHeight || rowHeight)) {
+    cellHeight = `${scrollYRHeight || rowHeight}px`;
+  } else if (scrollYLoad) {
+    if (!hasEllipsis) {
+      cellHeight = `${rest.height || 24}px`;
+    }
+  }
   return h('td', {
     class: ['vxe-body--column', column.id, {
       [`col--${cellAlign}`]: cellAlign,
@@ -12296,7 +12304,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 || 24}px` : ''
+      height: cellHeight
     }, 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);
@@ -15133,7 +15141,6 @@ const {
   },
   render(h) {
     const $xeTable = this.$xeTable;
-    const importOpts = $xeTable.importOpts;
     const {
       hasFile,
       parseTypeLabel,
@@ -15141,7 +15148,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;
@@ -15175,8 +15182,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'
@@ -15228,8 +15235,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'
@@ -15385,7 +15392,6 @@ const {
   },
   render(h) {
     const $xeTable = this.$xeTable;
-    const exportOpts = $xeTable.exportOpts;
     const {
       _e,
       checkedAll,
@@ -15407,7 +15413,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;
@@ -15479,9 +15485,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'
@@ -15659,9 +15665,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'