vxe-table 3.9.8 → 3.9.10

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.8";
+const version = "3.9.10";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.8";
+core_.VxeUI.tableVersion = "3.9.10";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.8"}`;
+const log_version = `table v${"3.9.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3362,17 +3362,18 @@ function colToVisible($xeTable, column) {
     const tdElem = bodyElem.querySelector(`.${column.id}`);
     if (tdElem) {
       const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
-      const tdWidth = tdElem.clientWidth;
-      // 检测行是否在可视区中
+      const cellWidth = tdElem.clientWidth;
+      // 检测是否在可视区中
       if (tdOffsetLeft < bodySrcollLeft + offsetFixedLeft) {
         return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
-      } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft - offsetFixedRight) {
-        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - offsetFixedRight + 1);
+      } else if (tdOffsetLeft + cellWidth - bodySrcollLeft > bodyWidth - offsetFixedRight) {
+        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
       }
     } else {
       // 检测是否在虚拟渲染可视区中
       if (scrollXLoad) {
         let scrollLeft = 0;
+        const cellWidth = column.renderWidth;
         for (let index = 0; index < visibleColumn.length; index++) {
           if (visibleColumn[index] === column) {
             break;
@@ -3382,7 +3383,7 @@ function colToVisible($xeTable, column) {
         if (scrollLeft < bodySrcollLeft) {
           return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
         }
-        return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - offsetFixedRight + 1);
+        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
       }
     }
   }
@@ -5057,7 +5058,6 @@ const Methods = {
     } = this;
     return this.handleTableData(true).then(() => {
       this.updateFooter();
-      this.checkSelectionStatus();
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
           this.updateScrollXSpace();
@@ -8642,9 +8642,8 @@ const Methods = {
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
-    rows.forEach(row => this.handleSelectRow({
-      row
-    }, !!value, isForce));
+    this.handleBatchSelectRows(rows, !!value, isForce);
+    this.checkSelectionStatus();
     return this.$nextTick();
   },
   /**
@@ -8653,6 +8652,9 @@ const Methods = {
    * @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 this.handleCheckedCheckboxRow(rows, value, true);
   },
   isCheckedByCheckboxRow(row) {
@@ -8673,6 +8675,72 @@ const Methods = {
     } = this;
     return !!treeIndeterminateMaps[getRowid(this, row)] && !this.isCheckedByCheckboxRow(row);
   },
+  /**
+   * 多行
+   * 多选，行选中事件
+   * value 选中true 不选false 半选-1
+   */
+  handleBatchSelectRows(rows, value, isForce) {
+    const $xeTable = this;
+    const {
+      treeConfig
+    } = $xeTable;
+    const {
+      selectCheckboxMaps,
+      checkboxOpts
+    } = this;
+    const {
+      checkField,
+      checkStrictly,
+      checkMethod
+    } = checkboxOpts;
+    if (checkField) {
+      if (treeConfig && !checkStrictly) {
+        rows.forEach(row => {
+          this.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);
+            this.handleCheckboxReserveRow(row, value);
+          }
+        });
+      }
+    } else {
+      if (treeConfig && !checkStrictly) {
+        rows.forEach(row => {
+          this.handleSelectRow({
+            row
+          }, value, isForce);
+        });
+      } else {
+        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        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];
+              }
+            }
+            this.handleCheckboxReserveRow(row, value);
+          }
+        });
+        this.selectCheckboxMaps = selectRowMaps;
+      }
+    }
+  },
   /**
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
@@ -8873,7 +8941,6 @@ const Methods = {
       }
     }
     this.selectCheckboxMaps = selectRowMaps;
-    this.checkSelectionStatus();
   },
   handleToggleCheckRowEvent(evnt, params) {
     const {
@@ -8900,6 +8967,7 @@ const Methods = {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
       this.handleSelectRow(params, value);
+      this.checkSelectionStatus();
     }
   },
   triggerCheckRowEvent(evnt, params, value) {
@@ -8939,6 +9007,7 @@ const Methods = {
       row
     })) {
       this.handleSelectRow(params, value);
+      this.checkSelectionStatus();
       this.emitEvent('checkbox-change', Object.assign({
         records: this.getCheckboxRecords(),
         reserves: this.getCheckboxReserveRecords(),
@@ -8962,6 +9031,7 @@ const Methods = {
     this.handleSelectRow({
       row
     }, value, true);
+    this.checkSelectionStatus();
     return this.$nextTick();
   },
   handleCheckedAllCheckboxRow(value, isForce) {