vxe-table 3.7.0-beta.11 → 3.7.0-beta.13

package/packages/edit/src/mixin.js

@@ -19,10 +19,15 @@ function insertTreeRow (_vm, newRecords, isAppend) {
       const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
       const parentLevel = parentRest ? parentRest.level : 0
       let parentChilds = parentRow[childrenField]
+      let mapChilds = parentRow[mapChildrenField]
       if (!XEUtils.isArray(parentChilds)) {
         parentChilds = parentRow[childrenField] = []
       }
+      if (!XEUtils.isArray(mapChilds)) {
+        mapChilds = parentRow[childrenField] = []
+      }
       parentChilds[funcName](item)
+      mapChilds[funcName](item)
       const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
@@ -41,6 +46,156 @@ function insertTreeRow (_vm, newRecords, isAppend) {
   })
 }
 
+function handleInsertRowAt (_vm, records, row, isInsertNextRow) {
+  const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
+  const { transform, rowField, mapChildrenField } = treeOpts
+  const childrenField = treeOpts.children || treeOpts.childrenField
+  if (!XEUtils.isArray(records)) {
+    records = [records]
+  }
+  const newRecords = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
+  if (!row) {
+  // 如果为虚拟树
+    if (treeConfig && transform) {
+      insertTreeRow(_vm, newRecords, false)
+    } else {
+      afterFullData.unshift(...newRecords)
+      tableFullData.unshift(...newRecords)
+      // 刷新单元格合并
+      mergeList.forEach(mergeItem => {
+        const { row: mergeRowIndex } = mergeItem
+        if (mergeRowIndex > 0) {
+          mergeItem.row = mergeRowIndex + newRecords.length
+        }
+      })
+    }
+  } else {
+    if (row === -1) {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        insertTreeRow(_vm, newRecords, true)
+      } else {
+        afterFullData.push(...newRecords)
+        tableFullData.push(...newRecords)
+        // 刷新单元格合并
+        mergeList.forEach(mergeItem => {
+          const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
+          if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length
+          }
+        })
+      }
+    } else {
+      // 如果为虚拟树
+      if (treeConfig && transform) {
+        const matchMapObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildrenField })
+        if (matchMapObj) {
+          const { parent: parentRow } = matchMapObj
+          const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData
+          const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
+          const parentLevel = parentRest ? parentRest.level : 0
+          newRecords.forEach((item, i) => {
+            const rowid = getRowid(_vm, item)
+            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              if (item[treeOpts.parentField]) {
+                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                  errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
+                }
+              }
+            }
+            if (parentRow) {
+              item[treeOpts.parentField] = parentRow[rowField]
+            }
+            let targetIndex = matchMapObj.index + i
+            if (isInsertNextRow) {
+              targetIndex = targetIndex + 1
+            }
+            parentMapChilds.splice(targetIndex, 0, item)
+            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1 }
+            fullDataRowIdData[rowid] = rest
+            fullAllDataRowIdData[rowid] = rest
+          })
+
+          // 源
+          if (parentRow) {
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: childrenField })
+            if (matchObj) {
+              const parentChilds = matchObj.items
+              let targetIndex = matchObj.index
+              if (isInsertNextRow) {
+                targetIndex = targetIndex + 1
+              }
+              parentChilds.splice(targetIndex, 0, ...newRecords)
+            }
+          }
+        } else {
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            warnLog('vxe.error.unableInsert')
+          }
+          insertTreeRow(_vm, newRecords, true)
+        }
+      } else {
+        if (treeConfig) {
+          throw new Error(getLog('vxe.error.noTree', ['insert']))
+        }
+        let afIndex = -1
+        // 如果是可视索引
+        if (XEUtils.isNumber(row)) {
+          if (row < afterFullData.length) {
+            afIndex = row
+          }
+        } else {
+          afIndex = _vm.findRowIndexOf(afterFullData, row)
+        }
+        // 如果是插入指定行的下一行
+        if (isInsertNextRow) {
+          afIndex = Math.max(afterFullData.length, afIndex + 1)
+        }
+        if (afIndex === -1) {
+          throw new Error(errLog('vxe.error.unableInsert'))
+        }
+        afterFullData.splice(afIndex, 0, ...newRecords)
+        tableFullData.splice(_vm.findRowIndexOf(tableFullData, row), 0, ...newRecords)
+        // 刷新单元格合并
+        mergeList.forEach(mergeItem => {
+          const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
+          if (mergeRowIndex > afIndex) {
+            mergeItem.row = mergeRowIndex + newRecords.length
+          } else if (mergeRowIndex + mergeRowspan > afIndex) {
+            mergeItem.rowspan = mergeRowspan + newRecords.length
+          }
+        })
+      }
+    }
+  }
+  const { insertList, insertMaps } = editStore
+  newRecords.forEach(newRow => {
+    const rowid = getRowid(_vm, newRow)
+    insertMaps[rowid] = newRow
+  })
+  insertList.unshift(...newRecords)
+  _vm.cacheRowMap()
+  _vm.updateScrollYStatus()
+  _vm.handleTableData(treeConfig && transform)
+  if (!(treeConfig && transform)) {
+    _vm.updateAfterDataIndex()
+  }
+  _vm.updateFooter()
+  _vm.checkSelectionStatus()
+  if (_vm.scrollYLoad) {
+    _vm.updateScrollYSpace()
+  }
+  return _vm.$nextTick().then(() => {
+    _vm.updateCellAreas()
+    return _vm.recalculate()
+  }).then(() => {
+    return {
+      row: newRecords.length ? newRecords[newRecords.length - 1] : null,
+      rows: newRecords
+    }
+  })
+}
+
 export default {
   methods: {
     /**
@@ -49,7 +204,7 @@ export default {
      * @param {*} records
      */
     _insert (records) {
-      return this.insertAt(records)
+      return handleInsertRowAt(this, records, null)
     },
     /**
      * 往表格指定行中插入临时数据
@@ -58,133 +213,13 @@ export default {
      * 如果 row 为有效行则插入到该行的位置
      * @param {Object/Array} records 新的数据
      * @param {Row} row 指定行
+     * @returns
      */
     _insertAt (records, row) {
-      const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
-      const { transform, rowField, mapChildrenField } = treeOpts
-      if (!XEUtils.isArray(records)) {
-        records = [records]
-      }
-      const newRecords = this.defineField(records.map(record => Object.assign({}, record)))
-      if (!row) {
-        // 如果为虚拟树
-        if (treeConfig && transform) {
-          insertTreeRow(this, newRecords, false)
-        } else {
-          afterFullData.unshift(...newRecords)
-          tableFullData.unshift(...newRecords)
-          // 刷新单元格合并
-          mergeList.forEach(mergeItem => {
-            const { row: mergeRowIndex } = mergeItem
-            if (mergeRowIndex > 0) {
-              mergeItem.row = mergeRowIndex + newRecords.length
-            }
-          })
-        }
-      } else {
-        if (row === -1) {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            insertTreeRow(this, newRecords, true)
-          } else {
-            afterFullData.push(...newRecords)
-            tableFullData.push(...newRecords)
-            // 刷新单元格合并
-            mergeList.forEach(mergeItem => {
-              const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length
-              }
-            })
-          }
-        } else {
-          // 如果为虚拟树
-          if (treeConfig && transform) {
-            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildrenField })
-            if (matchObj) {
-              const { parent: parentRow } = matchObj
-              const parentChilds = matchObj.items
-              const parentRest = fullAllDataRowIdData[getRowid(this, parentRow)]
-              const parentLevel = parentRest ? parentRest.level : 0
-              newRecords.forEach((item, i) => {
-                const rowid = getRowid(this, item)
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-                  if (item[treeOpts.parentField]) {
-                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                      errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
-                    }
-                  }
-                }
-                if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[rowField]
-                }
-                parentChilds.splice(matchObj.index + i, 0, item)
-                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1 }
-                fullDataRowIdData[rowid] = rest
-                fullAllDataRowIdData[rowid] = rest
-              })
-            } else {
-              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-                warnLog('vxe.error.unableInsert')
-              }
-              insertTreeRow(this, newRecords, true)
-            }
-          } else {
-            if (treeConfig) {
-              throw new Error(getLog('vxe.error.noTree', ['insert']))
-            }
-            let afIndex = -1
-            // 如果是可视索引
-            if (XEUtils.isNumber(row)) {
-              if (row < afterFullData.length) {
-                afIndex = row
-              }
-            } else {
-              afIndex = this.findRowIndexOf(afterFullData, row)
-            }
-            if (afIndex === -1) {
-              throw new Error(errLog('vxe.error.unableInsert'))
-            }
-            afterFullData.splice(afIndex, 0, ...newRecords)
-            tableFullData.splice(this.findRowIndexOf(tableFullData, row), 0, ...newRecords)
-            // 刷新单元格合并
-            mergeList.forEach(mergeItem => {
-              const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex + newRecords.length
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan + newRecords.length
-              }
-            })
-          }
-        }
-      }
-      const { insertList, insertMaps } = editStore
-      newRecords.forEach(newRow => {
-        const rowid = getRowid(this, newRow)
-        insertMaps[rowid] = newRow
-      })
-      insertList.unshift(...newRecords)
-      this.cacheRowMap()
-      this.updateScrollYStatus()
-      this.handleTableData(treeConfig && transform)
-      if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex()
-      }
-      this.updateFooter()
-      this.checkSelectionStatus()
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace()
-      }
-      return this.$nextTick().then(() => {
-        this.updateCellAreas()
-        return this.recalculate()
-      }).then(() => {
-        return {
-          row: newRecords.length ? newRecords[newRecords.length - 1] : null,
-          rows: newRecords
-        }
-      })
+      return handleInsertRowAt(this, records, row)
+    },
+    _insertNextAt (records, row) {
+      return handleInsertRowAt(this, records, row, true)
     },
     /**
      * 删除指定行数据
@@ -194,10 +229,11 @@ export default {
      */
     _remove (rows) {
       const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selectCheckboxRows, isInsertByRow, treeOpts } = this
