vxe-table 3.14.0-beta.6 → 3.14.0-beta.7

package/es/table/src/footer.js

@@ -100,6 +100,7 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
         tfOns.dblclick = (evnt) => {
             $xeTable.dispatchEvent('footer-cell-dblclick', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
         };
+        let isMergeCell = false;
         // 合并行或列
         if (mergeFooterList.length) {
             const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -109,9 +110,11 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
                     return null;
                 }
                 if (rowspan > 1) {
+                    isMergeCell = true;
                     attrs.rowspan = rowspan;
                 }
                 if (colspan > 1) {
+                    isMergeCell = true;
                     attrs.colspan = colspan;
                 }
             }
@@ -132,8 +135,10 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
         const isLastColumn = $columnIndex === tableColumn.length - 1;
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-            isVNPreEmptyStatus = true;
+        if (!isMergeCell) {
+            if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                isVNPreEmptyStatus = true;
+            }
         }
         const tcStyle = {};
         if (hasEllipsis) {

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, updateDeepRowKey, updateFastRowKey, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -2628,32 +2628,19 @@ const Methods = {
         const treeOpts = $xeTable.computeTreeOpts;
         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 handleRow = (row, index, items, path, parentRow, nodes) => {
-            let rowid = getRowid($xeTable, row);
-            const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
-            const level = nodes ? nodes.length - 1 : 0;
-            if (eqEmptyValue(rowid)) {
-                rowid = getRowUniqueId();
-                XEUtils.set(row, rowkey, rowid);
-            }
-            if (treeConfig && treeOpts.lazy) {
-                const treeExpRest = treeExpandedMaps[rowid];
-                if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                    row[childrenField] = null;
-                }
-                if (treeExpRest) {
-                    if (!row[childrenField] || !row[childrenField].length) {
-                        delete treeTempExpandedMaps[rowid];
-                    }
-                }
-            }
-            let rowRest = fullAllDataRowIdData[rowid];
+        const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+        const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+            let rowRest = fullAllDataRowIdMaps[rowid];
             if (!rowRest) {
                 rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                fullDataRowIdMaps[rowid] = rowRest;
+                fullAllDataRowIdMaps[rowid] = rowRest;
             }
             rowRest.treeLoaded = false;
             rowRest.expandLoaded = false;
@@ -2661,15 +2648,30 @@ const Methods = {
             rowRest.items = items;
             rowRest.parent = parentRow;
             rowRest.level = level;
-            rowRest.index = treeConfig && parentRow ? -1 : index;
-            fullDataRowIdMaps[rowid] = rowRest;
-            fullAllDataRowIdMaps[rowid] = rowRest;
+            rowRest.index = currIndex;
+            rowRest.treeIndex = index;
         };
         if (treeConfig) {
-            XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
+            XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+                const rowid = handleRowId(row, rowkey);
+                if (treeConfig && lazy) {
+                    const treeExpRest = treeTempExpandedMaps[rowid];
+                    if (row[hasChildField] && row[childrenField] === undefined) {
+                        row[childrenField] = null;
+                    }
+                    if (treeExpRest) {
+                        if (!row[childrenField] || !row[childrenField].length) {
+                            delete treeTempExpandedMaps[rowid];
+                        }
+                    }
+                }
+                handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+            }, { children: childrenField });
         }
         else {
-            tableFullData.forEach(handleRow);
+            tableFullData.forEach((row, index, items) => {
+                handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1);
+            });
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;

package/es/table/src/util.js

@@ -2,6 +2,7 @@ import XEUtils from 'xe-utils';
 import { ColumnInfo } from './columnInfo';
 import { isScale, isPx } from '../../ui/src/dom';
 import { warnLog, errLog } from '../../ui/src/log';
