vxe-table 3.11.1 → 3.11.2

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.1";
+const version = "3.11.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2774,7 +2774,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.1"}`;
+const log_version = `table v${"3.11.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3378,7 +3378,7 @@ function rowToVisible($xeTable, row) {
   }
   return Promise.resolve();
 }
-function colToVisible($xeTable, column) {
+function colToVisible($xeTable, column, row) {
   const {
     columnStore,
     scrollXLoad,
@@ -3404,9 +3404,17 @@ function colToVisible($xeTable, column) {
   if (bodyElem) {
     const bodyWidth = bodyElem.clientWidth;
     const bodyScrollLeft = bodyElem.scrollLeft;
-    const tdElem = bodyElem.querySelector(`.${column.id}`);
+    let tdElem = null;
+    if (row) {
+      const rowid = getRowid($xeTable, row);
+      tdElem = bodyElem.querySelector(`[rowid="${rowid}"] .${column.id}`);
+    }
+    if (!tdElem) {
+      tdElem = bodyElem.querySelector(`.${column.id}`);
+    }
     if (tdElem) {
-      const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
+      const tdOffsetParent = tdElem.offsetParent;
+      const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
       if (tdOffsetLeft < bodyScrollLeft + offsetFixedLeft) {
@@ -5335,6 +5343,17 @@ const hideDropTip = $xeTable => {
     cdLineEl.style.display = '';
   }
 };
+const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
+  const internalData = $xeTable;
+  const {
+    fullColumnIdData
+  } = internalData;
+  const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+  if (column && fullColumnIdData[column.id]) {
+    return colToVisible($xeTable, column, row);
+  }
+  return $xeTable.$nextTick();
+};
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -12353,6 +12372,7 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   scrollToRow(row, fieldOrColumn) {
+    const $xeTable = this;
     const rest = [];
     if (row) {
       if (this.treeConfig) {
@@ -12362,7 +12382,7 @@ const Methods = {
       }
     }
     if (fieldOrColumn) {
-      rest.push(this.scrollToColumn(fieldOrColumn));
+      rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row));
     }
     return Promise.all(rest);
   },
@@ -12371,11 +12391,8 @@ const Methods = {
    * @param {ColumnInfo} column 列配置
    */
   scrollToColumn(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && this.fullColumnMap.has(column)) {
-      return colToVisible(this, column);
-    }
-    return this.$nextTick();
+    const $xeTable = this;
+    return handleScrollToRowColumn($xeTable, fieldOrColumn);
   },
   /**
    * 对于树形结构中，可以直接滚动到指定深层节点中