vxe-table 3.15.14 → 3.15.16

package/es/table/src/methods.js

@@ -1031,7 +1031,7 @@ function updateStyle($xeTable) {
                 if (tableElem) {
                     tableElem.style.width = tWidth ? `${tWidth}px` : '';
                     // 兼容性处理
-                    tableElem.style.paddingRight = osbWidth && fixedType && (browseObj['-moz'] || browseObj.safari) ? `${osbWidth}px` : '';
+                    tableElem.style.paddingRight = osbWidth && fixedType && (browseObj.firefox || browseObj.safari) ? `${osbWidth}px` : '';
                 }
                 const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
                 if (emptyBlockElem) {
@@ -2682,7 +2682,7 @@ function loadTableData($xeTable, datas, isReset) {
             //   }
             // }
             if (!(props.height || props.maxHeight)) {
-                errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+                errLog('vxe.error.reqProp', ['height | max-height | virtual-y-config={enabled: false}']);
             }
             // if (!props.showOverflow) {
             //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
@@ -3164,10 +3164,15 @@ const wheelScrollTopTo = (diffNum, cb) => {
     requestAnimationFrame(step);
 };
 function updateHeight($xeTable) {
+    const reactData = $xeTable;
     const internalData = $xeTable;
     internalData.customHeight = calcTableHeight($xeTable, 'height');
     internalData.customMinHeight = calcTableHeight($xeTable, 'minHeight');
     internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
+    // 如果启用虚拟滚动，默认高度
+    if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight)) {
+        internalData.customHeight = 300;
+    }
 }
 function calcColumnAutoWidth(column, wrapperEl) {
     const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
@@ -9265,7 +9270,7 @@ const Methods = {
         if (isRollX) {
             evnt.preventDefault();
             internalData.inWheelScroll = true;
-            if (browseObj['-moz'] || browseObj.safari) {
+            if (browseObj.firefox || browseObj.safari) {
                 const currLeftNum = scrollLeft;
                 setScrollLeft(xHandleEl, currLeftNum);
                 setScrollLeft(bodyScrollElem, currLeftNum);
@@ -9298,7 +9303,7 @@ const Methods = {
         }
         if (isRollY) {
             evnt.preventDefault();
-            if (browseObj['-moz'] || browseObj.safari) {
+            if (browseObj.firefox || browseObj.safari) {
                 const currTopNum = scrollTop;
                 setScrollTop(yHandleEl, currTopNum);
                 setScrollTop(bodyScrollElem, currTopNum);

package/es/table/src/table.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { getFuncText, isEnableConf } from '../../ui/src/utils';
 import { initTpImg } from '../../ui/src/dom';
-import { createHandleGetRowId } from './util';
+import { createHandleGetRowId, getCellHeight } from './util';
 import { VxeUI } from '../../ui';
 import methods from './methods';
 import TableBodyComponent from './body';
@@ -791,18 +791,16 @@ export default {
             const $xeTable = this;
             const props = $xeTable;
             const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig);
-            if (headerCellOpts.height) {
-                headerCellOpts.height = XEUtils.toNumber(headerCellOpts.height);
-            }
+            const cellOpts = $xeTable.computeCellOpts;
+            headerCellOpts.height = XEUtils.toNumber(getCellHeight(headerCellOpts.height || cellOpts.height));
             return headerCellOpts;
         },
         computeFooterCellOpts() {
             const $xeTable = this;
             const props = $xeTable;
             const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig);
-            if (footerCellOpts.height) {
-                footerCellOpts.height = XEUtils.toNumber(footerCellOpts.height);
-            }
+            const cellOpts = $xeTable.computeCellOpts;
+            footerCellOpts.height = XEUtils.toNumber(getCellHeight(footerCellOpts.height || cellOpts.height));
             return footerCellOpts;
         },
         rowOpts() {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.14";
+export const version = "3.15.16";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -201,16 +201,16 @@ VxeUI.setConfig({
             isReplace: true
         },
         virtualXConfig: {
-            enabled: true,
+            enabled: false,
             gt: 24,
             preSize: 0,
-            oSize: 1
+            oSize: 0
         },
         virtualYConfig: {
-            enabled: true,
+            enabled: false,
             gt: 100,
             preSize: 1,
-            oSize: 2
+            oSize: 0
         },
         scrollbarConfig: {
         // width: 14,

package/es/ui/src/dom.js

@@ -45,7 +45,7 @@ export function isScale(val) {
     return val && /^\d+%$/.test(val);
 }
 export function hasClass(elem, cls) {
-    return elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls));
+    return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
 }
 export function removeClass(elem, cls) {
     if (elem && hasClass(elem, cls)) {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.14"}`;
+const version = `table v${"3.15.16"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.14";
+const version = "3.15.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2421,16 +2421,16 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: true,
+      enabled: false,
       gt: 24,
       preSize: 0,
-      oSize: 1
+      oSize: 0
     },
     virtualYConfig: {
-      enabled: true,
+      enabled: false,
       gt: 100,
       preSize: 1,
-      oSize: 2
+      oSize: 0
     },
     scrollbarConfig: {
       // width: 14,
@@ -2718,7 +2718,7 @@ function isScale(val) {
   return val && /^\d+%$/.test(val);
 }
 function hasClass(elem, cls) {
-  return elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls));
+  return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
 }
 function removeClass(elem, cls) {
   if (elem && hasClass(elem, cls)) {
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.14"}`;
+const log_version = `table v${"3.15.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6568,7 +6568,7 @@ function updateStyle($xeTable) {
         if (tableElem) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
           // 兼容性处理
-          tableElem.style.paddingRight = osbWidth && fixedType && (browseObj['-moz'] || browseObj.safari) ? `${osbWidth}px` : '';
+          tableElem.style.paddingRight = osbWidth && fixedType && (browseObj.firefox || browseObj.safari) ? `${osbWidth}px` : '';
         }
         const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
         if (emptyBlockElem) {
@@ -8471,7 +8471,7 @@ function loadTableData($xeTable, datas, isReset) {
       //   }
       // }
       if (!(props.height || props.maxHeight)) {
-        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+        errLog('vxe.error.reqProp', ['height | max-height | virtual-y-config={enabled: false}']);
       }
       // if (!props.showOverflow) {
       //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
@@ -9015,10 +9015,15 @@ const wheelScrollTopTo = (diffNum, cb) => {
   requestAnimationFrame(step);
 };
 function updateHeight($xeTable) {
+  const reactData = $xeTable;
   const internalData = $xeTable;
   internalData.customHeight = calcTableHeight($xeTable, 'height');
   internalData.customMinHeight = calcTableHeight($xeTable, 'minHeight');
   internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
+  // 如果启用虚拟滚动，默认高度
+  if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight)) {
+    internalData.customHeight = 300;
+  }
 }
 function calcColumnAutoWidth(column, wrapperEl) {
   const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
@@ -16126,7 +16131,7 @@ const Methods = {
     if (isRollX) {
       evnt.preventDefault();
       internalData.inWheelScroll = true;
-      if (browseObj['-moz'] || browseObj.safari) {
+      if (browseObj.firefox || browseObj.safari) {
         const currLeftNum = scrollLeft;
         setScrollLeft(xHandleEl, currLeftNum);
         setScrollLeft(bodyScrollElem, currLeftNum);
@@ -16158,7 +16163,7 @@ const Methods = {
     }
     if (isRollY) {
       evnt.preventDefault();
-      if (browseObj['-moz'] || browseObj.safari) {
+      if (browseObj.firefox || browseObj.safari) {
         const currTopNum = scrollTop;
         setScrollTop(yHandleEl, currTopNum);
         setScrollTop(bodyScrollElem, currTopNum);
@@ -17989,7 +17994,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
-  const currCellHeight = getCellHeight(headerCellOpts.height || cellOpts.height) || defaultRowHeight;
+  const currCellHeight = getCellHeight(headerCellOpts.height) || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -18455,7 +18460,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const cellOpts = $xeTable.computeCellOpts;
   const footerCellOpts = $xeTable.computeFooterCellOpts;
-  const currCellHeight = getCellHeight(footerCellOpts.height || cellOpts.height) || defaultRowHeight;
+  const currCellHeight = getCellHeight(footerCellOpts.height) || defaultRowHeight;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,
@@ -27737,18 +27742,16 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       const props = $xeTable;
       const headerCellOpts = Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
-      if (headerCellOpts.height) {
-        headerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(headerCellOpts.height);
-      }
+      const cellOpts = $xeTable.computeCellOpts;
+      headerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(headerCellOpts.height || cellOpts.height));
       return headerCellOpts;
     },
     computeFooterCellOpts() {
       const $xeTable = this;
       const props = $xeTable;
       const footerCellOpts = Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
-      if (footerCellOpts.height) {
-        footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(footerCellOpts.height);
-      }
+      const cellOpts = $xeTable.computeCellOpts;
+      footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(footerCellOpts.height || cellOpts.height));
       return footerCellOpts;
     },
     rowOpts() {