vxe-table 3.12.10-beta.2 → 3.12.10-beta.21

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

@@ -77,7 +77,8 @@ export default {
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

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

@@ -77,7 +77,8 @@ export default {
       customRestore: '恢復預設',
       maxFixedCol: '最大凍結列的數量不能超過 {0} 個',
       dragTip: '移動：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '請至少選擇一筆記錄！',

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

@@ -77,7 +77,8 @@ export default {
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/table/module/edit/mixin.ts

@@ -30,7 +30,7 @@ function insertTreeRow (_vm: any, newRecords: any[], isAppend: any) {
       }
       parentChilds[funcName](item)
       mapChilds[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, oTop: 0 }
+      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     } else {
@@ -41,7 +41,7 @@ function insertTreeRow (_vm: any, newRecords: any[], isAppend: any) {
       }
       afterFullData[funcName](item)
       tableFullTreeData[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, oTop: 0 }
+      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     }
@@ -70,7 +70,7 @@ function handleInsertRowAt ($xeTable: any, records: any[], targetRow: any, isIns
     } else {
       newRecords.forEach(item => {
         const rowid = getRowid($xeTable, item)
-        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, oTop: 0 }
+        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0 }
         fullDataRowIdData[rowid] = rest
         fullAllDataRowIdData[rowid] = rest
         afterFullData.unshift(item)
@@ -92,7 +92,7 @@ function handleInsertRowAt ($xeTable: any, records: any[], targetRow: any, isIns
       } else {
         newRecords.forEach(item => {
           const rowid = getRowid($xeTable, item)
-          const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, oTop: 0 }
+          const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0 }
           fullDataRowIdData[rowid] = rest
           fullAllDataRowIdData[rowid] = rest
           afterFullData.push(item)
@@ -132,7 +132,7 @@ function handleInsertRowAt ($xeTable: any, records: any[], targetRow: any, isIns
               targetIndex = targetIndex + 1
             }
             parentMapChilds.splice(targetIndex, 0, item)
-            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, oTop: 0 }
+            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0 }
             fullDataRowIdData[rowid] = rest
             fullAllDataRowIdData[rowid] = rest
           })
@@ -199,7 +199,7 @@ function handleInsertRowAt ($xeTable: any, records: any[], targetRow: any, isIns
     const rowid = getRowid($xeTable, newRow)
     insertMaps[rowid] = newRow
   })
-  $xeTable.cacheRowMap()
+  $xeTable.cacheRowMap(false)
   $xeTable.updateScrollYStatus()
   $xeTable.handleTableData(treeConfig && transform)
   if (!(treeConfig && transform)) {
@@ -376,7 +376,7 @@ export default {
         }
       })
       $xeTable.updateFooter()
-      $xeTable.cacheRowMap()
+      $xeTable.cacheRowMap(false)
       $xeTable.handleTableData(treeConfig && transform)
       if (!(treeConfig && transform)) {
         $xeTable.updateAfterDataIndex()

package/packages/table/module/export/mixin.ts

@@ -984,6 +984,45 @@ export function readLocalFile (options: any = {}) {
   })
 }
 
