vxe-table 4.17.26 → 4.17.28

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'
@@ -527,10 +527,10 @@ export default defineVxeComponent({
       const cellOpts = computeCellOpts.value
       let headCellHeight = XEUtils.toNumber(getCalcHeight(headerCellOpts.height || cellOpts.height))
       if ($xeGantt) {
-        const { computeTaskScaleConfs } = $xeGantt.getComputeMaps()
-        const taskScaleConfs = computeTaskScaleConfs.value
-        if (taskScaleConfs && taskScaleConfs.length > 2) {
-          const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskScaleConfs.length
+        const { computeTaskViewScales } = $xeGantt.getComputeMaps()
+        const taskViewScales = computeTaskViewScales.value
+        if (taskViewScales && taskViewScales.length > 2) {
+          const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskViewScales.length
           headCellHeight = Math.max(ganttMinHeadCellHeight, headCellHeight)
         }
       }
@@ -4719,20 +4719,28 @@ export default defineVxeComponent({
       $xeTable.analyColumnWidth()
       $xeTable.recalculate().then(() => {
         $xeTable.saveCustomStore('update:width')
-        $xeTable.updateCellAreas()
+        $xeTable.refreshScroll().then(() => {
+          $xeTable.updateCellAreas()
+        })
         $xeTable.dispatchEvent('column-resizable-change', params, evnt)
         // 已废弃 resizable-change
         $xeTable.dispatchEvent('resizable-change', params, evnt)
-        setTimeout(() => $xeTable.recalculate(true), 300)
+        setTimeout(() => {
+          $xeTable.recalculate(true)
+        }, 300)
       })
     }
 
     const handleUpdateRowResize = (evnt: MouseEvent, params: any) => {
       reactData.resizeHeightFlag++
       $xeTable.recalculate().then(() => {
-        $xeTable.updateCellAreas()
+        $xeTable.refreshScroll().then(() => {
+          $xeTable.updateCellAreas()
+        })
         $xeTable.dispatchEvent('row-resizable-change', params, evnt)
-        setTimeout(() => $xeTable.recalculate(true), 300)
+        setTimeout(() => {
+          $xeTable.recalculate(true)
+        }, 300)
       })
     }
 
@@ -5455,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 }
@@ -10534,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
             }
 
@@ -10703,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]
@@ -10783,6 +10790,10 @@ export default defineVxeComponent({
             })
           }).catch(() => {
             return errRest
+          }).then((rest) => {
+            clearRowDragData()
+            clearCrossTableDragStatus()
+            return rest
           })
         }
         clearRowDragData()
@@ -11070,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)
@@ -11108,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
@@ -11198,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
             }
 
@@ -11349,9 +11356,6 @@ export default defineVxeComponent({
               }
             }
 
-            clearColDragData()
-            clearCrossTableDragStatus()
-
             if (evnt) {
               dispatchEvent('column-dragend', {
                 oldColumn: dragColumn,
@@ -11460,6 +11464,10 @@ export default defineVxeComponent({
             })
           }).catch(() => {
             return errRest
+          }).then((rest) => {
+            clearColDragData()
+            clearCrossTableDragStatus()
+            return rest
           })
         }
         clearColDragData()
@@ -12239,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'

package/lib/table/src/anime.min.js

@@ -1 +0,0 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.clearColAnimate=clearColAnimate,exports.clearRowAnimate=clearRowAnimate,exports.moveColAnimateToLr=moveColAnimateToLr,exports.moveRowAnimateToTb=moveRowAnimateToTb;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let rowMoveCls="row--drag-move",colMoveClass="col--drag-move";function moveRowAnimateToTb(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateY(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,rowMoveCls),e.style.transform=""})})}function clearRowAnimate(e,o){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(o.map(e=>e+"."+rowMoveCls).join(",")),e=>(0,_dom.removeClass)(e,rowMoveCls))},500)}function moveColAnimateToLr(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateX(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,colMoveClass),e.style.transform=""})})}function clearColAnimate(e,o){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(o.map(e=>e+"."+rowMoveCls).join(",")),e=>(0,_dom.removeClass)(e,colMoveClass))},500)}