vxe-table 4.13.10 → 4.13.12

package/packages/table/src/table.ts

@@ -5620,7 +5620,7 @@ export default defineComponent({
               column = tableMethods.getColumnByField(field)
             }
             if (column && column.sortable) {
-              if (orders.indexOf(order) === -1) {
+              if (orders && orders.indexOf(order) === -1) {
                 order = getNextSortOrder(column)
               }
               if (column.order !== order) {
@@ -5634,6 +5634,7 @@ export default defineComponent({
             tablePrivateMethods.handleTableData(true)
           }
           return nextTick().then(() => {
+            updateRowOffsetTop()
             tableMethods.updateCellAreas()
             return updateStyle()
           })
@@ -5662,7 +5663,7 @@ export default defineComponent({
               firstColumn = column
             }
             if (column && column.sortable) {
-              if (orders.indexOf(order) === -1) {
+              if (orders && orders.indexOf(order) === -1) {
                 order = getNextSortOrder(column)
               }
               if (column.order !== order) {
@@ -5678,6 +5679,7 @@ export default defineComponent({
             $xeTable.handleColumnSortEvent(new Event('click'), firstColumn)
           }
           return nextTick().then(() => {
+            updateRowOffsetTop()
             tableMethods.updateCellAreas()
             return updateStyle()
           })
@@ -5702,7 +5704,10 @@ export default defineComponent({
         if (!sortOpts.remote) {
           $xeTable.handleTableData(true)
         }
-        return nextTick().then(updateStyle)
+        return nextTick().then(() => {
+          updateRowOffsetTop()
+          return updateStyle()
+        })
       },
       isSort (fieldOrColumn) {
         if (fieldOrColumn) {
@@ -6222,12 +6227,14 @@ export default defineComponent({
           setScrollLeft(bodyScrollElem, scrollLeft)
           setScrollLeft(headerScrollElem, scrollLeft)
           setScrollLeft(footerScrollElem, scrollLeft)
+          loadScrollXData()
         }
         if (XEUtils.isNumber(scrollTop)) {
           setScrollTop(yHandleEl, scrollTop)
           setScrollTop(bodyScrollElem, scrollTop)
           setScrollTop(leftScrollElem, scrollTop)
           setScrollTop(rightScrollElem, scrollTop)
+          loadScrollYData()
         }
         if (reactData.scrollXLoad || reactData.scrollYLoad) {
           return new Promise<void>(resolve => {
@@ -6251,7 +6258,7 @@ export default defineComponent({
         const rest = []
         if (row) {
           if (props.treeConfig) {
-            rest.push(tablePrivateMethods.scrollToTreeRow(row))
+            rest.push($xeTable.scrollToTreeRow(row))
           } else {
             rest.push(rowToVisible($xeTable, row))
           }

package/packages/table/src/util.ts

@@ -1,4 +1,4 @@
-import { watch, reactive } from 'vue'
+import { watch, reactive, nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { ColumnInfo } from './columnInfo'
 import { isPx, isScale } from '../../ui/src/dom'
@@ -72,23 +72,18 @@ export const convertHeaderColumnToRows = (originColumns: any): any[][] => {
 export function restoreScrollLocation ($xeTable: VxeTableConstructor, scrollLeft: number, scrollTop: number) {
   const internalData = $xeTable.internalData
 
-  return $xeTable.clearScroll().then(() => {
-    if (scrollLeft || scrollTop) {
-      // 重置最后滚动状态
-      internalData.lastScrollLeft = 0
-      internalData.lastScrollTop = 0
-
-      internalData.intoRunScroll = false
-      internalData.inVirtualScroll = false
-      internalData.inWheelScroll = false
-      internalData.inHeaderScroll = false
-      internalData.inBodyScroll = false
-      internalData.inFooterScroll = false
-      internalData.scrollRenderType = ''
-      // 还原滚动状态
-      return $xeTable.scrollTo(scrollLeft, scrollTop)
-    }
-  })
+  if (scrollLeft || scrollTop) {
+    internalData.intoRunScroll = false
+    internalData.inVirtualScroll = false
+    internalData.inWheelScroll = false
+    internalData.inHeaderScroll = false
+    internalData.inBodyScroll = false
+    internalData.inFooterScroll = false
+    internalData.scrollRenderType = ''
+    // 还原滚动状态
+    return $xeTable.scrollTo(scrollLeft, scrollTop)
+  }
+  return nextTick()
 }
 
 /**