vxe-table 3.17.0-beta.2 → 3.17.0-beta.3

package/es/table/src/methods.js

@@ -505,24 +505,15 @@ function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
  */
 function handleDefaultRowGroupExpand($xeTable) {
     const reactData = $xeTable;
-    const internalData = $xeTable;
     const { isRowGroupStatus } = reactData;
     if (isRowGroupStatus) {
-        const { fullDataRowIdData } = internalData;
         const aggregateOpts = $xeTable.computeAggregateOpts;
-        const { expandAll, expandRowKeys } = aggregateOpts;
+        const { expandAll, expandGroupFields } = aggregateOpts;
         if (expandAll) {
             $xeTable.setAllRowGroupExpand(true);
         }
-        else if (expandRowKeys) {
-            const defExpandeds = [];
-            expandRowKeys.forEach((rowid) => {
-                const rowRest = fullDataRowIdData[rowid];
-                if (rowRest) {
-                    defExpandeds.push(rowRest.row);
-                }
-            });
-            $xeTable.setRowGroupExpand(defExpandeds, true);
+        else if (expandGroupFields && expandGroupFields.length) {
+            $xeTable.setRowGroupExpandByField(expandGroupFields, true);
         }
     }
 }
@@ -9224,6 +9215,35 @@ const Methods = {
         }
         return $xeTable.$nextTick();
     },
+    setRowGroupExpandByField(groupFields, expanded) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { isRowGroupStatus } = reactData;
+        const aggregateOpts = $xeTable.computeAggregateOpts;
+        const { childrenField } = aggregateOpts;
+        if (groupFields) {
+            if (!XEUtils.isArray(groupFields)) {
+                groupFields = [groupFields];
+            }
+            if (isRowGroupStatus) {
+                const rows = [];
+                const gfKeys = {};
+                groupFields.forEach(groupField => {
+                    gfKeys[groupField] = true;
+                });
+                XEUtils.eachTree(internalData.afterGroupFullData, (row) => {
+                    if (row.isAggregate && gfKeys[row.groupField]) {
+                        rows.push(row);
+                    }
+                }, { children: childrenField });
+                if (rows.length) {
+                    return handleRowGroupVirtualExpand($xeTable, rows, expanded);
+                }
+            }
+        }
+        return $xeTable.$nextTick();
+    },
     setAllRowGroupExpand(expanded) {
         const $xeTable = this;
         const reactData = $xeTable;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.0-beta.2";
+export const version = "3.17.0-beta.3";
 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.17.0-beta.2"}`;
+const version = `table v${"3.17.0-beta.3"}`;
 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.17.0-beta.2";
+const version = "3.17.0-beta.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.2"}`;
+const log_version = `table v${"3.17.0-beta.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5837,30 +5837,19 @@ function handleRowGroupVirtualExpand($xeTable, rows, expanded) {
  */
 function handleDefaultRowGroupExpand($xeTable) {
   const reactData = $xeTable;
-  const internalData = $xeTable;
   const {
     isRowGroupStatus
   } = reactData;
   if (isRowGroupStatus) {
-    const {
-      fullDataRowIdData
-    } = internalData;
     const aggregateOpts = $xeTable.computeAggregateOpts;
     const {
       expandAll,
-      expandRowKeys
+      expandGroupFields
     } = aggregateOpts;
     if (expandAll) {
       $xeTable.setAllRowGroupExpand(true);
-    } else if (expandRowKeys) {
-      const defExpandeds = [];
-      expandRowKeys.forEach(rowid => {
-        const rowRest = fullDataRowIdData[rowid];
-        if (rowRest) {
-          defExpandeds.push(rowRest.row);
-        }
-      });
-      $xeTable.setRowGroupExpand(defExpandeds, true);
+    } else if (expandGroupFields && expandGroupFields.length) {
+      $xeTable.setRowGroupExpandByField(expandGroupFields, true);
     }
   }
 }
@@ -16010,6 +15999,41 @@ const Methods = {
     }
     return $xeTable.$nextTick();
   },
+  setRowGroupExpandByField(groupFields, expanded) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      isRowGroupStatus
+    } = reactData;
+    const aggregateOpts = $xeTable.computeAggregateOpts;
+    const {
+      childrenField
+    } = aggregateOpts;
+    if (groupFields) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields)) {
+        groupFields = [groupFields];
+      }
+      if (isRowGroupStatus) {
+        const rows = [];
+        const gfKeys = {};
+        groupFields.forEach(groupField => {
+          gfKeys[groupField] = true;
+        });
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(internalData.afterGroupFullData, row => {
+          if (row.isAggregate && gfKeys[row.groupField]) {
+            rows.push(row);
+          }
+        }, {
+          children: childrenField
+        });
+        if (rows.length) {
+          return handleRowGroupVirtualExpand($xeTable, rows, expanded);
+        }
+      }
+    }
+    return $xeTable.$nextTick();
+  },
   setAllRowGroupExpand(expanded) {
     const $xeTable = this;
     const reactData = $xeTable;