vxe-table 3.18.0-beta.8 → 3.18.1

package/packages/table/module/edit/mixin.ts

@@ -107,14 +107,18 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
 
   const { treeConfig } = props
   const { isRowGroupStatus } = reactData
-  const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData
+  const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps, removeRowMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
-  const { transform, rowField, mapChildrenField } = treeOpts
+  const { transform, parentField, rowField, mapChildrenField } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   if (!XEUtils.isArray(records)) {
     records = [records]
   }
   const newRecords: any[] = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
+  let treeRecords: any[] = []
+  if (treeConfig && transform) {
+    treeRecords = XEUtils.toArrayTree(newRecords, { key: rowField, parentKey: parentField, children: childrenField })
+  }
   if (XEUtils.eqNull(targetRow)) {
     // 如果为虚拟树
     if (treeConfig && transform) {
@@ -168,42 +172,49 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
     } else {
       // 如果为虚拟树
       if (treeConfig && transform) {
-        const matchMapObj = XEUtils.findTree(tableFullTreeData, (item: any) => targetRow[rowField] === item[rowField], { children: mapChildrenField })
+        const matchMapObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: mapChildrenField })
         if (matchMapObj) {
-          const { parent: parentRow } = matchMapObj as any
+          const { parent: parentRow } = matchMapObj
           const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData
           const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)]
           const parentLevel = parentRest ? parentRest.level : 0
