vxe-table 3.12.7 → 3.12.8

package/es/table/src/util.js

@@ -320,6 +320,7 @@ export function rowToVisible($xeTable, row) {
     const tableBody = $xeTable.$refs.tableBody;
     const { columnStore, scrollYLoad } = reactData;
     const { afterFullData, scrollYStore, fullAllDataRowIdData } = internalData;
+    const { rowHeight } = scrollYStore;
     const { leftList, rightList } = columnStore;
     const bodyElem = tableBody ? tableBody.$el : null;
     const rowid = getRowid($xeTable, row);
@@ -351,19 +352,19 @@ export function rowToVisible($xeTable, row) {
             // 如果是虚拟渲染滚动
             if (scrollYLoad) {
                 if (showOverflow) {
-                    return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * scrollYStore.rowHeight);
+                    return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * rowHeight);
                 }
                 let scrollTop = 0;
-                const rest = fullAllDataRowIdData[rowid];
-                const rHeight = rest ? rest.height : 0;
+                const rowRest = fullAllDataRowIdData[rowid];
+                const rHeight = rowRest ? (rowRest.height || rowHeight) : rowHeight;
                 for (let i = 0; i < afterFullData.length; i++) {
                     const currRow = afterFullData[i];
                     const currRowid = getRowid($xeTable, currRow);
                     if (currRow === row || currRowid === rowid) {
                         break;
                     }
-                    const rest = fullAllDataRowIdData[currRowid];
-                    scrollTop += rest ? rest.height : 0;
+                    const rowRest = fullAllDataRowIdData[currRowid];
+                    scrollTop += rowRest ? (rowRest.height || rowHeight) : rowHeight;
                 }
                 if (scrollTop < bodyScrollTop) {
                     return $xeTable.scrollTo(null, scrollTop - offsetFixedLeft - 1);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.7";
+export const version = "3.12.8";
 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.12.7"}`;
+const version = `table v${"3.12.8"}`;
 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.12.7";
+const version = "3.12.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2814,7 +2814,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.7"}`;
+const log_version = `table v${"3.12.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3372,6 +3372,9 @@ function rowToVisible($xeTable, row) {
     scrollYStore,
     fullAllDataRowIdData
   } = internalData;
+  const {
+    rowHeight
+  } = scrollYStore;
   const {
     leftList,
     rightList
@@ -3404,19 +3407,19 @@ function rowToVisible($xeTable, row) {
       // 如果是虚拟渲染滚动
       if (scrollYLoad) {
         if (showOverflow) {
-          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * scrollYStore.rowHeight);
+          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * rowHeight);
         }
         let scrollTop = 0;
-        const rest = fullAllDataRowIdData[rowid];
-        const rHeight = rest ? rest.height : 0;
+        const rowRest = fullAllDataRowIdData[rowid];
+        const rHeight = rowRest ? rowRest.height || rowHeight : rowHeight;
         for (let i = 0; i < afterFullData.length; i++) {
           const currRow = afterFullData[i];
           const currRowid = getRowid($xeTable, currRow);
           if (currRow === row || currRowid === rowid) {
             break;
           }
-          const rest = fullAllDataRowIdData[currRowid];
-          scrollTop += rest ? rest.height : 0;
+          const rowRest = fullAllDataRowIdData[currRowid];
+          scrollTop += rowRest ? rowRest.height || rowHeight : rowHeight;
         }
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - offsetFixedLeft - 1);
@@ -3589,6 +3592,7 @@ function renderCellDragIcon(h, params) {
   const {
     $table
   } = params;
+  const tableSlots = $table.$scopedSlots;
   const tableProps = $table;
   const {
     dragConfig
@@ -3601,6 +3605,7 @@ function renderCellDragIcon(h, params) {
   } = rowDragOpts;
   const rDisabledMethod = disabledMethod || (dragConfig ? dragConfig.rowDisabledMethod : null);
   const isDisabled = rDisabledMethod && rDisabledMethod(params);
+  const rowDragIconSlot = tableSlots.rowDragIcon || tableSlots['row-drag-icon'];
   const ons = {};
   if (trigger !== 'cell') {
     ons.mousedown = evnt => {
@@ -3616,7 +3621,7 @@ function renderCellDragIcon(h, params) {
       'is--disabled': isDisabled
     }],
     on: ons
-  }, [h('i', {
+  }, rowDragIconSlot ? $table.callSlot(rowDragIconSlot, params, h) : [h('i', {
     class: icon || (dragConfig ? dragConfig.rowIcon : '') || cell_getIcon().TABLE_DRAG_ROW
   })]);
 }
@@ -3660,6 +3665,10 @@ function renderHeaderCellDragIcon(h, params) {
     $table,
     column
   } = params;
+  const tableSlots = $table.$scopedSlots;
+  const {
+    slots
+  } = column;
   const columnOpts = $table.computeColumnOpts;
   const columnDragOpts = $table.computeColumnDragOpts;
   const {
@@ -3674,6 +3683,7 @@ function renderHeaderCellDragIcon(h, params) {
   if (columnOpts.drag && showIcon && (!visibleMethod || visibleMethod(params))) {
     if (!column.fixed && (isPeerDrag || isCrossDrag || !column.parentId)) {
       const isDisabled = disabledMethod && disabledMethod(params);
+      const columnDragIconSlot = (slots ? slots.columnDragIcon || slots['column-drag-icon'] : null) || tableSlots.columnDragIcon || tableSlots['column-drag-icon'];
       const ons = {};
       if (trigger !== 'cell') {
         ons.mousedown = evnt => {
@@ -3689,7 +3699,7 @@ function renderHeaderCellDragIcon(h, params) {
           'is--disabled': isDisabled
         }],
         on: ons
-      }, [h('i', {
+      }, columnDragIconSlot ? $table.callSlot(columnDragIconSlot, params, h) : [h('i', {
         class: icon || cell_getIcon().TABLE_DRAG_COLUMN
       })]);
     }
@@ -5364,10 +5374,7 @@ function handleVirtualYVisible($xeTable) {
         const row = afterFullData[rIndex];
         const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
-        if (!rowRest) {
-          break;
-        }
-        offsetTop += rowRest.height || rowHeight;
+        offsetTop += rowRest ? rowRest.height || rowHeight : rowHeight;
         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
           toVisibleIndex = rIndex;
         }
@@ -13691,6 +13698,15 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      showOverflow
+    } = props;
+    const {
+      scrollYLoad,
+      scrollXLoad
+    } = reactData;
     const rest = [];
     if (row) {
       if (this.treeConfig) {
@@ -13702,7 +13718,15 @@ const Methods = {
     if (fieldOrColumn) {
       rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row));
     }
-    return Promise.all(rest);
+    return Promise.all(rest).then(() => {
+      if (row) {
+        if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+          calcCellHeight($xeTable);
+          calcCellWidth($xeTable);
+        }
+        return $xeTable.$nextTick();
+      }
+    });
   },
   /**
    * 如果有滚动条，则滚动到对应的列