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

package/lib/table/src/table.js

@@ -39,6 +39,7 @@ const {
   useFns,
   renderEmptyElement
 } = _ui.VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -2636,6 +2637,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reserve,
         checkMethod
       } = checkboxOpts;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
@@ -2681,7 +2685,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (isForce || !checkMethod || checkMethod({
                 row
               })) {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               }
             }, {
               children: childrenField
@@ -2693,7 +2698,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               _xeUtils.default.eachTree(afterFullData, row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -2713,7 +2718,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (selectCheckboxMaps[rowid] || checkMethod({
                   row
                 })) {
@@ -2722,7 +2727,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               });
             } else {
               afterFullData.forEach(row => {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               });
             }
           } else {
@@ -2733,7 +2739,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -3130,6 +3136,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let treeData = [];
       let fullData = (0, _vue.reactive)(datas ? datas.slice(0) : []); // 转为响应式数据
+      if (fullData.length > supportMaxRow) {
+        (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
+      }
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
@@ -3670,9 +3679,9 @@ var _default = exports.default = (0, _vue.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);
       }
@@ -6045,7 +6054,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             column,
             property: column.field,
             field: column.field,
-            filterList: $xeTable.getCheckedFilters(),
+            filterList: () => $xeTable.getCheckedFilters(),
             visible: false
           }, null);
         }
@@ -7910,12 +7919,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           lazy
         } = treeOpts;
-        const rowkey = (0, _util.getRowkey)($xeTable);
-        const isDeepKey = rowkey.indexOf('.') > -1;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-        const handleRowId = isDeepKey ? _util.updateDeepRowKey : _util.updateFastRowKey;
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
           let rowRest = fullAllDataRowIdMaps[rowid];
           if (!rowRest) {
@@ -7951,7 +7960,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         };
         if (treeConfig) {
           _xeUtils.default.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) {
@@ -7969,7 +7978,7 @@ var _default = exports.default = (0, _vue.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;
@@ -7981,19 +7990,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const treeOpts = computeTreeOpts.value;
-        let {
-          sourceDataRowIdData
-        } = internalData;
         const sourceData = _xeUtils.default.clone(fullData, true);
-        const rowkey = (0, _util.getRowkey)($xeTable);
-        sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
+        const sourceRowIdData = {};
         const handleSourceRow = row => {
-          let rowid = (0, _util.getRowid)($xeTable, row);
-          if ((0, _utils.eqEmptyValue)(rowid)) {
-            rowid = (0, _util.getRowUniqueId)();
-            _xeUtils.default.set(row, rowkey, rowid);
-          }
-          sourceDataRowIdData[rowid] = row;
+          const rowid = handleUpdateRowId(row);
+          sourceRowIdData[rowid] = row;
         };
         // 源数据缓存
         if (treeConfig) {
@@ -8004,6 +8008,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           sourceData.forEach(handleSourceRow);
         }
+        internalData.sourceDataRowIdData = sourceRowIdData;
         internalData.tableSourceData = sourceData;
       },
       /**
@@ -8568,10 +8573,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         // 树结构
         if (treeConfig) {
+          const {
+            handleGetRowId
+          } = (0, _util.createHandleGetRowId)($xeTable);
           const childRowMaps = {};
           const childRowList = [];
           _xeUtils.default.eachTree(afterTreeFullData, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             const childList = row[transform ? mapChildrenField : childrenField];
             if (childList && childList.length && !childRowMaps[rowid]) {
               childRowMaps[rowid] = 1;
@@ -8588,7 +8596,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let hLen = 0; // 半选
             let vLen = 0; // 有效行
             childList.forEach(checkMethod ? item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
+              const childRowid = handleGetRowId(item);
               const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
               if (checkMethod({
                 row: item
@@ -8607,7 +8615,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 }
               }
             } : item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
+              const childRowid = handleGetRowId(item);
               const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
               if (isSelect) {
                 sLen++;
@@ -8666,12 +8674,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           afterTreeFullData,
           checkboxReserveRowMap
         } = internalData;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         let sLen = 0; // 已选
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         const rootList = treeConfig ? afterTreeFullData : afterFullData;
         rootList.forEach(checkMethod ? row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
             row
@@ -8690,7 +8701,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           }
         } : row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (selected) {
             sLen++;
@@ -8736,6 +8747,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkStrictly,
           checkMethod
         } = checkboxOpts;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
@@ -8775,7 +8789,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (treeConfig && !checkStrictly) {
           // 更新子节点状态
           _xeUtils.default.eachTree(rows, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (isForce || !checkMethod || checkMethod({
               row
             })) {
@@ -8796,7 +8810,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         // 列表
         rows.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
@@ -9167,13 +9181,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       },
       triggerCheckRowEvent(evnt, params, checked) {
-        const checkboxOpts = computeCheckboxOpts.value;
         const {
           row
         } = params;
         const {
           afterFullData
         } = internalData;
+        const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkMethod,
           trigger
@@ -9183,15 +9197,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         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);
+              (0, _vue.nextTick)(() => {
+                handleCheckedCheckboxRow(rangeRows, true, false);
+              });
               dispatchEvent('checkbox-range-select', Object.assign({
                 rangeRecords: rangeRows
               }, params), evnt);
@@ -9202,12 +9218,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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);
         }