-          newRecords.forEach((item: any, i: any) => {
-            const rowid = getRowid($xeTable, item)
-            if (item[treeOpts.parentField]) {
-              if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
-              }
-            }
+          treeRecords.forEach((row, i) => {
             if (parentRow) {
-              item[treeOpts.parentField] = parentRow[rowField]
+              if (row[parentField] !== parentRow[rowField]) {
+                row[parentField] = parentRow[rowField]
+                errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`])
+              }
+            } else {
+              if (row[parentField] !== null) {
+                row[parentField] = null
+                errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null'])
+              }
             }
             let targetIndex = matchMapObj.index + i
             if (isInsertNextRow) {
               targetIndex = targetIndex + 1
             }
-            parentMapChilds.splice(targetIndex, 0, item)
+            parentMapChilds.splice(targetIndex, 0, row)
+          })
+          XEUtils.eachTree(treeRecords, (item) => {
+            const rowid = getRowid($xeTable, item)
             const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+            if (item[childrenField]) {
+              item[mapChildrenField] = item[childrenField]
+            }
             fullDataRowIdData[rowid] = rest
             fullAllDataRowIdData[rowid] = rest
-          })
-
+          }, { children: childrenField })
           // 源
           if (parentRow) {
-            const matchObj = XEUtils.findTree(tableFullTreeData, (item: any) => targetRow[rowField] === item[rowField], { children: childrenField })
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => targetRow[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)
+              parentChilds.splice(targetIndex, 0, ...treeRecords)
             }
           }
         } else {
@@ -234,7 +245,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
           afIndex = Math.min(afterFullData.length, afIndex + 1)
         }
         if (afIndex === -1) {
-          throw new Error(errLog('vxe.error.unableInsert'))
+          throw new Error(getI18n('vxe.error.unableInsert'))
         }
         afterFullData.splice(afIndex, 0, ...newRecords)
         const tfIndex = $xeTable.findRowIndexOf(tableFullData, targetRow)
@@ -255,10 +266,27 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
       }
     }
   }
-  newRecords.forEach(newRow => {
+
+  const handleStatus = (newRow: any) => {
     const rowid = getRowid($xeTable, newRow)
-    insertRowMaps[rowid] = newRow
-  })
+    // 如果是被删除的数据，则还原状态
+    if (removeRowMaps[rowid]) {
+      delete removeRowMaps[rowid]
+      if (insertRowMaps[rowid]) {
+        delete insertRowMaps[rowid]
+      }
+    } else {
+      insertRowMaps[rowid] = newRow
+    }
+  }
+  // 如果为虚拟树
+  if (treeConfig && transform) {
+    XEUtils.eachTree(treeRecords, handleStatus, { children: mapChildrenField })
+  } else {
+    newRecords.forEach(handleStatus)
+  }
+
+  reactData.removeRowFlag++
   reactData.insertRowFlag++
   $xeTable.cacheRowMap(false)
   $xeTable.updateScrollYStatus()
@@ -815,7 +843,12 @@ export default {
       const { editStore } = reactData
       const { row, column } = editStore.actived
       if (column && row) {
-        return { row, column }
+        return {
+          row,
+          rowIndex: $xeTable.getRowIndex(row),
+          column,
+          columnIndex: $xeTable.getColumnIndex(column)
+        }
       }
       return null
     },
@@ -1008,7 +1041,10 @@ export default {
       const { editStore } = reactData
       const { row, column } = editStore.selected
       if (row && column) {
-        return { row, column }
+        return {
+          row,
+          column
+        }
       }
       return null
     },

package/packages/table/module/filter/mixin.ts

@@ -15,11 +15,13 @@ export default {
      * @param column
      */
     _openFilter (fieldOrColumn: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       const column = handleFieldOrColumn(this, fieldOrColumn)
       if (column && column.filters) {
         const { elemStore } = this
         const { fixed } = column
-        return this.scrollToColumn(column).then(() => {
+        return $xeTable.scrollToColumn(column).then(() => {
           const headerWrapperElem = elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper']
           if (headerWrapperElem) {
             const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-cell--filter`)
@@ -27,7 +29,7 @@ export default {
           }
         })
       }
-      return this.$nextTick()
+      return $xeTable.$nextTick()
     },
     /**
      * 修改筛选条件列表
@@ -195,9 +197,9 @@ export default {
       return filterList
     },
     handleColumnConfirmFilter (column: VxeTableDefines.ColumnInfo, evnt: Event | null) {
-      const $xeTable = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
-      const reactData = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
 
       const { mouseConfig } = props
       const { scrollXLoad: oldScrollXLoad, scrollYLoad: oldScrollYLoad } = reactData
@@ -212,22 +214,22 @@ export default {
           datas.push(item.data)
         }
       })
-      const filterList = this.getCheckedFilters()
-      const params = { $table: this, $event: evnt, column, field, property: field, values, datas, filters: filterList, filterList }
+      const filterList = $xeTable.getCheckedFilters()
+      const params = { $table: $xeTable, $event: evnt as Event, column, field, property: field, values, datas, filters: filterList, filterList }
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {
-        this.handleTableData(true)
-        this.checkSelectionStatus()
+        $xeTable.handleTableData(true)
+        $xeTable.checkSelectionStatus()
       }
-      if (mouseConfig && mouseOpts.area && this.handleFilterEvent) {
-        $xeTable.handleFilterEvent(evnt, params)
+      if (mouseConfig && mouseOpts.area && $xeTable.handleFilterEvent) {
+        $xeTable.handleFilterEvent(evnt as Event, params)
       }
       if (evnt) {
-        $xeTable.emitEvent('filter-change', params, evnt)
+        $xeTable.dispatchEvent('filter-change', params, evnt)
       }
       $xeTable.closeFilter()
       return $xeTable.updateFooter().then(() => {
-        const { scrollXLoad, scrollYLoad } = this
+        const { scrollXLoad, scrollYLoad } = reactData
         if ((oldScrollXLoad || scrollXLoad) || (oldScrollYLoad || scrollYLoad)) {
           if ((oldScrollXLoad || scrollXLoad)) {
             $xeTable.updateScrollXSpace()
@@ -259,6 +261,8 @@ export default {
       $xeTable.handleColumnConfirmFilter(column, evnt)
     },
     handleClearFilter (column: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       if (column) {
         const { filters, filterRender } = column
         if (filters) {
@@ -272,7 +276,7 @@ export default {
             }
           })
           if (filterResetMethod) {
-            filterResetMethod({ options: filters, column, $table: this })
+            filterResetMethod({ options: filters, column, $table: $xeTable })
           }
         }
       }

package/packages/table/module/keyboard/mixin.ts

@@ -130,6 +130,167 @@ function handleMoveSelected ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
   return params
 }
 
+function handleCheckboxRangeEvent ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, evnt: any, params: any) {
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { elemStore } = internalData
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+  const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
+  const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
+  const { column, cell } = params
+  if (column.type === 'checkbox') {
+    let bodyWrapperElem = bodyScrollElem as HTMLElement
+    if (leftScrollElem && column.fixed === 'left') {
+      bodyWrapperElem = leftScrollElem
+    } else if (rightScrollElem && column.fixed === 'right') {
+      bodyWrapperElem = rightScrollElem
+    }
+    if (!bodyWrapperElem) {
+      return
+    }
+    const el = $xeTable.$refs.refElem as HTMLDivElement
+    const disX = evnt.clientX
+    const disY = evnt.clientY
+    const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range') as HTMLElement
+    const trElem = cell.parentNode
+    const selectRecords = $xeTable.getCheckboxRecords()
+    let lastRangeRows = []
+    const marginSize = 1
+    const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem)
+    const startTop = offsetRest.offsetTop + evnt.offsetY
+    const startLeft = offsetRest.offsetLeft + evnt.offsetX
+    const startScrollTop = bodyWrapperElem.scrollTop
+    const rowHeight = trElem.offsetHeight
+    const trRect = trElem.getBoundingClientRect()
+    const offsetClientTop = disY - trRect.y
+    let mouseScrollTimeout: any = null
+    let isMouseScrollDown: any = false
+    let mouseScrollSpaceSize = 1
+    const triggerEvent = (type: any, evnt: any) => {
+      $xeTable.dispatchEvent(`checkbox-range-${type}` as 'checkbox-range-change' | 'checkbox-range-start' | 'checkbox-range-end', {
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords()
+      }, evnt)
+    }
+    const handleChecked = (evnt: any) => {
+      const { clientX, clientY } = evnt
+      const offsetLeft = clientX - disX
+      const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop)
+      let rangeHeight = Math.abs(offsetTop)
+      let rangeWidth = Math.abs(offsetLeft)
+      let rangeTop = startTop
+      let rangeLeft = startLeft
+      if (offsetTop < marginSize) {
+        // 向上
+        rangeTop += offsetTop
+        if (rangeTop < marginSize) {
+          rangeTop = marginSize
+          rangeHeight = startTop
+        }
+      } else {
+        // 向下
+        rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize)
+      }
+      if (offsetLeft < marginSize) {
+        // 向左
+        rangeLeft += offsetLeft
+        if (rangeWidth > startLeft) {
+          rangeLeft = marginSize
+          rangeWidth = startLeft
+        }
+      } else {
+        // 向右
+        rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize)
+      }
+      checkboxRangeElem.style.height = `${rangeHeight}px`
+      checkboxRangeElem.style.width = `${rangeWidth}px`
+      checkboxRangeElem.style.left = `${rangeLeft}px`
+      checkboxRangeElem.style.top = `${rangeTop}px`
+      checkboxRangeElem.style.display = 'block'
+      const rangeRows = getCheckboxRangeRows($xeTable, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight)
+      // 至少滑动 10px 才能有效匹配
+      if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
+        const isControlKey = hasControlKey(evnt)
+        lastRangeRows = rangeRows
+        if (isControlKey) {
+          rangeRows.forEach((row: any) => {
+            $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1)
+          })
+        } else {
+          $xeTable.setAllCheckboxRow(false)
+          $xeTable.handleCheckedCheckboxRow(rangeRows, true, false)
+        }
+        triggerEvent('change', evnt)
+      }
+    }
+    // 停止鼠标滚动
+    const stopMouseScroll = () => {
+      clearTimeout(mouseScrollTimeout)
+      mouseScrollTimeout = null
+    }
+    // 开始鼠标滚动
+    const startMouseScroll = (evnt: any) => {
+      stopMouseScroll()
+      mouseScrollTimeout = setTimeout(() => {
+        if (mouseScrollTimeout) {
+          const { scrollLeft, scrollTop, clientHeight, scrollHeight } = bodyWrapperElem
+          const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight)
+          if (isMouseScrollDown) {
+            if (scrollTop + clientHeight < scrollHeight) {
+              $xeTable.scrollTo(scrollLeft, scrollTop + topSize)
+              startMouseScroll(evnt)
+              handleChecked(evnt)
+            } else {
+              stopMouseScroll()
+            }
+          } else {
+            if (scrollTop) {
+              $xeTable.scrollTo(scrollLeft, scrollTop - topSize)
+              startMouseScroll(evnt)
+              handleChecked(evnt)
+            } else {
+              stopMouseScroll()
+            }
+          }
+        }
+      }, 50)
+    }
+    addClass(el, 'drag--range')
+    document.onmousemove = evnt => {
+      evnt.preventDefault()
+      evnt.stopPropagation()
+      const { clientY } = evnt
+      const { boundingTop } = getAbsolutePos(bodyWrapperElem)
+      // 如果超过可视区，触发滚动
+      if (clientY < boundingTop) {
+        isMouseScrollDown = false
+        mouseScrollSpaceSize = boundingTop - clientY
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt)
+        }
+      } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
+        isMouseScrollDown = true
+        mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight
+        if (!mouseScrollTimeout) {
+          startMouseScroll(evnt)
+        }
+      } else if (mouseScrollTimeout) {
+        stopMouseScroll()
+      }
+      handleChecked(evnt)
+    }
+    document.onmouseup = (evnt) => {
+      stopMouseScroll()
+      removeClass(el, 'drag--range')
+      checkboxRangeElem.removeAttribute('style')
+      document.onmousemove = null
+      document.onmouseup = null
+      triggerEvent('end', evnt)
+    }
+    triggerEvent('start', evnt)
+  }
+}
+
 export default {
   methods: {
     // 处理 Tab 键移动
@@ -344,181 +505,24 @@ export default {
     },
     handleCellMousedownEvent (evnt: any, params: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
 
-      const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this
+      const { editConfig, checkboxConfig, mouseConfig } = props
+      const checkboxOpts = $xeTable.computeCheckboxOpts
+      const mouseOpts = $xeTable.computeMouseOpts
+      const editOpts = $xeTable.computeEditOpts
       if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
         return $xeTable.triggerCellAreaModnEvent(evnt, params)
       } else {
         if (checkboxConfig && checkboxOpts.range) {
-          this.handleCheckboxRangeEvent(evnt, params)
+          handleCheckboxRangeEvent($xeTable, evnt, params)
         }
         if (mouseConfig && mouseOpts.selected) {
           if (!editConfig || editOpts.mode === 'cell') {
-            handleSelected(params, evnt)
-          }
-        }
-      }
-    },
-    handleCheckboxRangeEvent (evnt: any, params: any) {
-      const $xeTable = this
-      const internalData = $xeTable
-
-      const { elemStore } = internalData
-      const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
-      const leftScrollElem = getRefElem(elemStore['left-body-scroll'])
-      const rightScrollElem = getRefElem(elemStore['right-body-scroll'])
-      const { column, cell } = params
-      if (column.type === 'checkbox') {
-        let bodyWrapperElem = bodyScrollElem as HTMLElement
-        if (leftScrollElem && column.fixed === 'left') {
-          bodyWrapperElem = leftScrollElem
-        } else if (rightScrollElem && column.fixed === 'right') {
-          bodyWrapperElem = rightScrollElem
-        }
-        if (!bodyWrapperElem) {
-          return
-        }
-        const el = $xeTable.$refs.refElem as HTMLDivElement
-        const disX = evnt.clientX
-        const disY = evnt.clientY
-        const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range') as HTMLElement
-        const trElem = cell.parentNode
-        const selectRecords = this.getCheckboxRecords()
-        let lastRangeRows = []
-        const marginSize = 1
-        const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem)
-        const startTop = offsetRest.offsetTop + evnt.offsetY
-        const startLeft = offsetRest.offsetLeft + evnt.offsetX
-        const startScrollTop = bodyWrapperElem.scrollTop
-        const rowHeight = trElem.offsetHeight
-        const trRect = trElem.getBoundingClientRect()
-        const offsetClientTop = disY - trRect.y
-        let mouseScrollTimeout: any = null
-        let isMouseScrollDown: any = false
-        let mouseScrollSpaceSize = 1
-        const triggerEvent = (type: any, evnt: any) => {
-          this.emitEvent(`checkbox-range-${type}`, {
-            records: () => this.getCheckboxRecords(),
-            reserves: () => this.getCheckboxReserveRecords()
-          }, evnt)
-        }
-        const handleChecked = (evnt: any) => {
-          const { clientX, clientY } = evnt
-          const offsetLeft = clientX - disX
-          const offsetTop = clientY - disY + (bodyWrapperElem.scrollTop - startScrollTop)
-          let rangeHeight = Math.abs(offsetTop)
-          let rangeWidth = Math.abs(offsetLeft)
-          let rangeTop = startTop
-          let rangeLeft = startLeft
-          if (offsetTop < marginSize) {
-            // 向上
-            rangeTop += offsetTop
-            if (rangeTop < marginSize) {
-              rangeTop = marginSize
-              rangeHeight = startTop
-            }
-          } else {
-            // 向下
-            rangeHeight = Math.min(rangeHeight, bodyWrapperElem.scrollHeight - startTop - marginSize)
-          }
-          if (offsetLeft < marginSize) {
-            // 向左
-            rangeLeft += offsetLeft
-            if (rangeWidth > startLeft) {
-              rangeLeft = marginSize
-              rangeWidth = startLeft
-            }
-          } else {
-            // 向右
-            rangeWidth = Math.min(rangeWidth, bodyWrapperElem.clientWidth - startLeft - marginSize)
-          }
-          checkboxRangeElem.style.height = `${rangeHeight}px`
-          checkboxRangeElem.style.width = `${rangeWidth}px`
-          checkboxRangeElem.style.left = `${rangeLeft}px`
-          checkboxRangeElem.style.top = `${rangeTop}px`
-          checkboxRangeElem.style.display = 'block'
-          const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight)
-          // 至少滑动 10px 才能有效匹配
-          if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
-            const isControlKey = hasControlKey(evnt)
-            lastRangeRows = rangeRows
-            if (isControlKey) {
-              rangeRows.forEach((row: any) => {
-                $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1)
-              })
-            } else {
-              this.setAllCheckboxRow(false)
-              this.handleCheckedCheckboxRow(rangeRows, true, false)
-            }
-            triggerEvent('change', evnt)
-          }
-        }
-        // 停止鼠标滚动
-        const stopMouseScroll = () => {
-          clearTimeout(mouseScrollTimeout)
-          mouseScrollTimeout = null
-        }
-        // 开始鼠标滚动
-        const startMouseScroll = (evnt: any) => {
-          stopMouseScroll()
-          mouseScrollTimeout = setTimeout(() => {
-            if (mouseScrollTimeout) {
-              const { scrollLeft, scrollTop, clientHeight, scrollHeight } = bodyWrapperElem
-              const topSize = Math.ceil(mouseScrollSpaceSize * 50 / rowHeight)
-              if (isMouseScrollDown) {
-                if (scrollTop + clientHeight < scrollHeight) {
-                  this.scrollTo(scrollLeft, scrollTop + topSize)
-                  startMouseScroll(evnt)
-                  handleChecked(evnt)
-                } else {
-                  stopMouseScroll()
-                }
-              } else {
-                if (scrollTop) {
-                  this.scrollTo(scrollLeft, scrollTop - topSize)
-                  startMouseScroll(evnt)
-                  handleChecked(evnt)
-                } else {
-                  stopMouseScroll()
-                }
-              }
-            }
-          }, 50)
-        }
-        addClass(el, 'drag--range')
-        document.onmousemove = evnt => {
-          evnt.preventDefault()
-          evnt.stopPropagation()
-          const { clientY } = evnt
-          const { boundingTop } = getAbsolutePos(bodyWrapperElem)
-          // 如果超过可视区，触发滚动
-          if (clientY < boundingTop) {
-            isMouseScrollDown = false
-            mouseScrollSpaceSize = boundingTop - clientY
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt)
-            }
-          } else if (clientY > boundingTop + bodyWrapperElem.clientHeight) {
-            isMouseScrollDown = true
-            mouseScrollSpaceSize = clientY - boundingTop - bodyWrapperElem.clientHeight
-            if (!mouseScrollTimeout) {
-              startMouseScroll(evnt)
-            }
-          } else if (mouseScrollTimeout) {
-            stopMouseScroll()
+            $xeTable.handleSelected(params, evnt)
           }
-          handleChecked(evnt)
         }
-        document.onmouseup = (evnt) => {
-          stopMouseScroll()
-          removeClass(el, 'drag--range')
-          checkboxRangeElem.removeAttribute('style')
-          document.onmousemove = null
-          document.onmouseup = null
-          triggerEvent('end', evnt)
-        }
-        triggerEvent('start', evnt)
       }
     }
-  } as any
+  }
 }

package/packages/table/module/menu/mixin.ts

@@ -105,22 +105,29 @@ export default {
           const params: any = { type: layout, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, columns: this.visibleColumn.slice(0), $event: evnt }
           if (columnTargetNode.flag) {
             const cell = columnTargetNode.targetElem
-            const column = this.getColumnNode(cell).item
+            const columnNodeRest = $xeTable.getColumnNode(cell)
+            const column = columnNodeRest ? columnNodeRest.item : null
             let typePrefix = `${layout}-`
-            Object.assign(params, { column, columnIndex: this.getColumnIndex(column), cell })
+            if (column) {
+              Object.assign(params, { column, columnIndex: $xeTable.getColumnIndex(column), cell })
+            }
             if (layout === 'body') {
-              const row = this.getRowNode(cell.parentNode).item
+              const rowNodeRest = $xeTable.getRowNode(cell.parentNode)
+              const row = rowNodeRest ? rowNodeRest.item : null
               typePrefix = ''
-              params.row = row
-              params.rowIndex = this.getRowIndex(row)
+              if (row) {
+                params.row = row
+                params.rowIndex = $xeTable.getRowIndex(row)
+              }
             }
+            const eventType = `${typePrefix}cell-menu` as 'cell-menu' | 'header-cell-menu' | 'footer-cell-menu'
             this.handleOpenMenuEvent(evnt, layout, params)
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
-              this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt)
+              $xeTable.dispatchEvent(`${typePrefix}cell-context-menu` as any, params, evnt)
             } else {
-              this.emitEvent(`${typePrefix}cell-menu`, params, evnt)
+              $xeTable.dispatchEvent(eventType, params, evnt)
             }
             return
           } else if (getEventTargetNode(evnt, this.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === tId).flag) {
@@ -271,9 +278,9 @@ export default {
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
           warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
-          this.emitEvent('context-menu-click', params, evnt)
+          $xeTable.dispatchEvent('context-menu-click' as any, params, evnt)
         } else {
-          this.emitEvent('menu-click', params, evnt)
+          $xeTable.dispatchEvent('menu-click', params, evnt)
         }
         this.closeMenu()
       }