vue2-client 1.19.75 → 1.19.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.75",
+  "version": "1.19.76",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTable/XTable.vue

@@ -1134,7 +1134,10 @@ export default {
     onSelectChange (currentPageSelectedKeys, currentPageSelectedRows) {
       // 跨页选中模式：需要合并多页数据
       if (this.isMultiPageSelectionEnabled) {
-        this.mergeMultiPageSelection(currentPageSelectedRows)
+        const primaryKeyName = this.primaryKey || this.rowKey
+        // 当前页所有的key
+        const currentPageAllKeys = this.$refs.table.localDataSource.map(row => row[primaryKeyName])
+        this.mergeMultiPageSelection(currentPageAllKeys, currentPageSelectedRows, primaryKeyName)
       } else {
         // 单页选中模式：直接使用当前页数据
         this.selectedRowKeys = currentPageSelectedKeys
@@ -1160,12 +1163,11 @@ export default {
      * - selectedRowKeys: 所有页面选中的keys
      * - selectedRows: 所有页面选中的行数据
      *
+     * @param currentPageAllKeys - 当前页所有的key
      * @param {Array} currentPageSelectedRows - 当前页被选中的行数据
+     * @param primaryKeyName - 主键字段名
      */
-    mergeMultiPageSelection (currentPageSelectedRows) {
-      const primaryKeyName = this.primaryKey || this.rowKey
-      const currentPageAllKeys = currentPageSelectedRows.map(row => row[primaryKeyName])
-
+    mergeMultiPageSelection (currentPageAllKeys, currentPageSelectedRows, primaryKeyName) {
       // 使用 Map 统一处理 keys 和 rows 的合并
       const rowsMap = new Map()
 
@@ -1251,7 +1253,9 @@ export default {
         if (!this.$refs.table) return
 
         // 合并跨页选中数据（复用合并逻辑）
-        this.mergeMultiPageSelection(currentPageSelectedRows)
+        const primaryKeyName = this.primaryKey || this.rowKey
+        const currentPageAllKeys = currentPageSelectedRows.map(row => row[primaryKeyName])
+        this.mergeMultiPageSelection(currentPageAllKeys, currentPageSelectedRows, primaryKeyName)
 
         // 同步UI状态
         this.syncSelectionState(currentPageSelectedKeys, currentPageSelectedRows)