vxe-table 4.12.0-beta.19 → 4.12.0-beta.20

package/packages/table/src/table.ts

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
 import tableProps from './props'
 import tableEmits from './emits'
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, updateDeepRowKey, updateFastRowKey } from './util'
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 import TableCustomPanelComponent from '../module/custom/panel'
@@ -23,6 +23,7 @@ import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, Ta
 
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
+const supportMaxRow = 5e6
 const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
@@ -2377,9 +2378,11 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       const checkboxOpts = computeCheckboxOpts.value
       const { checkField, reserve, checkMethod } = checkboxOpts
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
       const selectRowMaps: Record<string, any> = {}
+
       /**
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
@@ -2416,7 +2419,8 @@ export default defineComponent({
                */
             XEUtils.eachTree(afterFullData, (row) => {
               if (isForce || (!checkMethod || checkMethod({ row }))) {
-                selectRowMaps[getRowid($xeTable, row)] = row
+                const rowid = handleGetRowId(row)
+                selectRowMaps[rowid] = row
               }
             }, { children: childrenField })
           } else {
@@ -2426,7 +2430,7 @@ export default defineComponent({
                */
             if (!isForce && checkMethod) {
               XEUtils.eachTree(afterFullData, (row) => {
-                const rowid = getRowid($xeTable, row)
+                const rowid = handleGetRowId(row)
                 if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                   selectRowMaps[rowid] = row
                 }
@@ -2442,14 +2446,15 @@ export default defineComponent({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach((row) => {
-                const rowid = getRowid($xeTable, row)
+                const rowid = handleGetRowId(row)
                 if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
                   selectRowMaps[rowid] = row
                 }
               })
             } else {
               afterFullData.forEach(row => {
-                selectRowMaps[getRowid($xeTable, row)] = row
+                const rowid = handleGetRowId(row)
+                selectRowMaps[rowid] = row
               })
             }
           } else {
@@ -2460,7 +2465,7 @@ export default defineComponent({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach((row) => {
-                const rowid = getRowid($xeTable, row)
+                const rowid = handleGetRowId(row)
                 if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                   selectRowMaps[rowid] = row
                 }
@@ -2792,6 +2797,9 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       let treeData = []
       let fullData = reactive(datas ? datas.slice(0) : []) // 转为响应式数据
+      if (fullData.length > supportMaxRow) {
+        errLog('vxe.error.errMaxRow', [supportMaxRow])
+      }
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
@@ -3286,9 +3294,9 @@ export default defineComponent({
       handleCheckedAllCheckboxRow(value)
       if (evnt) {
         dispatchEvent('checkbox-all', {
-          records: $xeTable.getCheckboxRecords(),
-          reserves: $xeTable.getCheckboxReserveRecords(),
-          indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+          records: () => $xeTable.getCheckboxRecords(),
+          reserves: () => $xeTable.getCheckboxReserveRecords(),
+          indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
           checked: value
         }, evnt)
       }
@@ -5339,7 +5347,13 @@ export default defineComponent({
           visible: false
         })
         if (visible) {
-          dispatchEvent('filter-visible', { column, property: column.field, field: column.field, filterList: $xeTable.getCheckedFilters(), visible: false }, null)
+          dispatchEvent('filter-visible', {
+            column,
+            property: column.field,
+            field: column.field,
+            filterList: () => $xeTable.getCheckedFilters(),
+            visible: false
+          }, null)
         }
         return nextTick()
       },
@@ -6983,13 +6997,11 @@ export default defineComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
         const { lazy } = treeOpts
-        const rowkey = getRowkey($xeTable)
-        const isDeepKey = rowkey.indexOf('.') > -1
         const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
         const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
         const treeTempExpandedMaps = { ...treeExpandedMaps }
 
-        const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
         const handleRowCache = (row: any, index: number, items: any, currIndex: number, parentRow: any, rowid: string, level: number, seq: string | number) => {
           let rowRest = fullAllDataRowIdMaps[rowid]
           if (!rowRest) {
@@ -7013,7 +7025,7 @@ export default defineComponent({
 
         if (treeConfig) {
           XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
-            const rowid = handleRowId(row, rowkey)
+            const rowid = handleUpdateRowId(row)
             if (treeConfig && lazy) {
               const treeExpRest = treeTempExpandedMaps[rowid]
               if (row[hasChildField] && row[childrenField] === undefined) {
@@ -7029,7 +7041,7 @@ export default defineComponent({
           }, { children: childrenField })
         } else {
           tableFullData.forEach((row, index, items) => {
-            handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1)
+            handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1)
           })
         }
 
@@ -7040,17 +7052,12 @@ export default defineComponent({
       cacheSourceMap (fullData) {
         const { treeConfig } = props
         const treeOpts = computeTreeOpts.value
-        let { sourceDataRowIdData } = internalData
         const sourceData = XEUtils.clone(fullData, true)
-        const rowkey = getRowkey($xeTable)
-        sourceDataRowIdData = internalData.sourceDataRowIdData = {}
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
+        const sourceRowIdData: Record<string, any> = {}
         const handleSourceRow = (row: any) => {
-          let rowid = getRowid($xeTable, row)
-          if (eqEmptyValue(rowid)) {
-            rowid = getRowUniqueId()
-            XEUtils.set(row, rowkey, rowid)
-          }
-          sourceDataRowIdData[rowid] = row
+          const rowid = handleUpdateRowId(row)
+          sourceRowIdData[rowid] = row
         }
         // 源数据缓存
         if (treeConfig) {
@@ -7059,6 +7066,7 @@ export default defineComponent({
         } else {
           sourceData.forEach(handleSourceRow)
         }
+        internalData.sourceDataRowIdData = sourceRowIdData
         internalData.tableSourceData = sourceData
       },
       /**
@@ -7545,10 +7553,11 @@ export default defineComponent({
         }
         // 树结构
         if (treeConfig) {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
           const childRowMaps: Record<string, number> = {}
           const childRowList: any[][] = []
           XEUtils.eachTree(afterTreeFullData, (row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             const childList = row[transform ? mapChildrenField : childrenField]
             if (childList && childList.length && !childRowMaps[rowid]) {
               childRowMaps[rowid] = 1
@@ -7565,7 +7574,7 @@ export default defineComponent({
             childList.forEach(
               checkMethod
                 ? (item) => {
-                    const childRowid = getRowid($xeTable, item)
+                    const childRowid = handleGetRowId(item)
                     const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
                     if (checkMethod({ row: item })) {
                       if (isSelect) {
@@ -7583,7 +7592,7 @@ export default defineComponent({
                     }
                   }
                 : item => {
-                  const childRowid = getRowid($xeTable, item)
+                  const childRowid = handleGetRowId(item)
                   const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
                   if (isSelect) {
                     sLen++
@@ -7630,6 +7639,7 @@ export default defineComponent({
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts
         const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
 
         let sLen = 0 // 已选
         let hLen = 0 // 半选
@@ -7638,7 +7648,7 @@ export default defineComponent({
         const rootList = (treeConfig ? afterTreeFullData : afterFullData)
         rootList.forEach(checkMethod
           ? row => {
-            const childRowid = getRowid($xeTable, row)
+            const childRowid = handleGetRowId(row)
             const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
             if (checkMethod({ row })) {
               if (selected) {
@@ -7656,7 +7666,7 @@ export default defineComponent({
             }
           }
           : row => {
-            const childRowid = getRowid($xeTable, row)
+            const childRowid = handleGetRowId(row)
             const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
             if (selected) {
               sLen++
@@ -7694,6 +7704,7 @@ export default defineComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkStrictly, checkMethod } = checkboxOpts
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
         if (checkField) {
@@ -7728,7 +7739,7 @@ export default defineComponent({
         if (treeConfig && !checkStrictly) {
           // 更新子节点状态
           XEUtils.eachTree(rows, (row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             if (isForce || (!checkMethod || checkMethod({ row }))) {
               if (checked) {
                 selectRowMaps[rowid] = row
@@ -7746,7 +7757,7 @@ export default defineComponent({
 
         // 列表
         rows.forEach(row => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           if (isForce || (!checkMethod || checkMethod({ row }))) {
             if (checked) {
               if (!selectRowMaps[rowid]) {
@@ -8047,36 +8058,38 @@ export default defineComponent({
         }
       },
       triggerCheckRowEvent (evnt: MouseEvent, params, checked) {
-        const checkboxOpts = computeCheckboxOpts.value
         const { row } = params
         const { afterFullData } = internalData
+        const checkboxOpts = computeCheckboxOpts.value
         const { checkMethod, trigger } = checkboxOpts
         if (trigger === 'manual') {
           return
         }
         evnt.stopPropagation()
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
-          const checkboxRecords = tableMethods.getCheckboxRecords()
+          const checkboxRecords = $xeTable.getCheckboxRecords()
           if (checkboxRecords.length) {
             const firstRow = checkboxRecords[0]
-            const _rowIndex = tableMethods.getVTRowIndex(row)
-            const _firstRowIndex = tableMethods.getVTRowIndex(firstRow)
+            const _rowIndex = $xeTable.getVTRowIndex(row)
+            const _firstRowIndex = $xeTable.getVTRowIndex(firstRow)
             if (_rowIndex !== _firstRowIndex) {
-              tableMethods.setAllCheckboxRow(false)
+              $xeTable.setAllCheckboxRow(false)
               const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1)
-              handleCheckedCheckboxRow(rangeRows, true, false)
+              nextTick(() => {
+                handleCheckedCheckboxRow(rangeRows, true, false)
+              })
               dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
               return
             }
           }
         }
         if (!checkMethod || checkMethod({ row })) {
-          tablePrivateMethods.handleBatchSelectRows([row], checked)
-          tablePrivateMethods.checkSelectionStatus()
+          $xeTable.handleBatchSelectRows([row], checked)
+          $xeTable.checkSelectionStatus()
           dispatchEvent('checkbox-change', Object.assign({
-            records: tableMethods.getCheckboxRecords(),
-            reserves: tableMethods.getCheckboxReserveRecords(),
-            indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+            records: () => $xeTable.getCheckboxRecords(),
+            reserves: () => $xeTable.getCheckboxReserveRecords(),
+            indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
             checked
           }, params), evnt)
         }

package/packages/table/src/util.ts

@@ -112,25 +112,57 @@ export function getRowid ($xeTable: VxeTableConstructor, row: any) {
   return encodeRowid(rowid)
 }
 
+export function createHandleUpdateRowId ($xeTable: VxeTableConstructor) {
+  const rowKey = getRowkey($xeTable)
+  const isDeepKey = rowKey.indexOf('.') > -1
+  const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey
+  return {
+    rowKey,
+    handleUpdateRowId (row: any) {
+      return updateRId(row, rowKey)
+    }
+  }
+}
+
+export function createHandleGetRowId ($xeTable: VxeTableConstructor) {
+  const rowKey = getRowkey($xeTable)
+  const isDeepKey = rowKey.indexOf('.') > -1
+  const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey
+  return {
+    rowKey,
+    handleGetRowId (row: any) {
+      return getRId(row, rowKey)
+    }
+  }
+}
+
 // 编码行主键
 export function encodeRowid (rowVal: string) {
   return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal)
 }
 
-export function updateDeepRowKey (row: any, rowkey: string) {
-  let rowid = XEUtils.get(row, rowkey)
+function getDeepRowIdByKey (row: any, rowKey: string) {
+  return XEUtils.get(row, rowKey)
+}
+
+export function updateDeepRowKey (row: any, rowKey: string) {
+  let rowid = getDeepRowIdByKey(row, rowKey)
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId()
-    XEUtils.set(row, rowkey, rowid)
+    XEUtils.set(row, rowKey, rowid)
   }
   return rowid
 }
 
-export function updateFastRowKey (row: any, rowkey: string) {
-  let rowid = row[rowkey]
+function getFastRowIdByKey (row: any, rowKey: string) {
+  return row[rowKey]
+}
+
+export function updateFastRowKey (row: any, rowKey: string) {
+  let rowid = getFastRowIdByKey(row, rowKey)
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId()
-    row[rowkey] = rowid
+    row[rowKey] = rowid
   }
   return rowid
 }