+import { eqEmptyValue } from '../../ui/src/utils';
 const getAllConvertColumns = (columns, parentColumn) => {
     const result = [];
     columns.forEach((column) => {
@@ -90,13 +91,35 @@ export function getRowUniqueId() {
     return XEUtils.uniqueId('row_');
 }
 // 行主键 key
-export function getRowkey($xetable) {
-    return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+export function getRowkey($xeTable) {
+    const props = $xeTable;
+    const rowOpts = $xeTable.computeRowOpts;
+    return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
 export function getRowid($xetable, row) {
     const rowid = XEUtils.get(row, getRowkey($xetable));
-    return XEUtils.eqNull(rowid) ? '' : encodeURIComponent(rowid);
+    return encodeRowid(rowid);
+}
+// 编码行主键
+export function encodeRowid(rowVal) {
+    return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
+}
+export function updateDeepRowKey(row, rowkey) {
+    let rowid = XEUtils.get(row, rowkey);
+    if (eqEmptyValue(rowid)) {
+        rowid = getRowUniqueId();
+        XEUtils.set(row, rowkey, rowid);
+    }
+    return rowid;
+}
+export function updateFastRowKey(row, rowkey) {
+    let rowid = row[rowkey];
+    if (eqEmptyValue(rowid)) {
+        rowid = getRowUniqueId();
+        row[rowkey] = rowid;
+    }
+    return rowid;
 }
 function getPaddingLeftRightSize(elem) {
     if (elem) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.0-beta.6";
+export const version = "3.14.0-beta.7";
 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${"3.14.0-beta.6"}`;
+const version = `table v${"3.14.0-beta.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.6";
+const version = "3.14.0-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.6"}`;
+const log_version = `table v${"3.14.0-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3026,6 +3026,7 @@ class ColumnInfo {
 
 
 
+
 const getAllConvertColumns = (columns, parentColumn) => {
   const result = [];
   columns.forEach(column => {
@@ -3111,13 +3112,35 @@ function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
 // 行主键 key
-function getRowkey($xetable) {
-  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+function getRowkey($xeTable) {
+  const props = $xeTable;
+  const rowOpts = $xeTable.computeRowOpts;
+  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
 function getRowid($xetable, row) {
   const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xetable));
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
+  return encodeRowid(rowid);
+}
+// 编码行主键
+function encodeRowid(rowVal) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
+}
+function updateDeepRowKey(row, rowkey) {
+  let rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, rowkey);
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId();
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
+  }
+  return rowid;
+}
+function updateFastRowKey(row, rowkey) {
+  let rowid = row[rowkey];
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId();
+    row[rowkey] = rowid;
+  }
+  return rowid;
 }
 function getPaddingLeftRightSize(elem) {
   if (elem) {
@@ -8094,7 +8117,11 @@ const Methods = {
     const treeOpts = $xeTable.computeTreeOpts;
     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 = {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
@@ -8102,26 +8129,9 @@ const Methods = {
     const treeTempExpandedMaps = {
       ...treeExpandedMaps
     };
-    const handleRow = (row, index, items, path, parentRow, nodes) => {
-      let rowid = getRowid($xeTable, row);
-      const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
-      const level = nodes ? nodes.length - 1 : 0;
-      if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId();
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
-      }
-      if (treeConfig && treeOpts.lazy) {
-        const treeExpRest = treeExpandedMaps[rowid];
-        if (row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
-          row[childrenField] = null;
-        }
-        if (treeExpRest) {
-          if (!row[childrenField] || !row[childrenField].length) {
-            delete treeTempExpandedMaps[rowid];
-          }
-        }
-      }
-      let rowRest = fullAllDataRowIdData[rowid];
+    const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+    const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+      let rowRest = fullAllDataRowIdMaps[rowid];
       if (!rowRest) {
         rowRest = {
           row,
@@ -8139,6 +8149,8 @@ const Methods = {
           oTop: 0,
           expandHeight: 0
         };
+        fullDataRowIdMaps[rowid] = rowRest;
+        fullAllDataRowIdMaps[rowid] = rowRest;
       }
       rowRest.treeLoaded = false;
       rowRest.expandLoaded = false;
@@ -8146,16 +8158,31 @@ const Methods = {
       rowRest.items = items;
       rowRest.parent = parentRow;
       rowRest.level = level;
-      rowRest.index = treeConfig && parentRow ? -1 : index;
-      fullDataRowIdMaps[rowid] = rowRest;
-      fullAllDataRowIdMaps[rowid] = rowRest;
+      rowRest.index = currIndex;
+      rowRest.treeIndex = index;
     };
     if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+        const rowid = handleRowId(row, rowkey);
+        if (treeConfig && lazy) {
+          const treeExpRest = treeTempExpandedMaps[rowid];
+          if (row[hasChildField] && row[childrenField] === undefined) {
+            row[childrenField] = null;
+          }
+          if (treeExpRest) {
+            if (!row[childrenField] || !row[childrenField].length) {
+              delete treeTempExpandedMaps[rowid];
+            }
+          }
+        }
+        handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+      }, {
         children: childrenField
       });
     } else {
-      tableFullData.forEach(handleRow);
+      tableFullData.forEach((row, index, items) => {
+        handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1);
+      });
     }
     internalData.fullDataRowIdData = fullDataRowIdMaps;
     internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
@@ -15895,6 +15922,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   tdOns.dblclick = evnt => {
     $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
+  let isMergeCell = false;
   // 合并行或列
   if (mergeList.length) {
     const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -15907,9 +15935,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         return null;
       }
       if (rowspan > 1) {
+        isMergeCell = true;
         tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
+        isMergeCell = true;
         tdAttrs.colspan = colspan;
       }
     }
@@ -15944,11 +15974,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
-    } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+  if (!isMergeCell) {
+    if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+      if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
   }
   const tcStyle = {};
@@ -17164,6 +17196,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         cell: evnt.currentTarget
       }, cellParams), evnt);
     };
+    let isMergeCell = false;
     // 合并行或列
     if (mergeFooterList.length) {
       const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -17176,9 +17209,11 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
           return null;
         }
         if (rowspan > 1) {
+          isMergeCell = true;
           attrs.rowspan = rowspan;
         }
         if (colspan > 1) {
+          isMergeCell = true;
           attrs.colspan = colspan;
         }
       }
@@ -17201,8 +17236,10 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+    if (!isMergeCell) {
+      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
     const tcStyle = {};
     if (hasEllipsis) {