vxe-table 3.17.1 → 3.17.3

package/es/table/src/body.js

@@ -61,7 +61,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
-    const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
+    const { tableData, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
     const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
     const cellOpts = $xeTable.computeCellOpts;
     const validOpts = $xeTable.computeValidOpts;
@@ -244,12 +244,12 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const isLastColumn = $columnIndex === columns.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (overflowX && !isMergeCell) {
+    if (!isMergeCell) {
         if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-            if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+            if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
                 isVNPreEmptyStatus = true;
             }
-            else if (scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+            else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                 isVNPreEmptyStatus = true;
             }
         }

package/es/table/src/methods.js

@@ -3984,12 +3984,16 @@ const Methods = {
         const internalData = $xeTable;
         const { treeConfig } = props;
         const { isRowGroupStatus } = reactData;
-        const { fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps } = internalData;
+        const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps } = internalData;
         const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
+        const idMaps = {};
         const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
             let rowRest = fullAllDataRowIdMaps[rowid];
+            if (idMaps[rowid]) {
+                errLog('vxe.error.repeatKey', [currKeyField, rowid]);
+            }
             if (!rowRest) {
                 rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
@@ -4001,6 +4005,7 @@ const Methods = {
             rowRest.level = level;
             rowRest.index = currIndex;
             rowRest.treeIndex = index;
+            idMaps[rowid] = true;
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
         };
@@ -7521,8 +7526,28 @@ const Methods = {
     /**
      * 用于当前行，获取当前行的数据
      */
-    getCurrentRecord() {
-        return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
+    getCurrentRecord(isFull) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { currentRow } = reactData;
+        const { fullDataRowIdData, afterFullRowMaps } = internalData;
+        const rowOpts = $xeTable.computeRowOpts;
+        if (rowOpts.isCurrent || props.highlightCurrentRow) {
+            const rowid = getRowid($xeTable, currentRow);
+            if (isFull) {
+                if (fullDataRowIdData[rowid]) {
+                    return currentRow;
+                }
+            }
+            else {
+                if (afterFullRowMaps[rowid]) {
+                    return currentRow;
+                }
+            }
+        }
+        return null;
     },
     /**
      * 用于单选行，获取当已选中的数据

package/es/table/src/table.js

@@ -758,20 +758,40 @@ export default {
         computeVirtualXOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            const { virtualXConfig } = props;
+            const { virtualXConfig, scrollX } = props;
+            const globalVirtualXConfig = getConfig().table.virtualXConfig;
+            const globalScrollX = getConfig().table.scrollX;
             if (virtualXConfig) {
-                return Object.assign({}, getConfig().table.virtualXConfig, virtualXConfig);
+                return Object.assign({}, globalVirtualXConfig, virtualXConfig);
             }
-            return Object.assign({}, getConfig().table.virtualXConfig, getConfig().table.scrollX, props.scrollX);
+            if (scrollX) {
+                // 已废弃，保留兼容
+                return Object.assign({}, globalScrollX, scrollX);
+            }
+            if (globalVirtualXConfig) {
+                return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+            }
+            // 已废弃，保留兼容
+            return Object.assign({}, globalScrollX, scrollX);
         },
         computeVirtualYOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            const { virtualYConfig } = props;
+            const { virtualYConfig, scrollY } = props;
+            const globalVirtualYConfig = getConfig().table.virtualYConfig;
+            const globalScrollY = getConfig().table.scrollY;
             if (virtualYConfig) {
-                return Object.assign({}, getConfig().table.virtualYConfig, virtualYConfig);
+                return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+            }
+            if (scrollY) {
+                // 已废弃，保留兼容
+                return Object.assign({}, globalScrollY, scrollY);
+            }
+            if (globalVirtualYConfig) {
+                return Object.assign({}, globalVirtualYConfig, virtualYConfig);
             }
-            return Object.assign({}, getConfig().table.virtualYConfig, getConfig().table.scrollY, props.scrollY);
+            // 已废弃，保留兼容
+            return Object.assign({}, globalScrollY, scrollY);
         },
         computeScrollbarOpts() {
             const $xeTable = this;

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.1";
+const version = "3.17.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2669,7 +2669,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.1"}`;
+const log_version = `table v${"3.17.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -9951,6 +9951,7 @@ const Methods = {
       isRowGroupStatus
     } = reactData;
     const {
+      currKeyField,
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData,
@@ -9961,11 +9962,15 @@ const Methods = {
       ...fullAllDataRowIdData
     }; // 存在已删除数据
     const fullDataRowIdMaps = {};
+    const idMaps = {};
     const {
       handleUpdateRowId
     } = createHandleUpdateRowId($xeTable);
     const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
       let rowRest = fullAllDataRowIdMaps[rowid];
+      if (idMaps[rowid]) {
+        errLog('vxe.error.repeatKey', [currKeyField, rowid]);
+      }
       if (!rowRest) {
         rowRest = {
           row,
@@ -9993,6 +9998,7 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
@@ -14078,8 +14084,32 @@ const Methods = {
   /**
    * 用于当前行，获取当前行的数据
    */
-  getCurrentRecord() {
-    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
+  getCurrentRecord(isFull) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      currentRow
+    } = reactData;
+    const {
+      fullDataRowIdData,
+      afterFullRowMaps
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    if (rowOpts.isCurrent || props.highlightCurrentRow) {
+      const rowid = getRowid($xeTable, currentRow);
+      if (isFull) {
+        if (fullDataRowIdData[rowid]) {
+          return currentRow;
+        }
+      } else {
+        if (afterFullRowMaps[rowid]) {
+          return currentRow;
+        }
+      }
+    }
+    return null;
   },
   /**
    * 用于单选行，获取当已选中的数据
@@ -18009,6 +18039,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     tableData,
     dragRow,
     overflowX,
+    overflowY,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
@@ -18246,11 +18277,11 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (overflowX && !isMergeCell) {
+  if (!isMergeCell) {
     if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-      if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -28906,23 +28937,45 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       const props = $xeTable;
       const {
-        virtualXConfig
+        virtualXConfig,
+        scrollX
       } = props;
+      const globalVirtualXConfig = table_getConfig().table.virtualXConfig;
+      const globalScrollX = table_getConfig().table.scrollX;
       if (virtualXConfig) {
-        return Object.assign({}, table_getConfig().table.virtualXConfig, virtualXConfig);
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      if (scrollX) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollX, scrollX);
       }
-      return Object.assign({}, table_getConfig().table.virtualXConfig, table_getConfig().table.scrollX, props.scrollX);
+      if (globalVirtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollX, scrollX);
     },
     computeVirtualYOpts() {
       const $xeTable = this;
       const props = $xeTable;
       const {
-        virtualYConfig
+        virtualYConfig,
+        scrollY
       } = props;
+      const globalVirtualYConfig = table_getConfig().table.virtualYConfig;
+      const globalScrollY = table_getConfig().table.scrollY;
       if (virtualYConfig) {
-        return Object.assign({}, table_getConfig().table.virtualYConfig, virtualYConfig);
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+      }
+      if (scrollY) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollY, scrollY);
+      }
+      if (globalVirtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
       }
-      return Object.assign({}, table_getConfig().table.virtualYConfig, table_getConfig().table.scrollY, props.scrollY);
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollY, scrollY);
     },
     computeScrollbarOpts() {
       const $xeTable = this;