vxe-table 3.11.0 → 3.11.2

package/es/table/src/methods.js

@@ -440,6 +440,15 @@ 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) {
@@ -6324,6 +6333,7 @@ const Methods = {
      * @param {ColumnInfo} column 列配置
      */
     scrollToRow(row, fieldOrColumn) {
+        const $xeTable = this;
         const rest = [];
         if (row) {
             if (this.treeConfig) {
@@ -6334,7 +6344,7 @@ const Methods = {
             }
         }
         if (fieldOrColumn) {
-            rest.push(this.scrollToColumn(fieldOrColumn));
+            rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row));
         }
         return Promise.all(rest);
     },
@@ -6343,11 +6353,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);
     },
     /**
      * 对于树形结构中，可以直接滚动到指定深层节点中

package/es/table/src/util.js

@@ -369,7 +369,7 @@ export function rowToVisible($xeTable, row) {
     }
     return Promise.resolve();
 }
-export function colToVisible($xeTable, column) {
+export function colToVisible($xeTable, column, row) {
     const { columnStore, scrollXLoad, visibleColumn } = $xeTable;
     const tableBody = $xeTable.$refs.tableBody;
     const { leftList, rightList } = columnStore;
@@ -388,9 +388,17 @@ export 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)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.0";
+export const version = "3.11.2";
 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.11.0"}`;
+const version = `table v${"3.11.2"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.0";
+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.0"}`;
+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);
   },
   /**
    * 对于树形结构中，可以直接滚动到指定深层节点中
@@ -18131,7 +18148,11 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      */
     handleClearEdit(evnt, targetRow) {
       const $xeTable = this;
+      const props = $xeTable;
       const reactData = $xeTable;
+      const {
+        mouseConfig
+      } = props;
       const {
         editStore
       } = reactData;
@@ -18144,6 +18165,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         column
       } = actived;
       const validOpts = $xeTable.validOpts;
+      const mouseOpts = $xeTable.computeMouseOpts;
       if (row || column) {
         if (targetRow && getRowid($xeTable, targetRow) !== getRowid($xeTable, row)) {
           return $xeTable.$nextTick();
@@ -18164,6 +18186,11 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
       focused.row = null;
       focused.column = null;
+      $xeTable.$nextTick(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
+        }
+      });
       if (validOpts.autoClear) {
         if (validOpts.msgMode !== 'full' || mixin_getConfig().cellVaildMode === 'obsolete') {
           if ($xeTable.clearValidate) {
@@ -26666,6 +26693,7 @@ const Toolbar = VxeToolbar;
       fileTypeHint: '支持 {0} 文件类型',
       fileSizeHint: '单个文件大小不超过{0}',
       fileCountHint: '最多可上传{0}个文件',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',