vxe-table 3.15.31 → 3.15.33

package/es/table/module/validator/mixin.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { getFuncText } from '../../../ui/src/utils';
+import { eqEmptyValue, getFuncText } from '../../../ui/src/utils';
 import { scrollToView } from '../../../ui/src/dom';
 import { handleFieldOrColumn, getRowid } from '../../src/util';
 import { warnLog, errLog } from '../../../ui/src/log';
@@ -119,7 +119,7 @@ function validRuleValue(rule, val, required) {
 }
 function checkRuleStatus(rule, val) {
     const { required } = rule;
-    const isEmptyVal = XEUtils.eqNull(val);
+    const isEmptyVal = XEUtils.isArray(val) ? !val.length : eqEmptyValue(val);
     if (required) {
         if (isEmptyVal) {
             return false;

package/es/table/src/cell.js

@@ -247,13 +247,17 @@ function getDefaultCellLabel(params) {
     return formatText($table.getCellLabel(row, column), 1);
 }
 function renderCellHandle(h, params) {
-    const { column, $table } = params;
+    const { column, row, $table } = params;
     const tableProps = $table;
+    const tableReactData = $table;
     const { editConfig } = tableProps;
+    const { isRowGroupStatus } = tableReactData;
     const { type, treeNode, rowGroupNode, editRender } = column;
+    const rowGroupOpts = $table.computeRowGroupOpts;
+    const { mode } = rowGroupOpts;
     const checkboxOpts = $table.computeCheckboxOpts;
     const editOpts = $table.computeEditOpts;
-    const isDeepCell = treeNode || rowGroupNode;
+    const isDeepCell = treeNode || (isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode));
     switch (type) {
         case 'seq':
             return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params);
@@ -352,7 +356,7 @@ export const Cell = {
         const tableReactData = $table;
         const tableInternalData = $table;
         const { isRowGroupStatus } = tableReactData;
-        const { slots, editRender, cellRender, rowGroupNode } = column;
+        const { field, slots, editRender, cellRender, rowGroupNode } = column;
         const renderOpts = editRender || cellRender;
         if (slots && slots.default) {
             return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
@@ -367,29 +371,37 @@ export const Cell = {
             }
         }
         let cellValue = '';
-        if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+        if (isRowGroupStatus && row.isAggregate) {
             const { fullColumnFieldData } = tableInternalData;
             const rowGroupOpts = $table.computeRowGroupOpts;
-            const { showTotal, totalMethod, contentMethod, mapChildrenField } = rowGroupOpts;
+            const { mode, showTotal, totalMethod, countFields, countMethod, contentMethod, mapChildrenField } = rowGroupOpts;
             const groupField = row.groupField;
-            cellValue = row.groupContent;
+            const groupContent = row.groupContent;
             const childList = mapChildrenField ? (row[mapChildrenField] || []) : [];
-            const totalValue = childList.length;
+            const totalValue = row.childCount;
             const colRest = fullColumnFieldData[groupField] || {};
             const params = {
                 $table,
                 groupField,
                 groupColumn: (colRest ? colRest.column : null),
                 column,
-                groupValue: cellValue,
+                groupValue: groupContent,
                 children: childList,
                 totalValue: totalValue
             };
-            if (contentMethod) {
-                cellValue = `${contentMethod(params)}`;
+            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+                cellValue = groupContent;
+                if (contentMethod) {
+                    cellValue = `${contentMethod(params)}`;
+                }
+                if (showTotal) {
+                    cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+                }
             }
-            if (showTotal) {
-                cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+            else if (countFields && countFields.includes(field)) {
+                if (countMethod) {
+                    cellValue = `${countMethod(params)}`;
+                }
             }
         }
         else if (!(isRowGroupStatus && row.isAggregate)) {
@@ -531,10 +543,14 @@ export const Cell = {
      * 行分组、树结构
      */
     renderDeepNodeBtn(h, params, cellVNodes) {
-        const { row, column } = params;
+        const { $table, row, column } = params;
         const { rowGroupNode } = column;
-        if (rowGroupNode && row.isAggregate) {
-            return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+        if (row.isAggregate) {
+            const rowGroupOpts = $table.computeRowGroupOpts;
+            const { mode } = rowGroupOpts;
+            if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+                return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+            }
         }
         return [Cell.renderTreeNodeBtn(h, params, cellVNodes)];
     },

package/es/table/src/methods.js

@@ -96,7 +96,7 @@ function handleVirtualXVisible($xeTable) {
             }
         }
         let visibleSize = 0;
-        const toVisibleIndex = Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
+        const toVisibleIndex = leftIndex === visibleColumn.length ? leftIndex : Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
         for (let cIndex = toVisibleIndex, cLen = visibleColumn.length; cIndex < cLen; cIndex++) {
             const column = visibleColumn[cIndex];
             const colid = column.id;
@@ -1690,7 +1690,7 @@ function handleVirtualYVisible($xeTable) {
                     rightIndex = rIndex;
                 }
             }
-            toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
+            toVisibleIndex = leftIndex === afterFullData.length ? leftIndex : Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
             for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
                 const row = afterFullData[rIndex];
                 const rowid = handleGetRowId(row);
@@ -2624,6 +2624,7 @@ function handleGroupData($xeTable, list, rowGroups) {
             const groupField = rgItem.field;
             const groupColumn = $xeTable.getColumnByField(groupField);
             const groupMaps = {};
+            const groupList = [];
             const rowkey = getRowkey($xeTable);
             list.forEach((row) => {
                 const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : XEUtils.get(row, groupField);
@@ -2640,8 +2641,10 @@ function handleGroupData($xeTable, list, rowGroups) {
             });
             XEUtils.objectEach(groupMaps, (childList, groupValue) => {
                 const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1));
+                const childCount = 0;
                 const groupRow = {
                     isAggregate: true,
+                    childCount,
                     groupContent: groupValue,
                     groupField,
                     [rowField]: getRowUniqueId(),
@@ -2656,12 +2659,25 @@ function handleGroupData($xeTable, list, rowGroups) {
                 if (indeterminateField) {
                     groupRow[indeterminateField] = false;
                 }
+                groupList.push(groupRow);
                 treeData.push(groupRow);
                 fullData.push(groupRow);
                 if (childFullData.length) {
                     fullData.push(...childFullData);
                 }
             });
+            XEUtils.lastEach(groupList, groupItem => {
+                let count = 0;
+                XEUtils.each(groupItem[childrenField], row => {
+                    if (row.isAggregate) {
+                        count += row[childrenField] ? row[childrenField].length : 0;
+                    }
+                    else {
+                        count++;
+                    }
+                });
+                groupItem.childCount = count;
+            });
         }
     }
     return {
@@ -3365,7 +3381,9 @@ function updateColumnOffsetLeft($xeTable) {
         const column = visibleColumn[cIndex];
         const colid = column.id;
         const colRest = fullColumnIdData[colid];
-        colRest.oLeft = offsetLeft;
+        if (colRest) {
+            colRest.oLeft = offsetLeft;
+        }
         offsetLeft += column.renderWidth;
     }
 }

package/es/table/src/util.js

@@ -75,7 +75,7 @@ export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
         // 还原滚动状态
         return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
-    return $xeTable.$nextTick();
+    return $xeTable.clearScroll();
 }
 export function toTreePathSeq(path) {
     return path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');

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.31";
+export const version = "3.15.33";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -201,13 +201,13 @@ VxeUI.setConfig({
             isReplace: true
         },
         virtualXConfig: {
-            enabled: false,
+            enabled: true,
             gt: 24,
             preSize: 0,
             oSize: 0
         },
         virtualYConfig: {
-            enabled: false,
+            enabled: true,
             gt: 100,
             preSize: 1,
             oSize: 0

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.31"}`;
+const version = `table v${"3.15.33"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.31";
+const version = "3.15.33";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2203,13 +2203,13 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      enabled: false,
+      enabled: true,
       gt: 24,
       preSize: 0,
       oSize: 0
     },
     virtualYConfig: {
-      enabled: false,
+      enabled: true,
       gt: 100,
       preSize: 1,
       oSize: 0
@@ -2646,7 +2646,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.31"}`;
+const log_version = `table v${"3.15.33"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2900,7 +2900,7 @@ function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     // 还原滚动状态
     return $xeTable.scrollTo(scrollLeft, scrollTop);
   }
-  return $xeTable.$nextTick();
+  return $xeTable.clearScroll();
 }
 function toTreePathSeq(path) {
   return path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
@@ -3742,21 +3742,30 @@ function getDefaultCellLabel(params) {
 function renderCellHandle(h, params) {
   const {
     column,
+    row,
     $table
   } = params;
   const tableProps = $table;
+  const tableReactData = $table;
   const {
     editConfig
   } = tableProps;
+  const {
+    isRowGroupStatus
+  } = tableReactData;
   const {
     type,
     treeNode,
     rowGroupNode,
     editRender
   } = column;
+  const rowGroupOpts = $table.computeRowGroupOpts;
+  const {
+    mode
+  } = rowGroupOpts;
   const checkboxOpts = $table.computeCheckboxOpts;
   const editOpts = $table.computeEditOpts;
-  const isDeepCell = treeNode || rowGroupNode;
+  const isDeepCell = treeNode || isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode);
   switch (type) {
     case 'seq':
       return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params);
@@ -3876,6 +3885,7 @@ const Cell = {
       isRowGroupStatus
     } = tableReactData;
     const {
+      field,
       slots,
       editRender,
       cellRender,
@@ -3897,36 +3907,46 @@ const Cell = {
       }
     }
     let cellValue = '';
-    if (isRowGroupStatus && rowGroupNode && row.isAggregate) {
+    if (isRowGroupStatus && row.isAggregate) {
       const {
         fullColumnFieldData
       } = tableInternalData;
       const rowGroupOpts = $table.computeRowGroupOpts;
       const {
+        mode,
         showTotal,
         totalMethod,
+        countFields,
+        countMethod,
         contentMethod,
         mapChildrenField
       } = rowGroupOpts;
       const groupField = row.groupField;
-      cellValue = row.groupContent;
+      const groupContent = row.groupContent;
       const childList = mapChildrenField ? row[mapChildrenField] || [] : [];
-      const totalValue = childList.length;
+      const totalValue = row.childCount;
       const colRest = fullColumnFieldData[groupField] || {};
       const params = {
         $table,
         groupField,
         groupColumn: colRest ? colRest.column : null,
         column,
-        groupValue: cellValue,
+        groupValue: groupContent,
         children: childList,
         totalValue: totalValue
       };
-      if (contentMethod) {
-        cellValue = `${contentMethod(params)}`;
-      }
-      if (showTotal) {
-        cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+        cellValue = groupContent;
+        if (contentMethod) {
+          cellValue = `${contentMethod(params)}`;
+        }
+        if (showTotal) {
+          cellValue = cell_getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue]);
+        }
+      } else if (countFields && countFields.includes(field)) {
+        if (countMethod) {
+          cellValue = `${countMethod(params)}`;
+        }
       }
     } else if (!(isRowGroupStatus && row.isAggregate)) {
       cellValue = $table.getCellLabel(row, column);
@@ -4079,14 +4099,21 @@ const Cell = {
    */
   renderDeepNodeBtn(h, params, cellVNodes) {
     const {
+      $table,
       row,
       column
     } = params;
     const {
       rowGroupNode
     } = column;
-    if (rowGroupNode && row.isAggregate) {
-      return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+    if (row.isAggregate) {
+      const rowGroupOpts = $table.computeRowGroupOpts;
+      const {
+        mode
+      } = rowGroupOpts;
+      if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
+        return [Cell.renderRowGroupBtn(h, params, cellVNodes)];
+      }
     }
     return [Cell.renderTreeNodeBtn(h, params, cellVNodes)];
   },
@@ -5196,7 +5223,7 @@ function handleVirtualXVisible($xeTable) {
       }
     }
     let visibleSize = 0;
-    const toVisibleIndex = Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
+    const toVisibleIndex = leftIndex === visibleColumn.length ? leftIndex : Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0);
     for (let cIndex = toVisibleIndex, cLen = visibleColumn.length; cIndex < cLen; cIndex++) {
       const column = visibleColumn[cIndex];
       const colid = column.id;
@@ -7162,7 +7189,7 @@ function handleVirtualYVisible($xeTable) {
           rightIndex = rIndex;
         }
       }
-      toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
+      toVisibleIndex = leftIndex === afterFullData.length ? leftIndex : Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
       for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex];
         const rowid = handleGetRowId(row);
@@ -8227,6 +8254,7 @@ function handleGroupData($xeTable, list, rowGroups) {
       const groupField = rgItem.field;
       const groupColumn = $xeTable.getColumnByField(groupField);
       const groupMaps = {};
+      const groupList = [];
       const rowkey = getRowkey($xeTable);
       list.forEach(row => {
         const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, groupField);
@@ -8246,8 +8274,10 @@ function handleGroupData($xeTable, list, rowGroups) {
           fullData: childFullData,
           treeData: childTreeData
         } = handleGroupData($xeTable, childList, rowGroups.slice(1));
+        const childCount = 0;
         const groupRow = {
           isAggregate: true,
+          childCount,
           groupContent: groupValue,
           groupField,
           [rowField]: getRowUniqueId(),
@@ -8262,12 +8292,24 @@ function handleGroupData($xeTable, list, rowGroups) {
         if (indeterminateField) {
           groupRow[indeterminateField] = false;
         }
+        groupList.push(groupRow);
         treeData.push(groupRow);
         fullData.push(groupRow);
         if (childFullData.length) {
           fullData.push(...childFullData);
         }
       });
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(groupList, groupItem => {
+        let count = 0;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(groupItem[childrenField], row => {
+          if (row.isAggregate) {
+            count += row[childrenField] ? row[childrenField].length : 0;
+          } else {
+            count++;
+          }
+        });
+        groupItem.childCount = count;
+      });
     }
   }
   return {
@@ -9051,7 +9093,9 @@ function updateColumnOffsetLeft($xeTable) {
     const column = visibleColumn[cIndex];
     const colid = column.id;
     const colRest = fullColumnIdData[colid];
-    colRest.oLeft = offsetLeft;
+    if (colRest) {
+      colRest.oLeft = offsetLeft;
+    }
     offsetLeft += column.renderWidth;
   }
 }
@@ -26097,7 +26141,7 @@ function checkRuleStatus(rule, val) {
   const {
     required
   } = rule;
-  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val);
+  const isEmptyVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(val) ? !val.length : eqEmptyValue(val);
   if (required) {
     if (isEmptyVal) {
       return false;