+function handleFilterColumns (exportOpts: VxeTablePropTypes.ExportConfig, column: VxeTableDefines.ColumnInfo, columns: VxeTableDefines.ColumnInfo[] | VxeTablePropTypes.ExportOrPrintColumnOption[]) {
+  return columns.some((item: any) => {
+    if (isColumnInfo(item)) {
+      return column.id === (item as any).id
+    } else if (XEUtils.isString(item)) {
+      return column.field === item
+    } else {
+      const colid = item.id || item.colId
+      const type = item.type
+      const field = item.field
+      if (colid) {
+        return column.id === colid
+      } else if (field && type) {
+        return column.field === field && column.type === type
+      } else if (field) {
+        return column.field === field
+      } else if (type) {
+        return column.type === type
+      }
+    }
+    return false
+  })
+}
+
+function handleFilterFields (exportOpts: VxeTablePropTypes.ExportConfig, column: VxeTableDefines.ColumnInfo, includeFields: string[] | undefined, excludeFields: string[] | undefined) {
+  if (excludeFields) {
+    if (XEUtils.includes(excludeFields, column.field)) {
+      return false
+    }
+  }
+  if (includeFields) {
+    if (XEUtils.includes(includeFields, column.field)) {
+      return true
+    }
+    return false
+  }
+  return exportOpts.original ? column.field : defaultFilterExportColumn(column)
+}
+
 function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTablePropTypes.ExportOpts | VxeTablePropTypes.ExportConfig, isPrint?: any) {
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
@@ -1014,7 +1053,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const modes = defOpts.modes || []
   const checkMethod = customOpts.checkMethod
   const exportColumns = collectColumn.slice(0)
-  const { columns } = defOpts
+  const { columns, excludeFields, includeFields } = defOpts
   // 处理类型
   const typeList = types.map((value) => {
     return {
@@ -1037,33 +1076,17 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   // 默认选中
   XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
     const isColGroup = column.children && column.children.length
-    if (isColGroup || defaultFilterExportColumn(column)) {
-      column.checked = columns
-        ? columns.some((item: any) => {
-          if (isColumnInfo(item)) {
-            return column.id === (item as any).id
-          } else if (XEUtils.isString(item)) {
-            return column.field === item
-          } else {
-            const colid = item.id || item.colId
-            const type = item.type
-            const field = item.field
-            if (colid) {
-              return column.id === colid
-            } else if (field && type) {
-              return column.field === field && column.type === type
-            } else if (field) {
-              return column.field === field
-            } else if (type) {
-              return column.type === type
-            }
-          }
-          return false
-        })
-        : column.visible
-      column.halfChecked = false
-      column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false)
+    let isChecked = false
+    if (columns && columns.length) {
+      isChecked = handleFilterColumns(defOpts, column, columns)
+    } else if (excludeFields || includeFields) {
+      isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields)
+    } else {
+      isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column))
     }
+    column.checked = isChecked
+    column.halfChecked = false
+    column.disabled = (parent && parent.disabled) || (checkMethod ? !checkMethod({ column }) : false)
   })
   // 更新条件
   Object.assign(exportStore, {

package/packages/table/module/keyboard/mixin.ts

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils'
+import { getRefElem } from '../../src/util'
 import { browse, hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom'
 
 function getTargetOffset (target: any, container: any) {
@@ -24,33 +25,62 @@ function getTargetOffset (target: any, container: any) {
 }
 
 function getCheckboxRangeRows ($xeTable: any, evnt: MouseEvent, params: any, targetTrElem: HTMLElement, trRect: DOMRect, offsetClientTop: number, moveRange: number) {
+  const props = $xeTable
   const reactData = $xeTable
   const internalData = $xeTable
 
+  const { showOverflow } = props
+  const { fullAllDataRowIdData, isResizeCellHeight } = internalData
+  const rowOpts = $xeTable.computeRowOpts
+  const cellOpts = $xeTable.computeCellOpts
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight
+  const { row } = params
   let countHeight = 0
   let rangeRows: any[] = []
   let moveSize = 0
   const isDown = moveRange > 0
-  const { scrollYLoad, rowHeight } = reactData
+  const { scrollYLoad } = reactData
   const { afterFullData } = internalData
+  if (isDown) {
+    moveSize = offsetClientTop + moveRange
+  } else {
+    moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange)
+  }
   if (scrollYLoad) {
-    if (isDown) {
-      moveSize = offsetClientTop + moveRange
-    } else {
-      moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange)
-    }
-    const _rowIndex = $xeTable.getVTRowIndex(params.row)
-    if (isDown) {
-      rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / rowHeight))
+    const _rowIndex = $xeTable.getVTRowIndex(row)
+    const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height
+    if (!isCustomCellHeight && showOverflow) {
+      if (isDown) {
+        rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / defaultRowHeight))
+      } else {
+        rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / defaultRowHeight), _rowIndex + 1)
+      }
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / rowHeight), _rowIndex + 1)
+      if (isDown) {
+        for (let i = _rowIndex; i < afterFullData.length; i++) {
+          const item = afterFullData[i]
+          const rowid = $xeTable.getRowid(item)
+          const rowRest = fullAllDataRowIdData[rowid] || {}
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight
+          rangeRows.push(item)
+          if (countHeight > moveSize) {
+            return rangeRows
+          }
+        }
+      } else {
+        for (let len = _rowIndex; len >= 0; len--) {
+          const item = afterFullData[len]
+          const rowid = $xeTable.getRowid(item)
+          const rowRest = fullAllDataRowIdData[rowid] || {}
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight
+          rangeRows.push(item)
+          if (countHeight > moveSize) {
+            return rangeRows
+          }
+        }
+      }
     }
   } else {
-    if (isDown) {
-      moveSize = evnt.clientY - trRect.y
-    } else {
-      moveSize = trRect.y - evnt.clientY + trRect.height
-    }
     const siblingProp = isDown ? 'next' : 'previous'
     while (targetTrElem && countHeight < moveSize) {
       const rowNodeRest = $xeTable.getRowNode(targetTrElem)
@@ -203,16 +233,27 @@ export default {
     },
     handleCheckboxRangeEvent (evnt: any, params: any) {
       const $xeTable = this
+      const internalData = $xeTable
 
+      const { elemStore } = internalData
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+      const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
+      const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
       const { column, cell } = params
       if (column.type === 'checkbox') {
-        const { $el, elemStore } = this
+        let bodyWrapperElem = bodyScrollElem as HTMLElement
+        if (leftScrollElem && column.fixed === 'left') {
+          bodyWrapperElem = leftScrollElem
+        } else if (rightScrollElem && column.fixed === 'right') {
+          bodyWrapperElem = rightScrollElem
+        }
+        if (!bodyWrapperElem) {
+          return
+        }
+        const el = $xeTable.$refs.refElem as HTMLDivElement
         const disX = evnt.clientX
         const disY = evnt.clientY
-        const bodyWrapperElem = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper']
-        const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range')
-        const domMousemove = document.onmousemove
-        const domMouseup = document.onmouseup
+        const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range') as HTMLElement
         const trElem = cell.parentNode
         const selectRecords = this.getCheckboxRecords()
         let lastRangeRows = []
@@ -312,7 +353,7 @@ export default {
             }
           }, 50)
         }
-        addClass($el, 'drag--range')
+        addClass(el, 'drag--range')
         document.onmousemove = evnt => {
           evnt.preventDefault()
           evnt.stopPropagation()
@@ -338,10 +379,10 @@ export default {
         }
         document.onmouseup = (evnt) => {
           stopMouseScroll()
-          removeClass($el, 'drag--range')
+          removeClass(el, 'drag--range')
           checkboxRangeElem.removeAttribute('style')
-          document.onmousemove = domMousemove
-          document.onmouseup = domMouseup
+          document.onmousemove = null
+          document.onmouseup = null
           triggerEvent('end', evnt)
         }
         triggerEvent('start', evnt)

package/packages/table/module/menu/mixin.ts

@@ -55,6 +55,9 @@ export default {
      * 快捷菜单事件处理
      */
     handleGlobalContextmenuEvent (evnt: any) {
+      const $xeTable = this
+      const internalData = $xeTable
+
       const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this
       const { selected } = editStore
       const layoutList = ['header', 'body', 'footer']
@@ -63,7 +66,7 @@ export default {
           evnt.preventDefault()
           return
         }
-        if (this._keyCtx) {
+        if (internalData._keyCtx) {
           const type = 'body'
           const params: any = { type, $grid: this.$xegrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt }
           // 如果开启单元格区域