vxe-table 3.12.7 → 3.12.9

package/es/table/src/methods.js

@@ -309,10 +309,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;
                 }
@@ -2245,30 +2242,6 @@ const Methods = {
         this.afterTreeFullData = tableTree;
         this.updateAfterDataIndex();
     },
-    updateTreeDataIndex() {
-        const $xeTable = this;
-        const props = $xeTable;
-        const internalData = $xeTable;
-        const { treeConfig } = props;
-        const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
-        const treeOpts = $xeTable.computeTreeOpts;
-        if (treeConfig) {
-            if (treeOpts.transform) {
-                afterFullData.forEach((row, index) => {
-                    const rowid = getRowid($xeTable, row);
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    if (rowRest) {
-                        rowRest._index = index;
-                    }
-                    else {
-                        const rest = { row, rowid, seq: '-1', index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0, oTop: 0 };
-                        fullAllDataRowIdData[rowid] = rest;
-                        fullDataRowIdData[rowid] = rest;
-                    }
-                });
-            }
-        }
-    },
     /**
      * 预编译
      * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
@@ -2298,7 +2271,6 @@ const Methods = {
                 }
                 fullMaps[rowid] = row;
             }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField });
-            $xeTable.updateTreeDataIndex();
         }
         else {
             afterFullData.forEach((row, index) => {
@@ -6688,7 +6660,7 @@ const Methods = {
                             return this.$nextTick().then(() => {
                                 if (transform) {
                                     this.handleTableData();
-                                    this.updateTreeDataIndex();
+                                    this.updateAfterDataIndex();
                                     return this.$nextTick();
                                 }
                             });
@@ -6804,7 +6776,7 @@ const Methods = {
         return this.handleBaseTreeExpand(rows, expanded).then(() => {
             handleVirtualTreeToList($xeTable);
             this.handleTableData();
-            this.updateTreeDataIndex();
+            this.updateAfterDataIndex();
         }).then(() => {
             return this.recalculate();
         }).then(() => {
@@ -7337,6 +7309,10 @@ 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) {
@@ -7349,7 +7325,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();
+            }
+        });
     },
     /**
      * 如果有滚动条，则滚动到对应的列

package/es/table/src/util.js

@@ -61,11 +61,6 @@ export const convertHeaderColumnToRows = (originColumns) => {
     });
     return rows;
 };
-const lineOffsetSizes = {
-    mini: 3,
-    small: 2,
-    medium: 1
-};
 export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     const internalData = $xeTable;
     return $xeTable.clearScroll().then(() => {
@@ -229,15 +224,21 @@ export function getColReMinWidth(params) {
     }
     return mWidth;
 }
+const lineOffsetSizes = {
+    mini: 3,
+    small: 2,
+    medium: 1
+};
 function countTreeExpand(prevRow, params) {
     let count = 1;
     if (!prevRow) {
         return count;
     }
     const { $table } = params;
-    const { treeOpts } = $table;
+    const treeOpts = $table.computeTreeOpts;
+    const { transform, mapChildrenField } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const rowChildren = prevRow[childrenField];
+    const rowChildren = prevRow[transform ? mapChildrenField : childrenField];
     if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
         for (let index = 0; index < rowChildren.length; index++) {
             count += countTreeExpand(rowChildren[index], params);
@@ -245,17 +246,21 @@ function countTreeExpand(prevRow, params) {
     }
     return count;
 }
-export function getOffsetSize($xetable) {
-    const vSize = $xetable.computeSize;
-    return lineOffsetSizes[vSize] || 0;
+export function getOffsetSize($xeTable) {
+    const vSize = $xeTable.computeSize;
+    if (vSize) {
+        return lineOffsetSizes[vSize] || 0;
+    }
+    return 0;
 }
-export function calcTreeLine(params, items, rIndex) {
+export function calcTreeLine(params, prevRow) {
     const { $table } = params;
+    const tableReactData = $table;
     let expandSize = 1;
-    if (rIndex) {
-        expandSize = countTreeExpand(items[rIndex - 1], params);
+    if (prevRow) {
+        expandSize = countTreeExpand(prevRow, params);
     }
-    return $table.rowHeight * expandSize - (rIndex ? 1 : (12 - getOffsetSize($table)));
+    return tableReactData.rowHeight * expandSize - (prevRow ? 1 : (12 - getOffsetSize($table)));
 }
 export function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
     for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
@@ -320,6 +325,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 +357,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.9";
 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.9"}`;
 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.9";
 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.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3055,11 +3055,6 @@ const convertHeaderColumnToRows = originColumns => {
   });
   return rows;
 };
-const lineOffsetSizes = {
-  mini: 3,
-  small: 2,
-  medium: 1
-};
 function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
   const internalData = $xeTable;
   return $xeTable.clearScroll().then(() => {
@@ -3255,6 +3250,11 @@ function getColReMinWidth(params) {
   }
   return mWidth;
 }
+const lineOffsetSizes = {
+  mini: 3,
+  small: 2,
+  medium: 1
+};
 function countTreeExpand(prevRow, params) {
   let count = 1;
   if (!prevRow) {
@@ -3263,11 +3263,13 @@ function countTreeExpand(prevRow, params) {
   const {
     $table
   } = params;
+  const treeOpts = $table.computeTreeOpts;
   const {
-    treeOpts
-  } = $table;
+    transform,
+    mapChildrenField
+  } = treeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
-  const rowChildren = prevRow[childrenField];
+  const rowChildren = prevRow[transform ? mapChildrenField : childrenField];
   if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
@@ -3275,19 +3277,23 @@ function countTreeExpand(prevRow, params) {
   }
   return count;
 }
-function getOffsetSize($xetable) {
-  const vSize = $xetable.computeSize;
-  return lineOffsetSizes[vSize] || 0;
+function getOffsetSize($xeTable) {
+  const vSize = $xeTable.computeSize;
+  if (vSize) {
+    return lineOffsetSizes[vSize] || 0;
+  }
+  return 0;
 }
-function calcTreeLine(params, items, rIndex) {
+function calcTreeLine(params, prevRow) {
   const {
     $table
   } = params;
+  const tableReactData = $table;
   let expandSize = 1;
-  if (rIndex) {
-    expandSize = countTreeExpand(items[rIndex - 1], params);
+  if (prevRow) {
+    expandSize = countTreeExpand(prevRow, params);
   }
-  return $table.rowHeight * expandSize - (rIndex ? 1 : 12 - getOffsetSize($table));
+  return tableReactData.rowHeight * expandSize - (prevRow ? 1 : 12 - getOffsetSize($table));
 }
 function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
@@ -3372,6 +3378,9 @@ function rowToVisible($xeTable, row) {
     scrollYStore,
     fullAllDataRowIdData
   } = internalData;
+  const {
+    rowHeight
+  } = scrollYStore;
   const {
     leftList,
     rightList
@@ -3404,19 +3413,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 +3598,7 @@ function renderCellDragIcon(h, params) {
   const {
     $table
   } = params;
+  const tableSlots = $table.$scopedSlots;
   const tableProps = $table;
   const {
     dragConfig
@@ -3601,6 +3611,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 +3627,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 +3671,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 +3689,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 +3705,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 +5380,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;
         }
@@ -7639,47 +7652,6 @@ const Methods = {
     this.afterTreeFullData = tableTree;
     this.updateAfterDataIndex();
   },
-  updateTreeDataIndex() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const internalData = $xeTable;
-    const {
-      treeConfig
-    } = props;
-    const {
-      afterFullData,
-      fullDataRowIdData,
-      fullAllDataRowIdData
-    } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    if (treeConfig) {
-      if (treeOpts.transform) {
-        afterFullData.forEach((row, index) => {
-          const rowid = getRowid($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            rowRest._index = index;
-          } else {
-            const rest = {
-              row,
-              rowid,
-              seq: '-1',
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0,
-              height: 0,
-              oTop: 0
-            };
-            fullAllDataRowIdData[rowid] = rest;
-            fullDataRowIdData[rowid] = rest;
-          }
-        });
-      }
-    }
-  },
   /**
    * 预编译
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
@@ -7729,7 +7701,6 @@ const Methods = {
       }, {
         children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
-      $xeTable.updateTreeDataIndex();
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid($xeTable, row);
@@ -12927,7 +12898,7 @@ const Methods = {
               return this.$nextTick().then(() => {
                 if (transform) {
                   this.handleTableData();
-                  this.updateTreeDataIndex();
+                  this.updateAfterDataIndex();
                   return this.$nextTick();
                 }
               });
@@ -13071,7 +13042,7 @@ const Methods = {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       handleVirtualTreeToList($xeTable);
       this.handleTableData();
-      this.updateTreeDataIndex();
+      this.updateAfterDataIndex();
     }).then(() => {
       return this.recalculate();
     }).then(() => {
@@ -13691,6 +13662,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 +13682,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();
+      }
+    });
   },
   /**
    * 如果有滚动条，则滚动到对应的列
@@ -14066,43 +14054,47 @@ const renderType = 'body';
 function isVMScrollProcess($xetable) {
   return $xetable._isResize || $xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover;
 }
-function renderLine(h, _vm, $xetable, params) {
+function renderLine(h, _vm, $xeTable, params) {
+  const tableProps = $xeTable;
+  const tableInternalData = $xeTable;
   const {
     row,
     column
   } = params;
   const {
-    afterFullData,
-    treeOpts,
-    treeConfig,
-    fullAllDataRowIdData
-  } = $xetable;
+    afterFullData
+  } = tableInternalData;
+  const {
+    treeConfig
+  } = tableProps;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     slots,
     treeNode
   } = column;
-  const rowid = getRowid($xetable, row);
+  const {
+    fullAllDataRowIdData
+  } = tableInternalData;
+  if (slots && slots.line) {
+    return $xeTable.callSlot(slots.line, params, h);
+  }
+  const rowid = getRowid($xeTable, row);
   const rest = fullAllDataRowIdData[rowid];
   let rLevel = 0;
-  let rIndex = 0;
-  let items = [];
+  let prevRow = null;
   if (rest) {
     rLevel = rest.level;
-    rIndex = rest._index;
-    items = rest.items;
-  }
-  if (slots && slots.line) {
-    return $xetable.callSlot(slots.line, params, h);
+    prevRow = rest.items[rest._index - 1];
   }
-  const isFirstRow = $xetable.eqRow(afterFullData[0], row);
+  const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: `${isFirstRow ? 1 : calcTreeLine(params, items, rIndex)}px`,
-        left: `${rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
+        height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+        left: `${rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
       }
     })])];
   }