vxe-table 4.12.0 → 4.12.2

package/es/table/module/edit/hook.js

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { isEnableConf } from '../../../ui/src/utils';
 import { getCellValue, setCellValue, getRowid } from '../../src/util';
-import { browse, removeClass, addClass } from '../../../ui/src/dom';
+import { removeClass, addClass } from '../../../ui/src/dom';
 import { warnLog, errLog } from '../../../ui/src/log';
 const { getConfig, renderer, hooks, getI18n } = VxeUI;
 const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
@@ -12,6 +12,7 @@ hooks.add('tableEditModule', {
         const { props, reactData, internalData } = $xeTable;
         const { refElem } = $xeTable.getRefMaps();
         const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts } = $xeTable.getComputeMaps();
+        const browseObj = XEUtils.browse();
         let editMethods = {};
         let editPrivateMethods = {};
         const getEditColumnModel = (row, column) => {
@@ -96,8 +97,8 @@ hooks.add('tableEditModule', {
         };
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
-            const { mergeList, editStore } = reactData;
-            const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
+            const { mergeList } = reactData;
+            const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { transform, rowField, mapChildrenField } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -244,11 +245,11 @@ hooks.add('tableEditModule', {
                     }
                 }
             }
-            const { insertMaps } = editStore;
             newRecords.forEach(newRow => {
                 const rowid = getRowid($xeTable, newRow);
-                insertMaps[rowid] = newRow;
+                insertRowMaps[rowid] = newRow;
             });
+            reactData.insertRowFlag++;
             $xeTable.cacheRowMap(false);
             $xeTable.updateScrollYStatus();
             $xeTable.handleTableData(treeConfig && transform);
@@ -487,13 +488,12 @@ hooks.add('tableEditModule', {
             remove(rows) {
                 const { treeConfig } = props;
                 const { mergeList, editStore } = reactData;
-                const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps } = internalData;
+                const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
-                const { actived, removeMaps } = editStore;
-                const insertDataRowMaps = Object.assign({}, editStore.insertMaps);
+                const { actived } = editStore;
                 const { checkField } = checkboxOpts;
                 let delList = [];
                 if (!rows) {
@@ -506,7 +506,7 @@ hooks.add('tableEditModule', {
                 rows.forEach((row) => {
                     if (!$xeTable.isInsertByRow(row)) {
                         const rowid = getRowid($xeTable, row);
-                        removeMaps[rowid] = row;
+                        removeRowMaps[rowid] = row;
                     }
                 });
                 // 如果绑定了多选属性，则更新状态
@@ -577,14 +577,15 @@ hooks.add('tableEditModule', {
                 // 从新增中移除已删除的数据
                 rows.forEach((row) => {
                     const rowid = getRowid($xeTable, row);
-                    if (insertDataRowMaps[rowid]) {
-                        delete insertDataRowMaps[rowid];
+                    if (insertRowMaps[rowid]) {
+                        delete insertRowMaps[rowid];
                     }
                     if (pendingRowMaps[rowid]) {
                         delete pendingRowMaps[rowid];
                     }
                 });
-                editStore.insertMaps = insertDataRowMaps;
+                reactData.removeRowFlag++;
+                reactData.insertRowFlag++;
                 reactData.pendingRowFlag++;
                 $xeTable.updateFooter();
                 $xeTable.cacheRowMap(false);
@@ -654,11 +655,9 @@ hooks.add('tableEditModule', {
              * 获取新增的临时数据
              */
             getInsertRecords() {
-                const { editStore } = reactData;
-                const { fullAllDataRowIdData } = internalData;
-                const { insertMaps } = editStore;
+                const { fullAllDataRowIdData, insertRowMaps } = internalData;
                 const insertRecords = [];
-                XEUtils.each(insertMaps, (row, rowid) => {
+                XEUtils.each(insertRowMaps, (row, rowid) => {
                     if (fullAllDataRowIdData[rowid]) {
                         insertRecords.push(row);
                     }
@@ -669,10 +668,9 @@ hooks.add('tableEditModule', {
              * 获取已删除的数据
              */
             getRemoveRecords() {
-                const { editStore } = reactData;
-                const { removeMaps } = editStore;
+                const { removeRowMaps } = internalData;
                 const removeRecords = [];
-                XEUtils.each(removeMaps, (row) => {
+                XEUtils.each(removeRowMaps, (row) => {
                     removeRecords.push(row);
                 });
                 return removeRecords;
@@ -699,7 +697,7 @@ hooks.add('tableEditModule', {
                 if (process.env.NODE_ENV === 'development') {
                     warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
                 }
-                return this.getEditRecord();
+                return $xeTable.getEditRecord();
             },
             getEditRecord() {
                 const { editStore } = reactData;
@@ -727,7 +725,7 @@ hooks.add('tableEditModule', {
                 if (process.env.NODE_ENV === 'development') {
                     warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
                 }
-                return this.clearEdit(row);
+                return $xeTable.clearEdit(row);
             },
             /**
              * 清除激活的编辑
@@ -751,7 +749,7 @@ hooks.add('tableEditModule', {
                     warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
                 }
                 // 即将废弃
-                return this.isEditByRow(row);
+                return $xeTable.isEditByRow(row);
             },
             /**
              * 判断行是否为激活编辑状态
@@ -882,7 +880,7 @@ hooks.add('tableEditModule', {
                         }
                         else {
                             // 保持一致行为，光标移到末端
-                            if (browse.msie) {
+                            if (browseObj.msie) {
                                 const textRange = inputElem.createTextRange();
                                 textRange.collapse(false);
                                 textRange.select();
@@ -915,7 +913,7 @@ hooks.add('tableEditModule', {
                     if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
                         if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
                             handleClearEdit(evnt);
-                            editMethods.clearSelected();
+                            $xeTable.clearSelected();
                             if ($xeTable.clearCellAreas) {
                                 $xeTable.clearCellAreas();
                                 $xeTable.clearCopyCellArea();

package/es/table/module/keyboard/hook.js

@@ -1,12 +1,13 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { getRefElem } from '../../src/util';
-import { browse, hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom';
+import { hasClass, getAbsolutePos, addClass, removeClass } from '../../../ui/src/dom';
 const { hooks } = VxeUI;
+const browseObj = XEUtils.browse();
 function getTargetOffset(target, container) {
     let offsetTop = 0;
     let offsetLeft = 0;
-    const triggerCheckboxLabel = !browse.firefox && hasClass(target, 'vxe-checkbox--label');
+    const triggerCheckboxLabel = !browseObj.firefox && hasClass(target, 'vxe-checkbox--label');
     if (triggerCheckboxLabel) {
         const checkboxLabelStyle = getComputedStyle(target);
         offsetTop -= XEUtils.toNumber(checkboxLabelStyle.paddingTop);

package/es/table/module/validator/hook.js

@@ -85,9 +85,7 @@ hooks.add('tableValidatorModule', {
         const beginValidate = (rows, cols, cb, isFull) => {
             const validRest = {};
             const { editRules, treeConfig } = props;
-            const { editStore } = reactData;
-            const { afterFullData, pendingRowMaps } = internalData;
-            const { removeMaps } = editStore;
+            const { afterFullData, pendingRowMaps, removeRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const validOpts = computeValidOpts.value;
@@ -121,7 +119,7 @@ hooks.add('tableValidatorModule', {
                 const handleVaild = (row) => {
                     const rowid = getRowid($xeTable, row);
                     // 是否删除
-                    if (removeMaps[rowid]) {
+                    if (removeRowMaps[rowid]) {
                         return;
                     }
                     // 是否标记删除

package/es/table/src/body.js

@@ -414,10 +414,13 @@ export default defineComponent({
             const rows = [];
             const { handleGetRowId } = createHandleGetRowId($xeTable);
             tableData.forEach((row, $rowIndex) => {
-                const trOn = {};
+                const rowid = handleGetRowId(row);
+                const rowRest = fullAllDataRowIdData[rowid] || {};
                 let rowIndex = $rowIndex;
-                // 确保任何情况下 rowIndex 都精准指向真实 data 索引
-                rowIndex = $xeTable.getRowIndex(row);
+                let rowLevel = 0;
+                let seq = -1;
+                let _rowIndex = -1;
+                const trOn = {};
                 // 当前行事件
                 if (rowOpts.isHover || highlightHoverRow) {
                     trOn.onMouseenter = (evnt) => {
@@ -433,11 +436,6 @@ export default defineComponent({
                         $xeTable.clearHoverRow();
                     };
                 }
-                const rowid = handleGetRowId(row);
-                const rowRest = fullAllDataRowIdData[rowid] || {};
-                let rowLevel = 0;
-                let seq = -1;
-                let _rowIndex = 0;
                 if (rowRest) {
                     rowLevel = rowRest.level;
                     if (treeConfig && transform && seqMode === 'increasing') {
@@ -446,6 +444,7 @@ export default defineComponent({
                     else {
                         seq = rowRest.seq;
                     }
+                    rowIndex = rowRest.index;
                     _rowIndex = rowRest._index;
                 }
                 const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };