vxe-table 4.16.20 → 4.16.21

package/packages/table/src/cell.ts

@@ -318,7 +318,7 @@ function renderCellHandle (params: VxeTableDefines.CellRenderBodyParams & {
     case 'html':
       return isDeepCell ? Cell.renderDeepHTMLCell(params) : Cell.renderHTMLCell(params)
   }
-  if (editConfig && isEnableConf(editOpts) && editRender) {
+  if (isEnableConf(editConfig) && editRender) {
     return editOpts.mode === 'cell' ? (isDeepCell ? Cell.renderDeepCellEdit(params) : Cell.renderCellEdit(params)) : (isDeepCell ? Cell.renderDeepRowEdit(params) : Cell.renderRowEdit(params))
   }
   return isDeepCell ? Cell.renderDeepCell(params) : Cell.renderDefaultCell(params)
@@ -329,9 +329,7 @@ function renderHeaderHandle (params: VxeTableDefines.CellRenderHeaderParams & {
 }) {
   const { column, $table } = params
   const tableProps = $table.props
-  const { computeEditOpts } = $table.getComputeMaps()
   const { editConfig } = tableProps
-  const editOpts = computeEditOpts.value
   const { type, filters, sortable, editRender } = column
   switch (type) {
     case 'seq':
@@ -350,7 +348,7 @@ function renderHeaderHandle (params: VxeTableDefines.CellRenderHeaderParams & {
       }
       break
   }
-  if (editConfig && isEnableConf(editOpts) && editRender) {
+  if (editConfig && editRender) {
     return Cell.renderEditHeader(params)
   } else if (filters && sortable) {
     return Cell.renderSortAndFilterHeader(params)
@@ -408,15 +406,11 @@ export const Cell = {
   },
   renderDefaultCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
     const { $table, row, column } = params
-    const tableProps = $table.props
     const tableReactData = $table.reactData
     const tableInternalData = $table.internalData
     const { isRowGroupStatus } = tableReactData
-    const { computeEditOpts } = $table.getComputeMaps()
-    const { editConfig } = tableProps
-    const editOpts = computeEditOpts.value
     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/table.ts

@@ -4415,7 +4415,9 @@ export default defineVxeComponent({
       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)
@@ -11354,6 +11356,10 @@ export default defineVxeComponent({
         if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
           return
         }
+        // 如果滚轮未移动或者触摸板未变化位置
+        if (!deltaY && !deltaX) {
+          return
+        }
 
         const { highlightHoverRow } = tableProps
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData