vxe-table 4.7.75 → 4.7.77

package/lib/table/src/table.js

@@ -2134,9 +2134,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (rows && !_xeUtils.default.isArray(rows)) {
         rows = [rows];
       }
-      rows.forEach(row => tablePrivateMethods.handleSelectRow({
-        row
-      }, !!value, isForce));
+      tablePrivateMethods.handleBatchSelectRows(rows, !!value, isForce);
+      tablePrivateMethods.checkSelectionStatus();
       return (0, _vue.nextTick)();
     };
     const handleCheckedAllCheckboxRow = (value, isForce) => {
@@ -2148,7 +2147,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = reactData;
       const {
         afterFullData,
-        afterFullRowMaps,
         checkboxReserveRowMap
       } = internalData;
       const treeOpts = computeTreeOpts.value;
@@ -2162,15 +2160,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = checkboxOpts;
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
-      // 疑惑！
-      if (!treeConfig) {
-        _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
-          if (!afterFullRowMaps[rowid]) {
-            selectRowMaps[rowid] = row;
-          }
-        });
-      }
-      // 疑惑！
       if (checkStrictly) {
         reactData.isAllSelected = value;
       } else {
@@ -3267,7 +3256,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (!_xeUtils.default.isArray(rows)) {
             rest = [rows];
           }
-          rest.forEach(item => Object.assign(item, record));
+          const rowkey = (0, _util.getRowkey)($xeTable);
+          rest.forEach(row => {
+            const rowid = (0, _util.getRowid)($xeTable, row);
+            const newRecord = _xeUtils.default.clone(Object.assign({}, record), true);
+            _xeUtils.default.set(newRecord, rowkey, rowid);
+            Object.assign(row, newRecord);
+          });
         }
         return (0, _vue.nextTick)();
       },
@@ -3293,11 +3288,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const oRow = tableSourceData[rowIndex];
           if (oRow && row) {
             if (field) {
-              const newValue = _xeUtils.default.get(record || row, field);
+              const newValue = _xeUtils.default.clone(_xeUtils.default.get(record || row, field), true);
               _xeUtils.default.set(row, field, newValue);
               _xeUtils.default.set(oRow, field, newValue);
             } else {
+              const rowkey = (0, _util.getRowkey)($xeTable);
+              const rowid = (0, _util.getRowid)($xeTable, row);
               const newRecord = _xeUtils.default.clone(Object.assign({}, record), true);
+              _xeUtils.default.set(newRecord, rowkey, rowid);
               _xeUtils.default.destructuring(oRow, Object.assign(row, newRecord));
             }
           }
@@ -4175,6 +4173,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * @param {Boolean} value 是否选中
        */
       setCheckboxRow(rows, value) {
+        if (rows && !_xeUtils.default.isArray(rows)) {
+          rows = [rows];
+        }
         return handleCheckedCheckboxRow(rows, value, true);
       },
       isCheckedByCheckboxRow(row) {
@@ -4211,6 +4212,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         tablePrivateMethods.handleSelectRow({
           row
         }, value, true);
+        tablePrivateMethods.checkSelectionStatus();
         return (0, _vue.nextTick)();
       },
       /**
@@ -6138,7 +6140,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const el = refElem.value;
         if (el) {
           const parentElem = el.parentNode;
-          const parentPaddingSize = height === 'fill' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
+          const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
           return Math.floor($xeGrid ? $xeGrid.getParentHeight() : _xeUtils.default.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
         }
         return 0;
@@ -6546,6 +6548,72 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       },
       /**
+       * 多行
+       * 多选，行选中事件
+       * 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
+              })) {
+                _xeUtils.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 = (0, _util.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
        */
@@ -6638,9 +6706,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 parentStatus = selectItems.filter(item => vItemMaps[(0, _util.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({
@@ -6725,9 +6794,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 parentStatus = selectItems.filter(item => vItemMaps[(0, _util.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({
@@ -6747,7 +6817,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         reactData.selectCheckboxMaps = selectRowMaps;
-        tablePrivateMethods.checkSelectionStatus();
       },
       triggerHeaderTitleEvent(evnt, iconParams, params) {
         const tipContent = iconParams.content || iconParams.message;
@@ -7056,6 +7125,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           tablePrivateMethods.triggerCheckRowEvent(evnt, params, value);
         } else {
           tablePrivateMethods.handleSelectRow(params, value);
+          tablePrivateMethods.checkSelectionStatus();
         }
       },
       triggerCheckRowEvent(evnt, params, value) {
@@ -7095,6 +7165,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           row
         })) {
           tablePrivateMethods.handleSelectRow(params, value);
+          tablePrivateMethods.checkSelectionStatus();
           tableMethods.dispatchEvent('checkbox-change', Object.assign({
             records: tableMethods.getCheckboxRecords(),
             reserves: tableMethods.getCheckboxReserveRecords(),