vxe-table 3.15.15 → 3.15.17

package/es/table/src/methods.js

@@ -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}"]`);
@@ -4365,16 +4370,10 @@ const Methods = {
                 }
             }
             else {
+                const currMaps = isFull || (treeConfig && !transform) ? fullDataRowIdData : afterFullRowMaps;
                 XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-                    if (isFull) {
-                        if (fullDataRowIdData[rowid]) {
-                            rowList.push(fullDataRowIdData[rowid].row);
-                        }
-                    }
-                    else {
-                        if (afterFullRowMaps[rowid]) {
-                            rowList.push(afterFullRowMaps[rowid]);
-                        }
+                    if (currMaps[rowid]) {
+                        rowList.push(fullDataRowIdData[rowid].row);
                     }
                 });
             }

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.15";
+export const version = "3.15.17";
 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/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.15.15"}`;
+const version = `table v${"3.15.17"}`;
 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.15";
+const version = "3.15.17";
 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,
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.15"}`;
+const log_version = `table v${"3.15.17"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -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}"]`);
@@ -10405,15 +10410,10 @@ const Methods = {
           rowList = currTableData.filter(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
         }
       } else {
+        const currMaps = isFull || treeConfig && !transform ? fullDataRowIdData : afterFullRowMaps;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
-          if (isFull) {
-            if (fullDataRowIdData[rowid]) {
-              rowList.push(fullDataRowIdData[rowid].row);
-            }
-          } else {
-            if (afterFullRowMaps[rowid]) {
-              rowList.push(afterFullRowMaps[rowid]);
-            }
+          if (currMaps[rowid]) {
+            rowList.push(fullDataRowIdData[rowid].row);
           }
         });
       }