vxe-table 3.18.20 → 3.18.22

package/packages/table/src/cell.ts

@@ -299,7 +299,7 @@ function renderCellHandle (h: CreateElement, params: VxeTableDefines.CellRenderB
     case 'html':
       return isDeepCell ? Cell.renderDeepHTMLCell(h, params) : Cell.renderHTMLCell(h, params)
   }
-  if (editConfig && isEnableConf(editOpts) && editRender) {
+  if (isEnableConf(editConfig) && editRender) {
     return editOpts.mode === 'cell' ? (isDeepCell ? Cell.renderDeepCellEdit(h, params) : Cell.renderCellEdit(h, params)) : (isDeepCell ? Cell.renderDeepRowEdit(h, params) : Cell.renderRowEdit(h, params))
   }
   return isDeepCell ? Cell.renderDeepCell(h, params) : Cell.renderDefaultCell(h, params)
@@ -311,7 +311,6 @@ function renderHeaderHandle (h: CreateElement, params: VxeTableDefines.CellRende
   const { column, $table } = params
   const tableProps = $table
   const { editConfig } = tableProps
-  const editOpts = $table.computeEditOpts
   const { type, filters, sortable, editRender } = column
   switch (type) {
     case 'seq':
@@ -330,7 +329,7 @@ function renderHeaderHandle (h: CreateElement, params: VxeTableDefines.CellRende
       }
       break
   }
-  if (editConfig && isEnableConf(editOpts) && editRender) {
+  if (editConfig && editRender) {
     return Cell.renderEditHeader(h, params)
   } else if (filters && sortable) {
     return Cell.renderSortAndFilterHeader(h, params)
@@ -385,14 +384,11 @@ export const Cell = {
   },
   renderDefaultCell (h: CreateElement, params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     const { $table, row, column } = params
-    const tableProps = $table
     const tableReactData = $table as unknown as TableReactData
     const tableInternalData = $table as unknown as TableInternalData
     const { isRowGroupStatus } = tableReactData
-    const { editConfig } = tableProps
-    const editOpts = $table.computeEditOpts
     const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column
-    const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender
+    const renderOpts = editRender || cellRender
     const defaultSlot = slots ? slots.default : null
     const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null
     let cellValue: string | number | null = ''

package/packages/table/src/methods.ts

@@ -3882,7 +3882,9 @@ const wheelScrollTopTo = (diffNum: number, cb: (progress: number) => void) => {
   let countTop = 0
   const step = (timestamp: number) => {
     let progress = (timestamp - startTime) / duration
-    if (progress > 1) {
+    if (progress < 0) {
+      progress = 0
+    } else if (progress > 1) {
       progress = 1
     }
     const easedProgress = Math.pow(progress, 2)
@@ -4271,7 +4273,7 @@ const Methods = {
     reactData.tableData = tableData
     internalData.visibleDataRowIdData = visibleDataRowIdMaps
     if ($xeGanttView && $xeGanttView.updateViewData) {
-      $xeGanttView.updateViewData()
+      $xeGanttView.updateViewData(force)
     }
     return $xeTable.$nextTick()
   },
@@ -11107,6 +11109,10 @@ const Methods = {
     if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
       return
     }
+    // 如果滚轮未移动或者触摸板未变化位置
+    if (!deltaY && !deltaX) {
+      return
+    }
 
     const { highlightHoverRow } = tableProps
     const { scrollXLoad, scrollYLoad, expandColumn } = reactData