vxe-table 4.7.76 → 4.7.77

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.7.76"}`;
+const version = `table v${"4.7.77"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1976,9 +1976,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.76";
+const version = "4.7.77";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.76";
+core_.VxeUI.tableVersion = "4.7.77";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2360,7 +2360,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.76"}`;
+const log_version = `table v${"4.7.77"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -10468,9 +10468,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
         rows = [rows];
       }
-      rows.forEach(row => tablePrivateMethods.handleSelectRow({
-        row
-      }, !!value, isForce));
+      tablePrivateMethods.handleBatchSelectRows(rows, !!value, isForce);
+      tablePrivateMethods.checkSelectionStatus();
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
     const handleCheckedAllCheckboxRow = (value, isForce) => {
@@ -10482,7 +10481,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = reactData;
       const {
         afterFullData,
-        afterFullRowMaps,
         checkboxReserveRowMap
       } = internalData;
       const treeOpts = computeTreeOpts.value;
@@ -10496,15 +10494,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = checkboxOpts;
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
-      // 疑惑！
-      if (!treeConfig) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, (row, rowid) => {
-          if (!afterFullRowMaps[rowid]) {
-            selectRowMaps[rowid] = row;
-          }
-        });
-      }
-      // 疑惑！
       if (checkStrictly) {
         reactData.isAllSelected = value;
       } else {
@@ -11603,7 +11592,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
             rest = [rows];
           }
-          rest.forEach(item => Object.assign(item, record));
+          const rowkey = getRowkey($xeTable);
+          rest.forEach(row => {
+            const rowid = getRowid($xeTable, row);
+            const newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(Object.assign({}, record), true);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(newRecord, rowkey, rowid);
+            Object.assign(row, newRecord);
+          });
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -11629,13 +11624,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const oRow = tableSourceData[rowIndex];
           if (oRow && row) {
             if (field) {
-              const newValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record || row, field);
+              const newValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record || row, field), true);
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, newValue);
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(oRow, field, newValue);
             } else {
-              const newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone({
-                ...record
-              }, true);
+              const rowkey = getRowkey($xeTable);
+              const rowid = getRowid($xeTable, row);
+              const newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(Object.assign({}, record), true);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(newRecord, rowkey, rowid);
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(oRow, Object.assign(row, newRecord));
             }
           }
@@ -12513,6 +12509,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * @param {Boolean} value 是否选中
        */
       setCheckboxRow(rows, value) {
+        if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+          rows = [rows];
+        }
         return handleCheckedCheckboxRow(rows, value, true);
       },
       isCheckedByCheckboxRow(row) {
@@ -12549,6 +12548,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tablePrivateMethods.handleSelectRow({
           row
         }, value, true);
+        tablePrivateMethods.checkSelectionStatus();
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       /**
@@ -14891,6 +14891,72 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
       },
       /**
+       * 多行
+       * 多选，行选中事件
+       * value 选中true 不选false 半选-1
+       */
+      handleBatchSelectRows(rows, value, isForce) {
+        const {
+          treeConfig
+        } = props;
+        const {
+          selectCheckboxMaps
+        } = reactData;
+        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        const checkboxOpts = computeCheckboxOpts.value;
+        const {
+          checkField,
+          checkStrictly,
+          checkMethod
+        } = checkboxOpts;
+        if (checkField) {
+          if (treeConfig && !checkStrictly) {
+            rows.forEach(row => {
+              tablePrivateMethods.handleSelectRow({
+                row
+              }, value, isForce);
+            });
+          } else {
+            rows.forEach(row => {
+              if (isForce || !checkMethod || checkMethod({
+                row
+              })) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
+                handleCheckboxReserveRow(row, value);
+              }
+            });
+          }
+        } else {
+          if (treeConfig && !checkStrictly) {
+            rows.forEach(row => {
+              tablePrivateMethods.handleSelectRow({
+                row
+              }, value, isForce);
+            });
+          } else {
+            rows.forEach(row => {
+              const rowid = getRowid($xeTable, row);
+              if (isForce || !checkMethod || checkMethod({
+                row
+              })) {
+                if (value) {
+                  if (!selectRowMaps[rowid]) {
+                    selectRowMaps[rowid] = row;
+                  }
+                } else {
+                  if (selectRowMaps[rowid]) {
+                    delete selectRowMaps[rowid];
+                  }
+                }
+                handleCheckboxReserveRow(row, value);
+              }
+            });
+          }
+        }
+        reactData.selectCheckboxMaps = selectRowMaps;
+      },
+      /**
+       * 单行
        * 多选，行选中事件
        * value 选中true 不选false 半选-1
        */
@@ -14904,9 +14970,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           selectCheckboxMaps,
           treeIndeterminateMaps
         } = reactData;
-        const selectRowMaps = {
-          ...selectCheckboxMaps
-        };
+        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
         const {
           afterFullData
         } = internalData;
@@ -14985,9 +15049,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 parentStatus = selectItems.filter(item => vItemMaps[getRowid($xeTable, item)]).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
               }
               reactData.selectCheckboxMaps = selectRowMaps;
-              return tablePrivateMethods.handleSelectRow({
+              tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
               }, parentStatus, isForce);
+              return;
             }
           } else {
             if (isForce || !checkMethod || checkMethod({
@@ -15072,9 +15137,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 parentStatus = selectItems.filter(item => vItemMaps[getRowid($xeTable, item)]).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
               }
               reactData.selectCheckboxMaps = selectRowMaps;
-              return tablePrivateMethods.handleSelectRow({
+              tablePrivateMethods.handleSelectRow({
                 row: matchObj.parent
               }, parentStatus, isForce);
+              return;
             }
           } else {
             if (isForce || !checkMethod || checkMethod({
@@ -15094,7 +15160,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         reactData.selectCheckboxMaps = selectRowMaps;
-        tablePrivateMethods.checkSelectionStatus();
       },
       triggerHeaderTitleEvent(evnt, iconParams, params) {
         const tipContent = iconParams.content || iconParams.message;
@@ -15403,6 +15468,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           tablePrivateMethods.triggerCheckRowEvent(evnt, params, value);
         } else {
           tablePrivateMethods.handleSelectRow(params, value);
+          tablePrivateMethods.checkSelectionStatus();
         }
       },
       triggerCheckRowEvent(evnt, params, value) {
@@ -15442,6 +15508,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           row
         })) {
           tablePrivateMethods.handleSelectRow(params, value);
+          tablePrivateMethods.checkSelectionStatus();
           tableMethods.dispatchEvent('checkbox-change', Object.assign({
             records: tableMethods.getCheckboxRecords(),
             reserves: tableMethods.getCheckboxReserveRecords(),