-      const { transform } = treeOpts
+      const { transform, mapChildrenField } = treeOpts
+      const childrenField = treeOpts.children || treeOpts.childrenField
       const { actived, removeList, insertList, insertMaps } = editStore
       const { checkField } = checkboxOpts
-      let rest = []
+      let delList = []
       if (!rows) {
         rows = tableFullData
       } else if (!XEUtils.isArray(rows)) {
@@ -220,7 +256,7 @@ export default {
       }
       // 从数据源中移除
       if (tableFullData === rows) {
-        rows = rest = tableFullData.slice(0)
+        rows = delList = tableFullData.slice(0)
         this.tableFullData = []
         this.afterFullData = []
         this.clearMergeCells()
@@ -229,10 +265,14 @@ export default {
         if (treeConfig && transform) {
           rows.forEach((row) => {
             const rowid = getRowid(this, row)
-            const matchObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), treeOpts)
+            const matchMapObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), { children: mapChildrenField })
+            if (matchMapObj) {
+              const rItems = matchMapObj.items.splice(matchMapObj.index, 1)
+              delList.push(rItems[0])
+            }
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), { children: childrenField })
             if (matchObj) {
-              const rItems = matchObj.items.splice(matchObj.index, 1)
-              rest.push(rItems[0])
+              matchObj.items.splice(matchObj.index, 1)
             }
             const afIndex = this.findRowIndexOf(afterFullData, row)
             if (afIndex > -1) {
@@ -244,7 +284,7 @@ export default {
             const tfIndex = this.findRowIndexOf(tableFullData, row)
             if (tfIndex > -1) {
               const rItems = tableFullData.splice(tfIndex, 1)
-              rest.push(rItems[0])
+              delList.push(rItems[0])
             }
             const afIndex = this.findRowIndexOf(afterFullData, row)
             if (afIndex > -1) {
@@ -289,7 +329,7 @@ export default {
         this.updateCellAreas()
         return this.recalculate()
       }).then(() => {
-        return { row: rest.length ? rest[rest.length - 1] : null, rows: rest }
+        return { row: delList.length ? delList[delList.length - 1] : null, rows: delList }
       })
     },
     /**

package/packages/table/src/body.js

@@ -9,7 +9,7 @@ import { getSlotVNs } from '../../tools/vn'
 const renderType = 'body'
 
 // 滚动、拖动过程中不需要触发
-function isOperateMouse ($xetable) {
+function isVMScrollProcess ($xetable) {
   return $xetable._isResize || ($xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover)
 }
 
@@ -122,7 +122,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return
       }
       if (showTitle) {
@@ -139,7 +139,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = evnt => {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return
       }
       if (showTooltip || showAllTip) {
@@ -323,13 +323,13 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 事件绑定
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = evnt => {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return
         }
         $xetable.triggerHoverEvent(evnt, { row, rowIndex })
       }
       trOn.mouseleave = () => {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return
         }
         $xetable.clearHoverRow()

package/packages/table/src/cell.js

@@ -471,12 +471,13 @@ export const Cell = {
   },
   renderCheckboxCellByProp (h, params) {
     const { $table, row, column, isHidden } = params
-    const { treeConfig, treeIndeterminates } = $table
-    const { labelField, checkField, halfField, checkMethod, visibleMethod } = $table.checkboxOpts
+    const { treeConfig, treeIndeterminates, checkboxOpts } = $table
+    const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
     const checkboxSlot = slots ? slots.checkbox : null
-    let indeterminate = false
+    let isIndeterminate = false
     let isChecked = false
     const isVisible = !visibleMethod || visibleMethod({ row })
     let isDisabled = !!checkMethod
@@ -495,10 +496,10 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
+        isIndeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
       }
     }
-    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
+    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate }
     if (checkboxSlot) {
       return $table.callSlot(checkboxSlot, checkboxParams, h)
     }
@@ -506,7 +507,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
+          class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -522,7 +523,7 @@ export const Cell = {
         class: ['vxe-cell--checkbox', {
           'is--checked': isChecked,
           'is--disabled': isDisabled,
-          'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
+          'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate
         }],
         on
       }, checkVNs)

package/packages/table/src/methods.js

@@ -3080,8 +3080,25 @@ const Methods = {
     }
   },
   triggerCheckRowEvent (evnt, params, value) {
-    const { checkMethod } = this.checkboxOpts
-    if (!checkMethod || checkMethod({ row: params.row })) {
+    const { checkboxOpts, afterFullData } = this
+    const { checkMethod } = checkboxOpts
+    const { row } = params
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+      const checkboxRecords = this.getCheckboxRecords()
+      if (checkboxRecords.length) {
+        const firstRow = checkboxRecords[0]
+        const _rowIndex = this.getVTRowIndex(row)
+        const _firstRowIndex = this.getVTRowIndex(firstRow)
+        if (_rowIndex !== _firstRowIndex) {
+          this.setAllCheckboxRow(false)
+          const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1)
+          this.handleCheckedCheckboxRow(rangeRows, true, false)
+          this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
+          return
+        }
+      }
+    }
+    if (!checkMethod || checkMethod({ row })) {
       this.handleSelectRow(params, value)
       this.emitEvent('checkbox-change', Object.assign({
         records: this.getCheckboxRecords(),
@@ -3104,6 +3121,7 @@ const Methods = {
   handleCheckedAllCheckboxRow (value, isForce) {
     const { afterFullData, treeConfig, treeOpts, selectCheckboxRows, checkboxReserveRowMap, checkboxOpts } = this
     const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     let selectRows = []
     const beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
     if (checkStrictly) {
@@ -3121,6 +3139,9 @@ const Methods = {
             }
             XEUtils.set(row, checkField, value)
           }
+          if (treeConfig && indeterminateField) {
+            XEUtils.set(row, indeterminateField, false)
+          }
         }
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -3206,7 +3227,8 @@ const Methods = {
   },
   checkSelectionStatus () {
     const { afterFullData, selectCheckboxRows, treeIndeterminates, checkboxOpts, treeConfig } = this
-    const { checkField, halfField, checkStrictly, checkMethod } = checkboxOpts
+    const { checkField, checkStrictly, checkMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (!checkStrictly) {
       const disableRows = []
       const checkRows = []
@@ -3231,14 +3253,14 @@ const Methods = {
         )
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
-          if (halfField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
+          if (indeterminateField) {
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, indeterminateField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           }
         } else {
-          if (halfField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField))
+          if (indeterminateField) {
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, indeterminateField))
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField))
           }
@@ -3411,11 +3433,18 @@ const Methods = {
   clearCheckboxRow () {
     const { tableFullData, treeConfig, treeOpts, checkboxOpts } = this
     const { checkField, reserve } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (checkField) {
+      const handleClearChecked = (item) => {
+        if (treeConfig && indeterminateField) {
+          XEUtils.set(item, indeterminateField, false)
+        }
+        XEUtils.set(item, checkField, false)
+      }
       if (treeConfig) {
-        XEUtils.eachTree(tableFullData, item => XEUtils.set(item, checkField, false), treeOpts)
+        XEUtils.eachTree(tableFullData, handleClearChecked, treeOpts)
       } else {
-        tableFullData.forEach(item => XEUtils.set(item, checkField, false))
+        tableFullData.forEach(handleClearChecked)
       }
     }
     if (reserve) {
@@ -4911,7 +4940,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -885,6 +885,12 @@ export default {
       if (this.editConfig && this.editOpts.activeMethod) {
         warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
       }
+      if (this.treeConfig && this.checkboxOpts.isShiftKey) {
+        errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+      }
+      if (this.checkboxOpts.halfField) {
+        warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+      }
     }
 
     // 检查是否有安装需要的模块

package/packages/table/src/util.js

@@ -160,7 +160,7 @@ function countTreeExpand (prevRow, params) {
   const { treeOpts } = $table
   const childrenField = treeOpts.children || treeOpts.childrenField
   const rowChildren = prevRow[childrenField]
-  if ($table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
     }

package/packages/v-x-e-table/src/commands.js

@@ -22,7 +22,7 @@ class VXECommandsStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        warnLog('vxe.error.delProp', ['commands -> callback', 'commandMethod'])
       }
       render = {
         commandMethod: render

package/packages/v-x-e-table/src/conf.js

@@ -119,12 +119,12 @@ export default {
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }

package/packages/v-x-e-table/src/formats.js

@@ -22,7 +22,7 @@ class VXEFormatsStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'cellFormatMethod'])
+        warnLog('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
       }
       render = {
         cellFormatMethod: render

package/packages/v-x-e-table/src/menus.js

@@ -22,7 +22,7 @@ class VXEMenusStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        warnLog('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
       }
       render = {
         menuMethod: render

package/packages/v-x-e-table/src/renderer.js

@@ -104,8 +104,8 @@ function getNativeOns (renderOpts, params) {
   XEUtils.objectEach(nativeEvents, (func, key) => {
     nativeOns[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)
@@ -123,8 +123,8 @@ function getOns (renderOpts, params, inputFunc, changeFunc) {
   XEUtils.objectEach(events, (func, key) => {
     ons[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)