vxe-table 3.12.0-beta.8 → 3.12.0

package/packages/table/src/methods.ts

@@ -108,32 +108,28 @@ function handleVirtualXVisible ($xeTable: any) {
 }
 
 const computeRowHeight = ($xeTable: any) => {
-  const props = $xeTable
-
-  const { showOverflow } = props
   const tableHeader = $xeTable.$refs.tableHeader
   const tableBody = $xeTable.$refs.tableBody
   const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
   const vSize = $xeTable.computeSize
   const rowHeightMaps = $xeTable.computeRowHeightMaps
-  let rowHeight = 24
-  if (showOverflow) {
-    if (tableBodyElem) {
-      const tableHeaderElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
-      let firstTrElem
-      firstTrElem = tableBodyElem.querySelector('tr')
-      if (!firstTrElem && tableHeaderElem) {
-        firstTrElem = tableHeaderElem.querySelector('tr')
-      }
-      if (firstTrElem) {
-        rowHeight = firstTrElem.clientHeight
-      }
-      if (!rowHeight) {
-        rowHeight = rowHeightMaps[vSize || 'default']
-      }
+  let rowHeight = 0
+  if (tableBodyElem) {
+    const tableHeaderElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
+    let firstTrElem
+    firstTrElem = tableBodyElem.querySelector('tr')
+    if (!firstTrElem && tableHeaderElem) {
+      firstTrElem = tableHeaderElem.querySelector('tr')
     }
+    if (firstTrElem) {
+      rowHeight = firstTrElem.clientHeight
+    }
+  }
+  if (!rowHeight) {
+    rowHeight = rowHeightMaps[vSize || 'default']
   }
-  return rowHeight
+  // 最低支持 18px 行高
+  return Math.max(18, rowHeight)
 }
 
 function handleVirtualYVisible ($xeTable: any) {
@@ -560,7 +556,10 @@ const handleScrollToRowColumn = ($xeTable: any, fieldOrColumn: string | VxeTable
 }
 
 function handleRecalculateLayout ($xeTable: any, reFull: boolean) {
+  const internalData = $xeTable
+
   const el = $xeTable.$refs.refElem
+  internalData.reRunTime = Date.now()
   if (!el || !el.clientWidth) {
     return $xeTable.$nextTick()
   }
@@ -1000,7 +999,7 @@ const Methods = {
     const isLazy = treeConfig && treeOpts.lazy
     const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
     const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
-    const handleCache = (row: any, index: any, items: any, path: any, parent: any, nodes: any) => {
+    const handleCache = (row: any, index: any, items: any, path: any, parentRow: any, nodes: any) => {
       let rowid = getRowid(this, row)
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
       const level = nodes ? nodes.length - 1 : 0
@@ -1013,13 +1012,13 @@ const Methods = {
       }
       let cacheItem = fullAllDataRowIdData[rowid]
       if (!cacheItem) {
-        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent, level, height: 0 }
+        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0 }
       }
       cacheItem.row = row
       cacheItem.items = items
-      cacheItem.parent = parent
+      cacheItem.parent = parentRow
       cacheItem.level = level
-      cacheItem.index = treeConfig && parent ? -1 : index
+      cacheItem.index = treeConfig && parentRow ? -1 : index
       if (isSource) {
         fullDataRowIdMaps[rowid] = cacheItem
       }
@@ -1083,9 +1082,9 @@ const Methods = {
           sourceDataRowIdData[rowid] = XEUtils.clone(childRow, true)
         })
       }
-      XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+      XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
         const rowid = getRowid($xeTable, childRow)
-        const parentRow = parent || parentRest.row
+        const parentRow = parentItem || parentRest.row
         const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0 }
         fullDataRowIdData[rowid] = rest
         fullAllDataRowIdData[rowid] = rest
@@ -1124,9 +1123,9 @@ const Methods = {
     let radioColumn: VxeTableDefines.ColumnInfo | undefined
     let htmlColumn: VxeTableDefines.ColumnInfo | undefined
     let hasFixed: VxeColumnPropTypes.Fixed | undefined
-    const handleFunc = (column: VxeTableDefines.ColumnInfo, index: number, items: VxeTableDefines.ColumnInfo[], path?: string[], parent?: VxeTableDefines.ColumnInfo) => {
+    const handleFunc = (column: VxeTableDefines.ColumnInfo, index: number, items: VxeTableDefines.ColumnInfo[], path?: string[], parentColumn?: VxeTableDefines.ColumnInfo) => {
       const { id: colid, field, fixed, type, treeNode } = column
-      const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parent || null, width: 0 }
+      const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 }
       if (field) {
         if (fullColumnFieldData[field]) {
           errLog('vxe.error.colRepet', ['field', field])
@@ -1189,9 +1188,9 @@ const Methods = {
     }
 
     if (isGroup) {
-      XEUtils.eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+      XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
         column.level = nodes.length
-        handleFunc(column, index, items, path, parent)
+        handleFunc(column, index, items, path, parentColumn)
       })
     } else {
       tableFullColumn.forEach(handleFunc)
@@ -1779,10 +1778,10 @@ const Methods = {
     if (treeConfig && treeOpts.transform) {
       const fullData: any[] = []
       const expandMaps: any = {}
-      XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+      XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
         const rowid = getRowid(this, row)
-        const parentRowid = getRowid(this, parent)
-        if (!parent || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+        const parentRowid = getRowid(this, parentRow)
+        if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             rowRest._index = fullData.length
@@ -2316,11 +2315,11 @@ const Methods = {
     let hasCustomSort = false
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+      XEUtils.eachTree(collectColumn, (column, index, items, path, parentRow) => {
         const colKey = column.getKey()
         // 支持一级
-        if (!parent) {
-          if (fixedData && fixedData[colKey]) {
+        if (!parentRow) {
+          if (fixedData && fixedData[colKey] !== undefined) {
             column.fixed = fixedData[colKey]
           }
           if (sortData && XEUtils.isNumber(sortData[colKey])) {
@@ -2399,9 +2398,9 @@ const Methods = {
     let hasSort = 0
     let hasFixedt = 0
     let hasVisible = 0
-    XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+    XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       // 只支持一级
-      if (!parent) {
+      if (!parentColumn) {
         collectColumn.forEach((column: any) => {
           const colKey = column.getKey()
           if (colKey) {
@@ -2409,7 +2408,7 @@ const Methods = {
             sortData[colKey] = column.renderSortNumber
           }
         })
-        if (column.fixed && column.fixed !== column.defaultFixed) {
+        if (column.fixed !== column.defaultFixed) {
           const colKey = column.getKey()
           if (colKey) {
             hasFixedt = 1
@@ -2532,13 +2531,13 @@ const Methods = {
       const leftGroupList: any[] = []
       const centerGroupList: any[] = []
       const rightGroupList: any[] = []
-      XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+      XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
         const isColGroup = hasChildrenList(column)
         // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-        if (parent && parent.fixed) {
-          column.fixed = parent.fixed
+        if (parentColumn && parentColumn.fixed) {
+          column.fixed = parentColumn.fixed
         }
-        if (parent && column.fixed !== parent.fixed) {
+        if (parentColumn && column.fixed !== parentColumn.fixed) {
           errLog('vxe.error.groupFixed')
         }
         if (isColGroup) {
@@ -2716,20 +2715,28 @@ const Methods = {
    * 刷新布局
    */
   recalculate (reFull?: boolean) {
-    return new Promise<void>(resolve => {
-      const $xeTable = this
-      const internalData = $xeTable
+    const $xeTable = this
+    const internalData = $xeTable
 
-      const { rceTimeout } = internalData
-      const el = $xeTable.$refs.refElem
+    return new Promise<void>(resolve => {
+      const { rceTimeout, reRunTime } = internalData
+      const resizeOpts = $xeTable.computeResizeOpts
+      const refreshDelay = resizeOpts.refreshDelay || 20
+      const el = $xeTable.$refs.refElem as HTMLElement
       if (el && el.clientWidth) {
         $xeTable.autoCellWidth()
       }
       if (rceTimeout) {
         clearTimeout(rceTimeout)
-        $xeTable.$nextTick(() => {
-          resolve()
-        })
+        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+          resolve(
+            handleRecalculateLayout($xeTable, !!reFull)
+          )
+        } else {
+          $xeTable.$nextTick(() => {
+            resolve()
+          })
+        }
       } else {
         resolve(
           handleRecalculateLayout($xeTable, !!reFull)
@@ -2737,8 +2744,8 @@ const Methods = {
       }
       internalData.rceTimeout = setTimeout(() => {
         internalData.rceTimeout = undefined
-        resolve(handleRecalculateLayout($xeTable, !!reFull))
-      }, 20)
+        handleRecalculateLayout($xeTable, !!reFull)
+      }, refreshDelay)
     })
   },
   calcCellWidth () {
@@ -4740,7 +4747,9 @@ const Methods = {
   /**
    * 单选，行选中事件
    */
-  triggerRadioRowEvent (evnt: any, params: any) {
+  triggerRadioRowEvent (evnt: Event, params: {
+    row: any
+  }) {
     const { selectRadioRow: oldValue, radioOpts } = this
     const { row } = params
     const { trigger } = radioOpts
@@ -4763,7 +4772,9 @@ const Methods = {
       this.emitEvent('radio-change', { oldValue, newValue, ...params }, evnt)
     }
   },
-  triggerCurrentColumnEvent (evnt: any, params: any) {
+  triggerCurrentColumnEvent (evnt: Event, params: {
+    column: VxeTableDefines.ColumnInfo
+  }) {
     const $xeTable = this
 
     const columnOpts = $xeTable.computeColumnOpts
@@ -4773,7 +4784,7 @@ const Methods = {
       $xeTable.setCurrentColumn(column)
     }
   },
-  triggerCurrentRowEvent (evnt: any, params: any) {
+  triggerCurrentRowEvent (evnt: Event, params: any) {
     const $xeTable = this
     const reactData = $xeTable
 
@@ -4825,7 +4836,7 @@ const Methods = {
     }
     return false
   },
-  handleCheckedRadioRow (row: any, isForce: any) {
+  handleCheckedRadioRow (row: any, isForce?: boolean) {
     const { radioOpts } = this
     const { checkMethod } = radioOpts
     if (row && (isForce || (!checkMethod || checkMethod({ row })))) {
@@ -4886,7 +4897,7 @@ const Methods = {
   /**
    * 用于单选行，获取当已选中的数据
    */
-  getRadioRecord (isFull: any) {
+  getRadioRecord (isFull?: boolean) {
     const { selectRadioRow, fullDataRowIdData, afterFullRowMaps } = this
     if (selectRadioRow) {
       const rowid = getRowid(this, selectRadioRow)
@@ -4976,7 +4987,7 @@ const Methods = {
    * 当单元格发生改变时
    * 如果存在规则，则校验
    */
-  handleChangeCell (evnt: any, params: any) {
+  handleChangeCell (evnt: Event, params: any) {
     this.checkValidate('blur')
       .catch((e: any) => e)
       .then(() => {
@@ -4990,7 +5001,7 @@ const Methods = {
    * 如果是单击模式，则激活为编辑状态
    * 如果是双击模式，则单击后选中状态
    */
-  triggerCellClickEvent (evnt: any, params: any) {
+  triggerCellClickEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams) {
     const $xeTable = this
 
     const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, keyboardOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
@@ -5000,7 +5011,7 @@ const Methods = {
     const isRadioType = type === 'radio'
     const isCheckboxType = type === 'checkbox'
     const isExpandType = type === 'expand'
-    const cell = evnt.currentTarget
+    const cell = evnt.currentTarget as HTMLDivElement
     const triggerRadio = isRadioType && getEventTargetNode(evnt, cell, 'vxe-cell--radio').flag
     const triggerCheckbox = isCheckboxType && getEventTargetNode(evnt, cell, 'vxe-cell--checkbox').flag
     const triggerTreeNode = treeNode && getEventTargetNode(evnt, cell, 'vxe-tree--btn-wrapper').flag
@@ -5037,7 +5048,7 @@ const Methods = {
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
       if (isEnableConf(editConfig)) {
         // 记录点击输入框聚焦状态
-        if (keyboardOpts.arrowCursorLock && evnt && editOpts.mode === 'cell' && evnt.target && /^input|textarea$/i.test(evnt.target.tagName)) {
+        if (keyboardOpts.arrowCursorLock && evnt && editOpts.mode === 'cell' && evnt.target && /^input|textarea$/i.test((evnt.target as HTMLElement).tagName)) {
           focused.column = column
           focused.row = row
         }
@@ -5076,11 +5087,11 @@ const Methods = {
    * 列双击点击事件
    * 如果是双击模式，则激活为编辑状态
    */
-  triggerCellDblclickEvent (evnt: any, params: any) {
+  triggerCellDblclickEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams) {
     const { editStore, editConfig, editOpts } = this
     const { actived } = editStore
-    const cell = evnt.currentTarget
-    params.cell = cell
+    const cell = evnt.currentTarget as HTMLDivElement
+    params = Object.assign({ cell }, params)
     if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
@@ -5252,7 +5263,7 @@ const Methods = {
     const { treeConfig, dragConfig } = props
     const rowDragOpts = $xeTable.computeRowDragOpts
     const { fullAllDataRowIdData, prevDragToChild } = internalData
-    const { isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts
+    const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, rowField, mapChildrenField, parentField } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -5301,20 +5312,27 @@ const Methods = {
                 if (oldLevel && newLevel) {
                   // 子到子
 
-                  if (!isCrossDrag) {
-                    return
-                  }
-                  if (oldAllMaps[newRowid]) {
-                    isSelfToChildStatus = true
-                    if (!isSelfToChildDrag) {
-                      if (VxeUI.modal) {
-                        VxeUI.modal.message({
-                          status: 'error',
-                          content: getI18n('vxe.error.treeDragChild')
-                        })
-                      }
+                  if (isPeerDrag) {
+                    if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                      // 非同级
+                      return
+                    }
+                  } else {
+                    if (!isCrossDrag) {
                       return
                     }
+                    if (oldAllMaps[newRowid]) {
+                      isSelfToChildStatus = true
+                      if (!(isCrossDrag && isSelfToChildDrag)) {
+                        if (VxeUI.modal) {
+                          VxeUI.modal.message({
+                            status: 'error',
+                            content: getI18n('vxe.error.treeDragChild')
+                          })
+                        }
+                        return
+                      }
+                    }
                   }
                 } else if (oldLevel) {
                   // 子到根
@@ -5330,7 +5348,7 @@ const Methods = {
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true
-                    if (!isSelfToChildDrag) {
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
                       if (VxeUI.modal) {
                         VxeUI.modal.message({
                           status: 'error',
@@ -5356,7 +5374,7 @@ const Methods = {
                 fullList.splice(ntfIndex, 0, dragRow)
 
                 // 改变层级
-                if (isSelfToChildStatus && isSelfToChildDrag) {
+                if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                   XEUtils.each(dragRow[childrenField], childRow => {
                     childRow[parentField] = dragRow[parentField]
                   })
@@ -5435,9 +5453,9 @@ const Methods = {
     const { fullAllDataRowIdData } = internalData
     const { dragRow } = reactData
     const treeOpts = $xeTable.computeTreeOpts
-    const { transform } = treeOpts
+    const { transform, parentField } = treeOpts
     const rowDragOpts = $xeTable.computeRowDragOpts
-    const { isCrossDrag, isToChildDrag } = rowDragOpts
+    const { isPeerDrag, isCrossDrag, isToChildDrag } = rowDragOpts
     if (!dragRow) {
       evnt.preventDefault()
       return
@@ -5452,7 +5470,9 @@ const Methods = {
       const { dragRow } = reactData
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
-      if ($xeTable.eqRow(dragRow, row) || (!isCrossDrag && treeConfig && rest.level)) {
+      if ($xeTable.eqRow(dragRow, row) ||
+        (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))
+      ) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos)
         return
       }
@@ -5527,7 +5547,7 @@ const Methods = {
 
     const { mouseConfig } = props
     const columnDragOpts = $xeTable.computeColumnDragOpts
-    const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
+    const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
     const { collectColumn } = internalData
     const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0
     if (prevDragCol && dragCol) {
@@ -5562,20 +5582,28 @@ const Methods = {
           if (oldColumn.parentId && newColumn.parentId) {
             // 子到子
 
-            if (!isCrossDrag) {
-              return
-            }
-            if (oldAllMaps[newColumn.id]) {
-              isSelfToChildStatus = true
-              if (!isSelfToChildDrag) {
-                if (VxeUI.modal) {
-                  VxeUI.modal.message({
-                    status: 'error',
-                    content: getI18n('vxe.error.treeDragChild')
-                  })
-                }
+            if (isPeerDrag) {
+              if (oldColumn.parentId !== newColumn.parentId) {
+                // 非同级
                 return
               }
+            } else {
+              if (!isCrossDrag) {
+                return
+              }
+
+              if (oldAllMaps[newColumn.id]) {
+                isSelfToChildStatus = true
+                if (!(isCrossDrag && isSelfToChildDrag)) {
+                  if (VxeUI.modal) {
+                    VxeUI.modal.message({
+                      status: 'error',
+                      content: getI18n('vxe.error.treeDragChild')
+                    })
+                  }
+                  return
+                }
+              }
             }
           } else if (oldColumn.parentId) {
             // 子到根
@@ -5591,7 +5619,7 @@ const Methods = {
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true
-              if (!isSelfToChildDrag) {
+              if (!(isCrossDrag && isSelfToChildDrag)) {
                 if (VxeUI.modal) {
                   VxeUI.modal.message({
                     status: 'error',
@@ -5608,7 +5636,7 @@ const Methods = {
           const oldewMatchRest = XEUtils.findTree(collectColumn as VxeTableDefines.ColumnInfo[], item => item.id === oldColumn.id)
 
           // 改变层级
-          if (isSelfToChildStatus && isSelfToChildDrag) {
+          if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
             if (oldewMatchRest) {
               const { items: oCols, index: oIndex } = oldewMatchRest
               const childList = oldColumn.children || []
@@ -5632,7 +5660,7 @@ const Methods = {
           if (newMatchRest) {
             const { items: nCols, index: nIndex, parent: nParent } = newMatchRest
             // 转子级
-            if (isToChildDrag && prevDragToChild) {
+            if ((isCrossDrag && isToChildDrag) && prevDragToChild) {
               oldColumn.parentId = newColumn.id
               newColumn.children = (newColumn.children || []).concat([oldColumn])
             } else {
@@ -5644,8 +5672,8 @@ const Methods = {
             }
           }
 
-          XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-            if (!parent) {
+          XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            if (!parentColumn) {
               const sortIndex = index + 1
               column.renderSortNumber = sortIndex
             }
@@ -5709,7 +5737,7 @@ const Methods = {
 
     const { dragCol } = reactData
     const columnDragOpts = $xeTable.computeColumnDragOpts
-    const { isToChildDrag, isCrossDrag } = columnDragOpts
+    const { isToChildDrag, isPeerDrag, isCrossDrag } = columnDragOpts
     if (!dragCol) {
       evnt.preventDefault()
       return
@@ -5723,11 +5751,14 @@ const Methods = {
       const { clientX } = evnt
       const offsetX = clientX - thEl.getBoundingClientRect().x
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right'
-      if (column.fixed || (dragCol && dragCol.id === column.id) || (!isCrossDrag && column.parentId)) {
+      if (column.fixed ||
+        (dragCol && dragCol.id === column.id) ||
+        (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId))
+      ) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos)
         return
       }
-      internalData.prevDragToChild = !!(isToChildDrag && hasCtrlKey)
+      internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey)
       internalData.prevDragCol = column
       internalData.prevDragPos = dragPos
       showDropTip($xeTable, evnt, null, thEl, true, dragPos)
@@ -6584,7 +6615,7 @@ const Methods = {
    * @param expanded
    * @returns
    */
-  handleVirtualTreeExpand (rows: any, expanded: any) {
+  handleVirtualTreeExpand (rows: any[], expanded: boolean) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       this.handleVirtualTreeToList()
       this.handleTableData()
@@ -6604,7 +6635,7 @@ const Methods = {
    * @param {Array/Row} rows 行数据
    * @param {Boolean} expanded 是否展开
    */
-  setTreeExpand (rows: any, expanded: any) {
+  setTreeExpand (rows: any | any[], expanded: boolean) {
     const { treeOpts } = this
     const { transform } = treeOpts
     if (rows) {

package/packages/table/src/table.ts

@@ -498,6 +498,9 @@ export default {
       return 0
     },
     rowHeightMaps () {
+      return this.computeRowHeightMaps
+    },
+    computeRowHeightMaps () {
       return {
         default: 48,
         medium: 44,
@@ -1152,18 +1155,11 @@ export default {
       })
     }
     if (this.autoResize) {
-      const handleWrapperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null
-      const resizeObserver = globalResize.create(handleWrapperResize
-        ? () => {
-            if (this.autoResize) {
-              handleWrapperResize()
-            }
-          }
-        : () => {
-            if (this.autoResize) {
-              this.recalculate(true)
-            }
-          })
+      const resizeObserver = globalResize.create(() => {
+        if (this.autoResize) {
+          this.recalculate(true)
+        }
+      })
       resizeObserver.observe(this.$el)
       resizeObserver.observe(this.getParentElem())
       this.$resize = resizeObserver