vxe-table 3.9.8 → 3.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.9.8",
+  "version": "3.9.10",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/methods.ts

@@ -338,7 +338,6 @@ const Methods = {
     const { scrollXLoad, scrollYLoad } = this
     return this.handleTableData(true).then(() => {
       this.updateFooter()
-      this.checkSelectionStatus()
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
           this.updateScrollXSpace()
@@ -3352,7 +3351,8 @@ const Methods = {
     if (rows && !XEUtils.isArray(rows)) {
       rows = [rows]
     }
-    rows.forEach((row: any) => this.handleSelectRow({ row }, !!value, isForce))
+    this.handleBatchSelectRows(rows, !!value, isForce)
+    this.checkSelectionStatus()
     return this.$nextTick()
   },
   /**
@@ -3361,6 +3361,9 @@ const Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow (rows: any, value: any) {
+    if (rows && !XEUtils.isArray(rows)) {
+      rows = [rows]
+    }
     return this.handleCheckedCheckboxRow(rows, value, true)
   },
   isCheckedByCheckboxRow (row: any) {
@@ -3375,6 +3378,56 @@ const Methods = {
     const { treeIndeterminateMaps } = this
     return !!treeIndeterminateMaps[getRowid(this, row)] && !this.isCheckedByCheckboxRow(row)
   },
+  /**
+   * 多行
+   * 多选，行选中事件
+   * value 选中true 不选false 半选-1
+   */
+  handleBatchSelectRows (rows: any[], value: any, isForce: any) {
+    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 }))) {
+            XEUtils.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
@@ -3536,7 +3589,6 @@ const Methods = {
       }
     }
     this.selectCheckboxMaps = selectRowMaps
-    this.checkSelectionStatus()
   },
   handleToggleCheckRowEvent (evnt: any, params: any) {
     const { selectCheckboxMaps, checkboxOpts } = this
@@ -3555,6 +3607,7 @@ const Methods = {
       this.triggerCheckRowEvent(evnt, params, value)
     } else {
       this.handleSelectRow(params, value)
+      this.checkSelectionStatus()
     }
   },
   triggerCheckRowEvent (evnt: any, params: any, value: any) {
@@ -3582,6 +3635,7 @@ const Methods = {
     }
     if (!checkMethod || checkMethod({ row })) {
       this.handleSelectRow(params, value)
+      this.checkSelectionStatus()
       this.emitEvent('checkbox-change', Object.assign({
         records: this.getCheckboxRecords(),
         reserves: this.getCheckboxReserveRecords(),
@@ -3598,6 +3652,7 @@ const Methods = {
     const { checkField } = checkboxOpts
     const value = checkField ? !XEUtils.get(row, checkField) : !selectCheckboxMaps[getRowid(this, row)]
     this.handleSelectRow({ row }, value, true)
+    this.checkSelectionStatus()
     return this.$nextTick()
   },
   handleCheckedAllCheckboxRow (value: any, isForce: any) {

package/packages/table/src/util.ts

@@ -393,17 +393,18 @@ export function colToVisible ($xeTable: any, column: any) {
     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
@@ -413,7 +414,7 @@ export function colToVisible ($xeTable: any, column: any) {
         if (scrollLeft < bodySrcollLeft) {
           return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1)
         }
-        return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - offsetFixedRight + 1)
+        return $xeTable.scrollTo((scrollLeft + cellWidth) - (bodyWidth - offsetFixedRight - 1))
       }
     }
   }