vxe-table 3.16.10 → 3.16.12

package/es/table/src/methods.js

@@ -3895,12 +3895,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, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
@@ -3912,6 +3916,7 @@ const Methods = {
             rowRest.level = level;
             rowRest.index = currIndex;
             rowRest.treeIndex = index;
+            idMaps[rowid] = true;
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
         };

package/es/table/src/table.js

@@ -757,20 +757,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.16.10";
+export const version = "3.16.12";
 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.16.10"}`;
+const version = `table v${"3.16.12"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.16.10";
+const version = "3.16.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3908,7 +3908,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.10"}`;
+const log_version = `table v${"3.16.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -11073,6 +11073,7 @@ const Methods = {
       isRowGroupStatus
     } = reactData;
     const {
+      currKeyField,
       fullAllDataRowIdData,
       tableFullData,
       tableFullTreeData,
@@ -11083,11 +11084,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,
@@ -11114,6 +11119,7 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
     };
@@ -29953,23 +29959,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);
+      }
+      if (globalVirtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
       }
-      return Object.assign({}, table_getConfig().table.virtualXConfig, table_getConfig().table.scrollX, props.scrollX);
+      // 已废弃，保留兼容
+      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;