vxe-table 3.19.9 → 3.19.11

package/es/table/src/cell.js

@@ -231,6 +231,7 @@ function getFooterContent(h, params) {
         itemValue = XEUtils.get(row, column.field);
     }
     const footParams = Object.assign(params, {
+        cellValue: itemValue,
         itemValue
     });
     if (footerFormatter) {

package/es/table/src/methods.js

@@ -3254,9 +3254,9 @@ function loadTableData($xeTable, datas, isReset) {
             // if (!props.showOverflow) {
             //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
             // }
-            if (props.spanMethod) {
-                errLog('vxe.error.scrollErrProp', ['table.span-method']);
-            }
+            // if (props.spanMethod) {
+            //   warnLog('vxe.error.scrollErrProp', ['span-method'])
+            // }
         }
         handleReserveStatus($xeTable);
         $xeTable.checkSelectionStatus();
@@ -4387,7 +4387,7 @@ const Methods = {
         const internalData = $xeTable;
         const { treeConfig } = props;
         const { isRowGroupStatus } = reactData;
-        const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps } = internalData;
+        const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps, rowExpandedMaps, selectCheckboxMaps } = internalData;
         const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const idMaps = {};
@@ -4408,6 +4408,13 @@ const Methods = {
             rowRest.level = level;
             rowRest.index = currIndex;
             rowRest.treeIndex = index;
+            // 更新缓存
+            if (selectCheckboxMaps[rowid]) {
+                selectCheckboxMaps[rowid] = row;
+            }
+            if (rowExpandedMaps[rowid]) {
+                rowExpandedMaps[rowid] = row;
+            }
             idMaps[rowid] = true;
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
@@ -11327,22 +11334,27 @@ const Methods = {
             }
             else {
                 const firstRow = afterFullData[startIndex];
-                let rowid = getRowid($xeTable, firstRow);
-                let rowRest = fullAllDataRowIdData[rowid] || {};
-                ySpaceTop = (rowRest.oTop || 0);
-                const lastRow = afterFullData[afterFullData.length - 1];
-                rowid = getRowid($xeTable, lastRow);
-                rowRest = fullAllDataRowIdData[rowid] || {};
-                // 如果为空时还没计算完数据，保持原高度不变
-                if (rowRest.oTop) {
-                    sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-                    // 是否展开行
-                    if (expandColumn && rowExpandedMaps[rowid]) {
-                        sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                if (firstRow) {
+                    let rowid = getRowid($xeTable, firstRow);
+                    let rowRest = fullAllDataRowIdData[rowid] || {};
+                    ySpaceTop = (rowRest.oTop || 0);
+                    const lastRow = afterFullData[afterFullData.length - 1];
+                    rowid = getRowid($xeTable, lastRow);
+                    rowRest = fullAllDataRowIdData[rowid] || {};
+                    // 如果为空时还没计算完数据，保持原高度不变
+                    if (rowRest.oTop) {
+                        sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                        // 是否展开行
+                        if (expandColumn && rowExpandedMaps[rowid]) {
+                            sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                        }
+                    }
+                    if (sYHeight > maxYHeight) {
+                        isScrollYBig = true;
                     }
                 }
-                if (sYHeight > maxYHeight) {
-                    isScrollYBig = true;
+                else {
+                    sYHeight = bodyTableElem ? bodyTableElem.clientHeight : 0;
                 }
             }
         }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.9";
+export const version = "3.19.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.9";
+const version = "3.19.11";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2713,7 +2713,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.9"}`;
+const log_version = `table v${"3.19.11"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4005,6 +4005,7 @@ function getFooterContent(h, params) {
     itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   }
   const footParams = Object.assign(params, {
+    cellValue: itemValue,
     itemValue
   });
   if (footerFormatter) {
@@ -9761,9 +9762,9 @@ function loadTableData($xeTable, datas, isReset) {
       // if (!props.showOverflow) {
       //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
       // }
-      if (props.spanMethod) {
-        errLog('vxe.error.scrollErrProp', ['table.span-method']);
-      }
+      // if (props.spanMethod) {
+      //   warnLog('vxe.error.scrollErrProp', ['span-method'])
+      // }
     }
     handleReserveStatus($xeTable);
     $xeTable.checkSelectionStatus();
@@ -11047,7 +11048,9 @@ const Methods = {
       tableFullData,
       tableFullTreeData,
       tableFullGroupData,
-      treeExpandedMaps
+      treeExpandedMaps,
+      rowExpandedMaps,
+      selectCheckboxMaps
     } = internalData;
     const fullAllDataRowIdMaps = isReset ? {} : {
       ...fullAllDataRowIdData
@@ -11089,6 +11092,13 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      // 更新缓存
+      if (selectCheckboxMaps[rowid]) {
+        selectCheckboxMaps[rowid] = row;
+      }
+      if (rowExpandedMaps[rowid]) {
+        rowExpandedMaps[rowid] = row;
+      }
       idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
@@ -19122,22 +19132,26 @@ const Methods = {
         ySpaceTop = Math.max(0, startIndex * defaultRowHeight);
       } else {
         const firstRow = afterFullData[startIndex];
-        let rowid = getRowid($xeTable, firstRow);
-        let rowRest = fullAllDataRowIdData[rowid] || {};
-        ySpaceTop = rowRest.oTop || 0;
-        const lastRow = afterFullData[afterFullData.length - 1];
-        rowid = getRowid($xeTable, lastRow);
-        rowRest = fullAllDataRowIdData[rowid] || {};
-        // 如果为空时还没计算完数据，保持原高度不变
-        if (rowRest.oTop) {
-          sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-          // 是否展开行
-          if (expandColumn && rowExpandedMaps[rowid]) {
-            sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+        if (firstRow) {
+          let rowid = getRowid($xeTable, firstRow);
+          let rowRest = fullAllDataRowIdData[rowid] || {};
+          ySpaceTop = rowRest.oTop || 0;
+          const lastRow = afterFullData[afterFullData.length - 1];
+          rowid = getRowid($xeTable, lastRow);
+          rowRest = fullAllDataRowIdData[rowid] || {};
+          // 如果为空时还没计算完数据，保持原高度不变
+          if (rowRest.oTop) {
+            sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+            // 是否展开行
+            if (expandColumn && rowExpandedMaps[rowid]) {
+              sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+            }
           }
-        }
-        if (sYHeight > maxYHeight) {
-          isScrollYBig = true;
+          if (sYHeight > maxYHeight) {
+            isScrollYBig = true;
+          }
+        } else {
+          sYHeight = bodyTableElem ? bodyTableElem.clientHeight : 0;
         }
       }
     } else {
@@ -27588,8 +27602,7 @@ function handleImport($xeTable, content, opts) {
       let loadRest;
       if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
         loadRest = $xeTable.insertAt(data, -1);
-      }
-      if (opts.mode === 'insertTop') {
+      } else if (opts.mode === 'insertTop') {
         loadRest = $xeTable.insert(data);
       } else {
         loadRest = $xeTable.reloadData(data);