vxe-table 3.19.27 → 3.19.28

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/cell.ts

@@ -723,7 +723,7 @@ export const Cell = {
     const colTitle = column.getTitle()
     const ons: Record<string, any> = {}
     if (!isHidden) {
-      ons.click = (evnt: any) => {
+      ons.click = (evnt: MouseEvent) => {
         if (!isAllCheckboxDisabled) {
           $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected)
         }
@@ -801,7 +801,7 @@ export const Cell = {
       if (treeConfig || isRowGroupStatus) {
         indeterminate = !!treeIndeterminateRowMaps[rowid]
       }
-      ons.click = (evnt: any) => {
+      ons.click = (evnt: MouseEvent) => {
         if (!isDisabled && isVisible) {
           $table.triggerCheckRowEvent(evnt, params, !isChecked)
         }
@@ -877,7 +877,7 @@ export const Cell = {
       if (treeConfig || isRowGroupStatus) {
         indeterminate = !!treeIndeterminateRowMaps[rowid]
       }
-      ons.click = (evnt: any) => {
+      ons.click = (evnt: MouseEvent) => {
         if (!isDisabled && isVisible) {
           $table.triggerCheckRowEvent(evnt, params, !isChecked)
         }

package/packages/table/src/methods.ts

@@ -5,7 +5,7 @@ import { VxeUI } from '../../ui'
 import Cell from './cell'
 import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, 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'
 
@@ -5273,7 +5273,7 @@ const tableMethods: any = {
           cellLabel = formatter(formatParams)
         }
       } else if (renderOpts && tcFormatter) {
-        cellLabel = `${tcFormatter(renderOpts, formatParams)}`
+        cellLabel = tcFormatter(renderOpts, formatParams)
       }
       if (formatData) {
         formatData[colid] = { value: cellValue, label: cellLabel }
@@ -9029,8 +9029,6 @@ const tableMethods: any = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
       return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
         if (!status) {
-          clearRowDragData($xeTable)
-          clearCrossTableDragStatus($xeTable)
           return errRest
         }
 
@@ -9166,8 +9164,6 @@ const tableMethods: any = {
           afterFullData.splice(nafIndex, 0, dragRow)
           tableFullData.splice(ntfIndex, 0, dragRow)
         }
-        clearRowDragData($xeTable)
-        clearCrossTableDragStatus($xeTable)
 
         $xeTable.handleTableData(treeConfig && transform)
         $xeTable.cacheRowMap(false)
@@ -9198,6 +9194,7 @@ const tableMethods: any = {
         return $xeTable.$nextTick().then(() => {
           if (animation) {
             const { tableData } = reactData
+            const { fullAllDataRowIdData } = internalData
             const dragRowRest = fullAllDataRowIdData[dragRowid]
             const _newRowIndex = dragRowRest._index
             const firstRow = tableData[0]
@@ -9276,6 +9273,10 @@ const tableMethods: any = {
         })
       }).catch(() => {
         return errRest
+      }).then((rest) => {
+        clearRowDragData($xeTable)
+        clearCrossTableDragStatus($xeTable)
+        return rest
       })
     }
     clearRowDragData($xeTable)
@@ -9594,12 +9595,10 @@ const tableMethods: any = {
     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)
@@ -9632,7 +9631,7 @@ const tableMethods: any = {
       }
       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($xeTable, evnt, trEl, null, false, dragPos)
         return
@@ -9740,8 +9739,6 @@ const tableMethods: any = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
       return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
         if (!status) {
-          clearColDragData($xeTable)
-          clearCrossTableDragStatus($xeTable)
           return errRest
         }
 
@@ -9891,9 +9888,6 @@ const tableMethods: any = {
           }
         }
 
-        clearColDragData($xeTable)
-        clearCrossTableDragStatus($xeTable)
-
         if (evnt) {
           $xeTable.dispatchEvent('column-dragend', {
             oldColumn: dragColumn,
@@ -10002,6 +9996,10 @@ const tableMethods: any = {
         })
       }).catch(() => {
         return errRest
+      }).then((rest) => {
+        clearColDragData($xeTable)
+        clearCrossTableDragStatus($xeTable)
+        return rest
       })
     }
     clearColDragData($xeTable)
@@ -11954,12 +11952,15 @@ const tableMethods: any = {
           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/src/table.ts

@@ -1504,8 +1504,16 @@ export default {
     /**
      * 判断列全选的复选框是否禁用
      */
-    isAllCheckboxDisabled () {
-      const { tableFullData, tableData, treeConfig, checkboxOpts } = this
+    computeIsAllCheckboxDisabled () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
+
+      const { treeConfig } = props
+      const { tableData } = reactData
+      const { tableFullData } = internalData
+      const checkboxOpts = $xeTable.computeCheckboxOpts
       const { strict, checkMethod } = checkboxOpts
       if (strict) {
         if (tableData.length || tableFullData.length) {
@@ -1514,7 +1522,7 @@ export default {
               // 暂时不支持树形结构
             }
             // 如果所有行都被禁用
-            return tableFullData.every((row: any) => !checkMethod({ row }))
+            return tableFullData.every((row) => !checkMethod({ $table: $xeTable, row }))
           }
           return false
         }
@@ -1522,6 +1530,9 @@ export default {
       }
       return false
     },
+    isAllCheckboxDisabled () {
+      return this.computeIsAllCheckboxDisabled
+    },
     computeVirtualScrollBars () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const reactData = $xeTable as unknown as TableReactData