vxe-table 3.11.22 → 3.11.24

package/lib/table/src/methods.js

@@ -1096,6 +1096,9 @@ const Methods = {
         };
       }
       if (isSource) {
+        cacheItem.row = row;
+        cacheItem.items = items;
+        cacheItem.parent = parent;
         cacheItem.level = level;
         cacheItem.index = treeConfig && parent ? -1 : index;
         fullDataRowIdMaps[rowid] = cacheItem;
@@ -5562,20 +5565,45 @@ const Methods = {
       }, params), evnt);
     }
   },
+  triggerCurrentColumnEvent(evnt, params) {
+    const $xeTable = this;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const {
+      currentMethod
+    } = columnOpts;
+    const {
+      column
+    } = params;
+    if (!currentMethod || currentMethod({
+      column
+    })) {
+      $xeTable.setCurrentColumn(column);
+    }
+  },
   triggerCurrentRowEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       currentRow: oldValue
-    } = this;
+    } = reactData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const {
+      currentMethod
+    } = rowOpts;
     const {
       row: newValue
     } = params;
     const isChange = oldValue !== newValue;
-    this.setCurrentRow(newValue);
-    if (isChange) {
-      this.emitEvent('current-change', Object.assign({
-        oldValue,
-        newValue
-      }, params), evnt);
+    if (!currentMethod || currentMethod({
+      row: newValue
+    })) {
+      $xeTable.setCurrentRow(newValue);
+      if (isChange) {
+        $xeTable.dispatchEvent('current-change', Object.assign({
+          oldValue,
+          newValue
+        }, params), evnt);
+      }
     }
   },
   /**
@@ -5722,7 +5750,7 @@ const Methods = {
       cell
     }, params), evnt);
     if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
-      return this.setCurrentColumn(column);
+      this.triggerCurrentColumnEvent(evnt, params);
     }
     return this.$nextTick();
   },