vxe-table 3.17.0-beta.4 → 3.17.0-beta.5

package/es/table/src/methods.js

@@ -1511,20 +1511,18 @@ const handleDefaultTreeExpand = ($xeTable) => {
     const internalData = $xeTable;
     const { treeConfig } = props;
     if (treeConfig) {
-        const { tableFullData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { expandAll, expandRowKeys } = treeOpts;
-        const childrenField = treeOpts.children || treeOpts.childrenField;
         if (expandAll) {
             $xeTable.setAllTreeExpand(true);
         }
         else if (expandRowKeys) {
             const defExpandeds = [];
-            const rowkey = getRowkey($xeTable);
             expandRowKeys.forEach((rowid) => {
-                const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField });
-                if (matchObj) {
-                    defExpandeds.push(matchObj.item);
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    defExpandeds.push(rowRest.row);
                 }
             });
             $xeTable.setTreeExpand(defExpandeds, true);
@@ -7729,8 +7727,8 @@ const Methods = {
                 $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
             }
         }
-        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
-            $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
+        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaModownEvent) {
+            $xeTable.handleHeaderCellAreaModownEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
         }
         $xeTable.focus();
         if ($xeTable.closeMenu) {

package/es/table/src/table.js

@@ -1572,7 +1572,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerCellAreaMousednEvent) {
+        if (!$xeTable.triggerCellAreaModownEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }

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.4";
+export const version = "3.17.0-beta.5";
 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.4"}`;
+const version = `table v${"3.17.0-beta.5"}`;
 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.4";
+const version = "3.17.0-beta.5";
 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.4"}`;
+const log_version = `table v${"3.17.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7098,25 +7098,21 @@ const handleDefaultTreeExpand = $xeTable => {
   } = props;
   if (treeConfig) {
     const {
-      tableFullData
+      fullAllDataRowIdData
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       expandAll,
       expandRowKeys
     } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     if (expandAll) {
       $xeTable.setAllTreeExpand(true);
     } else if (expandRowKeys) {
       const defExpandeds = [];
-      const rowkey = getRowkey($xeTable);
       expandRowKeys.forEach(rowid => {
-        const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, rowkey), {
-          children: childrenField
-        });
-        if (matchObj) {
-          defExpandeds.push(matchObj.item);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          defExpandeds.push(rowRest.row);
         }
       });
       $xeTable.setTreeExpand(defExpandeds, true);
@@ -14294,8 +14290,8 @@ const Methods = {
         $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
       }
     }
-    if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
-      $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
+    if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaModownEvent) {
+      $xeTable.handleHeaderCellAreaModownEvent(evnt, Object.assign({
         cell,
         triggerSort,
         triggerFilter
@@ -26604,8 +26600,8 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         mouseConfig,
         mouseOpts
       } = this;
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousednEvent) {
-        return $xeTable.triggerCellAreaMousednEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModownEvent) {
+        return $xeTable.triggerCellAreaModownEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           this.handleCheckboxRangeEvent(evnt, params);
@@ -29548,7 +29544,7 @@ function renderBody(h, $xeTable) {
     if (rowOpts.height && !this.showOverflow) {
       warnLog('vxe.error.notProp', ['table.show-overflow']);
     }
-    if (!$xeTable.triggerCellAreaMousednEvent) {
+    if (!$xeTable.triggerCellAreaModownEvent) {
       if (props.areaConfig) {
         warnLog('vxe.error.notProp', ['area-config']);
       }