vxe-table 3.15.10 → 3.15.12

package/packages/table/src/methods.ts

@@ -7463,9 +7463,9 @@ const Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
-    const reactData = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
 
     const { editConfig } = props
     const { editStore, isDragResize } = reactData
@@ -7482,12 +7482,12 @@ const Methods = {
           checkValidate($xeTable, 'blur')
             .catch((e: any) => e)
             .then(() => {
-              this.handleEdit(params, evnt)
+              $xeTable.handleEdit(params, evnt)
                 .then(() => checkValidate($xeTable, 'change'))
                 .catch((e: any) => e)
             })
         } else if (editOpts.mode === 'cell') {
-          this.handleEdit(params, evnt)
+          $xeTable.handleEdit(params, evnt)
             .then(() => checkValidate($xeTable, 'change'))
             .catch((e: any) => e)
         }
@@ -7496,7 +7496,7 @@ const Methods = {
     this.emitEvent('cell-dblclick', params, evnt)
   },
   handleColumnSortEvent (evnt: any, column: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
 
     const { mouseConfig } = props
@@ -7514,7 +7514,7 @@ const Methods = {
    * 点击排序事件
    */
   triggerSortEvent (evnt: Event, column: VxeTableDefines.ColumnInfo, order: VxeTablePropTypes.SortOrder) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     const sortOpts = $xeTable.computeSortOpts
     const { multiple, allowClear } = sortOpts
@@ -7534,7 +7534,7 @@ const Methods = {
     row: any
     column: VxeTableDefines.ColumnInfo
   }, cellValue?: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const reactData = $xeTable as unknown as TableReactData
 
     const { validStore } = reactData
@@ -7566,7 +7566,7 @@ const Methods = {
    * 表头单元格按下事件
    */
   triggerHeaderCellMousedownEvent (evnt: any, params: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
 
     const { mouseConfig } = props
@@ -7600,7 +7600,7 @@ const Methods = {
    * 单元格按下事件
    */
   triggerCellMousedownEvent (evnt: any, params: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     const { column } = params
     const { type, treeNode } = column
@@ -8382,7 +8382,7 @@ const Methods = {
   sort (sortConfs: any, sortOrder: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-    const { sortOpts } = this
+    const sortOpts = $xeTable.computeSortOpts
     const { multiple, remote, orders } = sortOpts
     if (sortConfs) {
       if (XEUtils.isString(sortConfs)) {
@@ -8397,20 +8397,20 @@ const Methods = {
     if (sortConfs.length) {
       let firstSortColumn: any
       if (!multiple) {
-        clearAllSort(this)
+        clearAllSort($xeTable)
       }
       (multiple ? sortConfs : [sortConfs[0]]).forEach((confs: any, index: any) => {
         let { field, order } = confs
         let column = field
         if (XEUtils.isString(field)) {
-          column = this.getColumnByField(field)
+          column = $xeTable.getColumnByField(field)
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column
           }
-          if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(this, column)
+          if (orders && orders.indexOf(order) === -1) {
+            order = getNextSortOrder($xeTable, column)
           }
           if (column.order !== order) {
             column.order = order
@@ -8420,17 +8420,18 @@ const Methods = {
       })
       // 如果是服务端排序，则跳过本地排序处理
       if (!remote || (firstSortColumn && firstSortColumn.remoteSort)) {
-        this.handleTableData(true)
+        $xeTable.handleTableData(true)
       }
-      return this.$nextTick().then(() => {
-        this.updateCellAreas()
+      return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable)
+        $xeTable.updateCellAreas()
         return updateStyle($xeTable)
       })
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   setSort (sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     const sortOpts = $xeTable.computeSortOpts
     const { multiple, remote, orders } = sortOpts
@@ -8453,7 +8454,7 @@ const Methods = {
           firstColumn = column
         }
         if (column && column.sortable) {
-          if (orders.indexOf(order) === -1) {
+          if (orders && orders.indexOf(order) === -1) {
             order = getNextSortOrder($xeTable, column)
           }
           if (column.order !== order) {
@@ -8469,6 +8470,7 @@ const Methods = {
         $xeTable.handleColumnSortEvent(new Event('click'), firstColumn)
       }
       return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable)
         $xeTable.updateCellAreas()
         return updateStyle($xeTable)
       })
@@ -8481,21 +8483,24 @@ const Methods = {
    * @param {String} column 列或字段名
    */
   clearSort (fieldOrColumn: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-    const { sortOpts } = this
+    const sortOpts = $xeTable.computeSortOpts
     if (fieldOrColumn) {
-      const column = handleFieldOrColumn(this, fieldOrColumn)
+      const column = handleFieldOrColumn($xeTable, fieldOrColumn)
       if (column) {
         column.order = null
       }
     } else {
-      clearAllSort(this)
+      clearAllSort($xeTable)
     }
     if (!sortOpts.remote) {
-      this.handleTableData(true)
+      $xeTable.handleTableData(true)
     }
-    return this.$nextTick().then(() => updateStyle($xeTable))
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable)
+      return updateStyle($xeTable)
+    })
   },
   // 在 v3 中废弃
   getSortColumn () {
@@ -9878,47 +9883,45 @@ const Methods = {
    */
   scrollTo (scrollLeft: number | null, scrollTop?: number | null) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { $refs } = this
-    const { refTableBody, refTableHeader, leftBody, rightBody, refTableFooter } = $refs
-    const tableBodyElem = refTableBody ? refTableBody.$el : null
-    const leftBodyElem = leftBody ? leftBody.$el : null
-    const rightBodyElem = rightBody ? rightBody.$el : null
-    const tableHeaderElem = refTableHeader ? refTableHeader.$el : null
-    const tableFooterElem = refTableFooter ? refTableFooter.$el : null
+    const { elemStore } = internalData
+    const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+    const footerScrollElem = getRefElem(elemStore['main-footer-scroll'])
+    const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
+    const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
+
     internalData.intoRunScroll = true
+
     if (XEUtils.isNumber(scrollLeft)) {
-      const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
-      if (xHandleEl) {
-        setScrollLeft(xHandleEl, scrollLeft)
-      } else {
-        setScrollLeft(tableBodyElem, scrollLeft)
-        setScrollLeft(tableHeaderElem, scrollLeft)
-        setScrollLeft(tableFooterElem, scrollLeft)
-      }
+      setScrollLeft(xHandleEl, scrollLeft)
+      setScrollLeft(bodyScrollElem, scrollLeft)
+      setScrollLeft(headerScrollElem, scrollLeft)
+      setScrollLeft(footerScrollElem, scrollLeft)
+      loadScrollXData($xeTable)
     }
     if (XEUtils.isNumber(scrollTop)) {
-      const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
-      if (yHandleEl) {
-        setScrollTop(yHandleEl, scrollTop)
-      } else {
-        setScrollTop(tableBodyElem, scrollTop)
-        setScrollTop(leftBodyElem, scrollTop)
-        setScrollTop(rightBodyElem, scrollTop)
-      }
+      setScrollTop(yHandleEl, scrollTop)
+      setScrollTop(bodyScrollElem, scrollTop)
+      setScrollTop(leftScrollElem, scrollTop)
+      setScrollTop(rightScrollElem, scrollTop)
+      loadScrollYData($xeTable)
     }
-    if (this.scrollXLoad || this.scrollYLoad) {
+    if (reactData.scrollXLoad || reactData.scrollYLoad) {
       return new Promise<void>(resolve => {
         setTimeout(() => {
           $xeTable.$nextTick(() => {
             internalData.intoRunScroll = false
             resolve()
           })
-        })
+        }, 30)
       })
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -9927,15 +9930,16 @@ const Methods = {
    */
   scrollToRow (row: any, fieldOrColumn?: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
     const reactData = $xeTable as unknown as TableReactData
 
     const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData
     const rest = []
     if (row) {
-      if (this.treeConfig) {
-        rest.push(this.scrollToTreeRow(row))
+      if (props.treeConfig) {
+        rest.push($xeTable.scrollToTreeRow(row))
       } else {
-        rest.push(rowToVisible(this, row))
+        rest.push(rowToVisible($xeTable, row))
       }
     }
     if (fieldOrColumn) {

package/packages/table/src/util.ts

@@ -72,23 +72,18 @@ export const convertHeaderColumnToRows = (originColumns: any) => {
 export function restoreScrollLocation ($xeTable: VxeTableConstructor, scrollLeft: number, scrollTop: number) {
   const internalData = $xeTable as unknown as TableInternalData
 
-  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 $xeTable.$nextTick()
 }
 
 export function toTreePathSeq (path: any) {