vxe-table 4.17.27 → 4.17.28

package/packages/locale/lang/ms-MY.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/nb-NO.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/pt-BR.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/ru-RU.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: 'Нет данных!'
     },
     tree: {
-      searchEmpty: 'Нет данных!'
+      searchEmpty: 'Нет данных!',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: 'Прозрачный',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/th-TH.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/ug-CN.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/uk-UA.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/uz-UZ.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/vi-VN.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: 'Không có dữ liệu phù hợp!'
     },
     tree: {
-      searchEmpty: 'Không có dữ liệu phù hợp!'
+      searchEmpty: 'Không có dữ liệu phù hợp!',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: 'Thông thoáng',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/zh-CHT.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到數據！'
     },
     tree: {
-      searchEmpty: '未匹配到數據！'
+      searchEmpty: '未匹配到數據！',
+      dragTip: '移動：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,22 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/locale/lang/zh-CN.ts

@@ -113,7 +113,8 @@ export default {
       searchEmpty: '未匹配到数据！'
     },
     tree: {
-      searchEmpty: '未匹配到数据！'
+      searchEmpty: '未匹配到数据！',
+      dragTip: '移动：{0}'
     },
     treeSelect: {
       clearChecked: '清除',
@@ -540,24 +541,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{E}日',
-        date: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
         date: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/table/src/table.ts

@@ -6,7 +6,7 @@ import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf,
 import { VxeUI } from '../../ui'
 import { createInternalData, getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
-import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime'
+import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime'
 import { warnLog, errLog } from '../../ui/src/log'
 import { getCrossTableDragRowInfo } from './store'
 import Cell from './cell'
@@ -5463,7 +5463,7 @@ export default defineVxeComponent({
               cellLabel = `${formatter(formatParams)}`
             }
           } else if (renderOpts && tcFormatter) {
-            cellLabel = `${tcFormatter(renderOpts, formatParams)}`
+            cellLabel = tcFormatter(renderOpts, formatParams)
           }
           if (formatData) {
             formatData[colid] = { value: cellValue, label: cellLabel }
@@ -10542,8 +10542,6 @@ export default defineVxeComponent({
           const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
           return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
             if (!status) {
-              clearRowDragData()
-              clearCrossTableDragStatus()
               return errRest
             }
 
@@ -10711,6 +10709,7 @@ export default defineVxeComponent({
             return nextTick().then(() => {
               if (animation) {
                 const { tableData } = reactData
+                const { fullAllDataRowIdData } = internalData
                 const dragRowRest = fullAllDataRowIdData[dragRowid]
                 const _newRowIndex = dragRowRest._index
                 const firstRow = tableData[0]
@@ -10791,6 +10790,10 @@ export default defineVxeComponent({
             })
           }).catch(() => {
             return errRest
+          }).then((rest) => {
+            clearRowDragData()
+            clearCrossTableDragStatus()
+            return rest
           })
         }
         clearRowDragData()
@@ -11078,12 +11081,10 @@ export default defineVxeComponent({
         const isControlKey = hasControlKey(evnt)
         const trEl = evnt.currentTarget as HTMLElement
         const rowid = trEl.getAttribute('rowid') || ''
-        const rest = fullAllDataRowIdData[rowid]
-        if (rest) {
+        const rowRest = fullAllDataRowIdData[rowid]
+        if (rowRest) {
           evnt.preventDefault()
-          const row = rest.row
-          const rowid = getRowid($xeTable, row)
-          const rowRest = fullAllDataRowIdData[rowid]
+          const row = rowRest.row
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
           internalData.prevDragToChild = !!(treeConfig && transform && (isCrossDrag && isToChildDrag) && isControlKey)
@@ -11116,7 +11117,7 @@ export default defineVxeComponent({
           }
           if ($xeTable.eqRow(dragRow, row) ||
             (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
-            (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))
+            (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))
           ) {
             showDropTip(evnt, trEl, null, false, dragPos)
             return
@@ -11206,8 +11207,6 @@ export default defineVxeComponent({
           const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
           return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
             if (!status) {
-              clearColDragData()
-              clearCrossTableDragStatus()
               return errRest
             }
 
@@ -11357,9 +11356,6 @@ export default defineVxeComponent({
               }
             }
 
-            clearColDragData()
-            clearCrossTableDragStatus()
-
             if (evnt) {
               dispatchEvent('column-dragend', {
                 oldColumn: dragColumn,
@@ -11468,6 +11464,10 @@ export default defineVxeComponent({
             })
           }).catch(() => {
             return errRest
+          }).then((rest) => {
+            clearColDragData()
+            clearCrossTableDragStatus()
+            return rest
           })
         }
         clearColDragData()
@@ -12247,12 +12247,15 @@ export default defineVxeComponent({
               const lastRow = afterFullData[afterFullData.length - 1]
               rowid = getRowid($xeTable, lastRow)
               rowRest = fullAllDataRowIdData[rowid] || {}
-              // 如果为空时还没计算完数据，保持原高度不变
-              if (rowRest.oTop) {
-                sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
-                // 是否展开行
-                if (expandColumn && rowExpandedMaps[rowid]) {
-                  sYHeight += rowRest.expandHeight || expandOpts.height || 0
+              if (rowRest) {
+                const rHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
+                // 如果为空时还没计算完数据，保持原高度不变
+                if (rHeight) {
+                  sYHeight = (rowRest.oTop || 0) + rHeight
+                  // 是否展开行
+                  if (expandColumn && rowExpandedMaps[rowid]) {
+                    sYHeight += rowRest.expandHeight || expandOpts.height || 0
+                  }
                 }
               }
               if (sYHeight > maxYHeight) {

package/packages/{table → ui}/src/anime.ts

@@ -1,6 +1,6 @@
 
 import XEUtils from 'xe-utils'
-import { addClass, removeClass } from '../../ui/src/dom'
+import { addClass, removeClass } from './dom'
 
 const rowMoveCls = 'row--drag-move'
 const colMoveClass = 'col--drag-move'