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

package/es/table/src/table.js

@@ -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';
@@ -18,6 +18,7 @@ import TableImportPanelComponent from '../module/export/import-panel';
 import TableExportPanelComponent from '../module/export/export-panel';
 import TableMenuPanelComponent from '../module/menu/panel';
 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;
@@ -2246,6 +2247,7 @@ 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 = {};
@@ -2287,7 +2289,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 });
                     }
@@ -2298,7 +2301,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;
                                 }
@@ -2315,7 +2318,7 @@ 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;
                                 }
@@ -2323,7 +2326,8 @@ export default defineComponent({
                         }
                         else {
                             afterFullData.forEach(row => {
-                                selectRowMaps[getRowid($xeTable, row)] = row;
+                                const rowid = handleGetRowId(row);
+                                selectRowMaps[rowid] = row;
                             });
                         }
                     }
@@ -2335,7 +2339,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;
                                 }
@@ -2661,6 +2665,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) {
                     // 树结构自动转换
@@ -3147,9 +3154,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);
             }
@@ -5205,7 +5212,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();
             },
@@ -6867,12 +6880,10 @@ 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 = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
                 const fullDataRowIdMaps = {};
                 const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-                const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+                const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
                 const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
                     let rowRest = fullAllDataRowIdMaps[rowid];
                     if (!rowRest) {
@@ -6893,7 +6904,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) {
@@ -6910,7 +6921,7 @@ export default defineComponent({
                 }
                 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);
                     });
                 }
                 internalData.fullDataRowIdData = fullDataRowIdMaps;
@@ -6920,17 +6931,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 = {};
                 const handleSourceRow = (row) => {
-                    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) {
@@ -6940,6 +6946,7 @@ export default defineComponent({
                 else {
                     sourceData.forEach(handleSourceRow);
                 }
+                internalData.sourceDataRowIdData = sourceRowIdData;
                 internalData.tableSourceData = sourceData;
             },
             /**
@@ -7432,10 +7439,11 @@ export default defineComponent({
                 }
                 // 树结构
                 if (treeConfig) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     const childRowMaps = {};
                     const childRowList = [];
                     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;
@@ -7451,7 +7459,7 @@ export default defineComponent({
                         let vLen = 0; // 有效行
                         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) {
@@ -7472,7 +7480,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++;
@@ -7521,13 +7529,14 @@ 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; // 半选
                 let vLen = 0; // 有效行
                 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) {
@@ -7548,7 +7557,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++;
@@ -7584,6 +7593,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) {
@@ -7618,7 +7628,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;
@@ -7636,7 +7646,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]) {
@@ -7945,36 +7955,38 @@ export default defineComponent({
                 }
             },
             triggerCheckRowEvent(evnt, 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/es/table/src/util.js

@@ -99,23 +99,51 @@ export function getRowid($xeTable, row) {
     const rowid = XEUtils.get(row, getRowkey($xeTable));
     return encodeRowid(rowid);
 }
+export function createHandleUpdateRowId($xeTable) {
+    const rowKey = getRowkey($xeTable);
+    const isDeepKey = rowKey.indexOf('.') > -1;
+    const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+    return {
+        rowKey,
+        handleUpdateRowId(row) {
+            return updateRId(row, rowKey);
+        }
+    };
+}
+export function createHandleGetRowId($xeTable) {
+    const rowKey = getRowkey($xeTable);
+    const isDeepKey = rowKey.indexOf('.') > -1;
+    const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey;
+    return {
+        rowKey,
+        handleGetRowId(row) {
+            return getRId(row, rowKey);
+        }
+    };
+}
 // 编码行主键
 export function encodeRowid(rowVal) {
     return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
 }
-export function updateDeepRowKey(row, rowkey) {
-    let rowid = XEUtils.get(row, rowkey);
+function getDeepRowIdByKey(row, rowKey) {
+    return XEUtils.get(row, rowKey);
+}
+export function updateDeepRowKey(row, rowKey) {
+    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, rowkey) {
-    let rowid = row[rowkey];
+function getFastRowIdByKey(row, rowKey) {
+    return row[rowKey];
+}
+export function updateFastRowKey(row, rowKey) {
+    let rowid = getFastRowIdByKey(row, rowKey);
     if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId();
-        row[rowkey] = rowid;
+        row[rowKey] = rowid;
     }
     return rowid;
 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.19";
+export const version = "4.12.0-beta.20";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.12.0-beta.19"}`;
+const version = `table v${"4.12.0-beta.20"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);