vxe-table 4.11.13 → 4.11.15

package/packages/table/src/table.ts

@@ -263,6 +263,12 @@ export default defineComponent({
       },
 
       scrollVMLoading: false,
+      scrollYHeight: 0,
+      scrollYTop: 0,
+      isScrollYBig: false,
+      scrollXLeft: 0,
+      scrollXWidth: 0,
+      isScrollXBig: false,
 
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
@@ -1264,7 +1270,7 @@ export default defineComponent({
       let hasFixed: VxeColumnPropTypes.Fixed | undefined
       const handleFunc = (column: VxeTableDefines.ColumnInfo, index: number, items: VxeTableDefines.ColumnInfo[], path?: string[], parentColumn?: VxeTableDefines.ColumnInfo) => {
         const { id: colid, field, fixed, type, treeNode } = column
-        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 }
+        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 }
         if (field) {
           if (fullColumnFieldData[field]) {
             errLog('vxe.error.colRepet', ['field', field])
@@ -8086,6 +8092,7 @@ export default defineComponent({
             const dragParams = {
               oldRow: dragRow,
               newRow: prevDragRow,
+              dragRow,
               dragPos: prevDragPos as 'top' | 'bottom',
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex as 0 | 1
@@ -8236,6 +8243,7 @@ export default defineComponent({
               dispatchEvent('row-dragend', {
                 oldRow: dragRow,
                 newRow: prevDragRow,
+                dragRow,
                 dragPos: prevDragPos as any,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -8376,11 +8384,12 @@ export default defineComponent({
         if (prevDragCol && dragCol) {
           // 判断是否有拖动
           if (prevDragCol !== dragCol) {
-            const oldColumn = dragCol
+            const dragColumn = dragCol
             const newColumn = prevDragCol
             const dragParams = {
-              oldColumn,
+              oldColumn: dragColumn,
               newColumn,
+              dragColumn,
               dragPos: prevDragPos as 'left' | 'right',
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex as 0 | 1
@@ -8395,17 +8404,17 @@ export default defineComponent({
               let nafIndex = -1
 
               const oldAllMaps: Record<string, any> = {}
-              XEUtils.eachTree([oldColumn], column => {
+              XEUtils.eachTree([dragColumn], column => {
                 oldAllMaps[column.id] = column
               })
 
               let isSelfToChildStatus = false
 
-              if (oldColumn.parentId && newColumn.parentId) {
+              if (dragColumn.parentId && newColumn.parentId) {
                 // 子到子
 
                 if (isPeerDrag && !isCrossDrag) {
-                  if (oldColumn.parentId !== newColumn.parentId) {
+                  if (dragColumn.parentId !== newColumn.parentId) {
                     // 非同级
                     return
                   }
@@ -8427,7 +8436,7 @@ export default defineComponent({
                     }
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
                 // 子到根
 
                 if (!isCrossDrag) {
@@ -8455,18 +8464,18 @@ export default defineComponent({
                 // 根到根
               }
 
-              const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === oldColumn.id)
+              const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id)
 
               // 改变层级
               if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                 if (oldewMatchRest) {
                   const { items: oCols, index: oIndex } = oldewMatchRest
-                  const childList = oldColumn.children || []
+                  const childList = dragColumn.children || []
                   childList.forEach(column => {
-                    column.parentId = oldColumn.parentId
+                    column.parentId = dragColumn.parentId
                   })
                   oCols.splice(oIndex, 1, ...childList)
-                  oldColumn.children = []
+                  dragColumn.children = []
                 }
               } else {
                 if (oldewMatchRest) {
@@ -8483,11 +8492,11 @@ export default defineComponent({
                 const { items: nCols, index: nIndex, parent: nParent } = newMatchRest
                 // 转子级
                 if ((isCrossDrag && isToChildDrag) && isDragToChildFlag) {
-                  oldColumn.parentId = newColumn.id
-                  newColumn.children = (newColumn.children || []).concat([oldColumn])
+                  dragColumn.parentId = newColumn.id
+                  newColumn.children = (newColumn.children || []).concat([dragColumn])
                 } else {
-                  oldColumn.parentId = newColumn.parentId
-                  nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn)
+                  dragColumn.parentId = newColumn.parentId
+                  nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn)
                 }
                 if (!nParent) {
                   nafIndex = nIndex
@@ -8513,8 +8522,9 @@ export default defineComponent({
               }
 
               dispatchEvent('column-dragend', {
-                oldColumn,
+                oldColumn: dragColumn,
                 newColumn,
+                dragColumn,
                 dragPos: prevDragPos,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -8918,7 +8928,7 @@ export default defineComponent({
         })
       },
       triggerBodyWheelEvent (evnt) {
-        const { target, deltaY, deltaX } = evnt
+        const { target, deltaY, deltaX, shiftKey } = evnt
         if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
           return
         }
@@ -8952,8 +8962,8 @@ export default defineComponent({
         }
 
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime)
-        const deltaTop = Math.ceil(deltaY * wheelSpeed)
-        const deltaLeft = Math.ceil(deltaX * wheelSpeed)
+        const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed)
+        const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed)
 
         const isTopWheel = deltaTop < 0
         const currScrollTop = bodyScrollElem.scrollTop
@@ -10127,7 +10137,7 @@ export default defineComponent({
       }
 
       nextTick(() => {
-        const { data, treeConfig, showOverflow } = props
+        const { data, exportConfig, importConfig, treeConfig, showOverflow } = props
         const { scrollXStore, scrollYStore } = internalData
         const sYOpts = computeSYOpts.value
         const editOpts = computeEditOpts.value
@@ -10136,132 +10146,124 @@ export default defineComponent({
         const checkboxOpts = computeCheckboxOpts.value
         const expandOpts = computeExpandOpts.value
         const rowOpts = computeRowOpts.value
+        const customOpts = computeCustomOpts.value
+        const mouseOpts = computeMouseOpts.value
+        const exportOpts = computeExportOpts.value
+        const importOpts = computeImportOpts.value
 
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          if (props.rowId) {
-            warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
-          }
-          if (props.rowKey) {
-            warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey'])
-          }
-          if (props.columnKey) {
-            warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey'])
-          }
-          if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-            warnLog('vxe.error.reqProp', ['row-config.keyField'])
-          }
-          if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
-            warnLog('vxe.error.reqProp', ['keep-source'])
-          }
-          if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-            warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
-          }
-          if (treeConfig && !treeOpts.transform && props.stripe) {
-            warnLog('vxe.error.noTree', ['stripe'])
-          }
-          if (props.showFooter && !(props.footerMethod || props.footerData)) {
-            warnLog('vxe.error.reqProp', ['footer-data | footer-method'])
-          }
-          if (rowOpts.height) {
-            warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height'])
-          }
-          // if (props.highlightCurrentRow) {
-          //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
-          // }
-          // if (props.highlightHoverRow) {
-          //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
-          // }
-          // if (props.highlightCurrentColumn) {
-          //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
-          // }
-          // if (props.highlightHoverColumn) {
-          //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
-          // }
-          // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
-          const { exportConfig, importConfig } = props
-          const exportOpts = computeExportOpts.value
-          const importOpts = computeImportOpts.value
-          if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
-          }
-          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
-            warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')])
-          }
+        if (props.rowId) {
+          warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
+        }
+        if (props.rowKey) {
+          warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey'])
+        }
+        if (props.columnKey) {
+          warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey'])
+        }
+        if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
+          warnLog('vxe.error.reqProp', ['row-config.keyField'])
+        }
+        if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
+          warnLog('vxe.error.reqProp', ['keep-source'])
+        }
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
+          warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
+        }
+        if (treeConfig && !treeOpts.transform && props.stripe) {
+          warnLog('vxe.error.noTree', ['stripe'])
+        }
+        if (props.showFooter && !(props.footerMethod || props.footerData)) {
+          warnLog('vxe.error.reqProp', ['footer-data | footer-method'])
+        }
+        if (rowOpts.height) {
+          warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height'])
+        }
+        if (props.highlightCurrentRow) {
+          warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+        }
+        if (props.highlightHoverRow) {
+          warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+        }
+        if (props.highlightCurrentColumn) {
+          warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+        }
+        if (props.highlightHoverColumn) {
+          warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+        }
+        // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+        if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+          warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
+        }
+        if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
+          warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')])
         }
 
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          const customOpts = computeCustomOpts.value
-          const mouseOpts = computeMouseOpts.value
-          const rowOpts = computeRowOpts.value
-          if (!props.id) {
-            if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
-              errLog('vxe.error.reqProp', ['id'])
-            }
-          }
-          if (props.treeConfig && checkboxOpts.range) {
-            errLog('vxe.error.noTree', ['checkbox-config.range'])
-          }
-          if (rowOpts.height && !props.showOverflow) {
-            warnLog('vxe.error.notProp', ['table.show-overflow'])
-          }
-          if (!$xeTable.handleMousedownCellAreaEvent) {
-            if (props.areaConfig) {
-              warnLog('vxe.error.notProp', ['area-config'])
-            }
-            if (props.clipConfig) {
-              warnLog('vxe.error.notProp', ['clip-config'])
-            }
-            if (props.fnrConfig) {
-              warnLog('vxe.error.notProp', ['fnr-config'])
-            }
-            if (mouseOpts.area) {
-              errLog('vxe.error.notProp', ['mouse-config.area'])
-              return
-            }
-          }
-          if (props.dragConfig) {
-            warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config'])
-          }
-          if (props.treeConfig && treeOpts.children) {
-            warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
-          }
-          if (props.treeConfig && treeOpts.line) {
-            warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
-          }
-          if (mouseOpts.area && mouseOpts.selected) {
-            warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
+        if (!props.id) {
+          if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+            errLog('vxe.error.reqProp', ['id'])
           }
-          // if (mouseOpts.area && checkboxOpts.range) {
-          //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
-          // }
-          if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
-            errLog('vxe.error.noTree', ['mouse-config.area'])
+        }
+        if (props.treeConfig && checkboxOpts.range) {
+          errLog('vxe.error.noTree', ['checkbox-config.range'])
+        }
+        if (rowOpts.height && !props.showOverflow) {
+          warnLog('vxe.error.notProp', ['table.show-overflow'])
+        }
+        if (!$xeTable.handleMousedownCellAreaEvent) {
+          if (props.areaConfig) {
+            warnLog('vxe.error.notProp', ['area-config'])
           }
-          if (props.editConfig && editOpts.activeMethod) {
-            warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod'])
+          if (props.clipConfig) {
+            warnLog('vxe.error.notProp', ['clip-config'])
           }
-          if (props.treeConfig && checkboxOpts.isShiftKey) {
-            errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+          if (props.fnrConfig) {
+            warnLog('vxe.error.notProp', ['fnr-config'])
           }
-          if (checkboxOpts.halfField) {
-            warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+          if (mouseOpts.area) {
+            errLog('vxe.error.notProp', ['mouse-config.area'])
+            return
           }
         }
+        if (treeConfig && rowOpts.drag && !treeOpts.transform) {
+          warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true'])
+        }
+        if (props.dragConfig) {
+          warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config'])
+        }
+        if (props.treeConfig && treeOpts.children) {
+          warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
+        }
+        if (props.treeConfig && treeOpts.line) {
+          warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
+        }
+        if (mouseOpts.area && mouseOpts.selected) {
+          warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
+        }
+        if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
+          errLog('vxe.error.noTree', ['mouse-config.area'])
+        }
+        if (props.editConfig && editOpts.activeMethod) {
+          warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod'])
+        }
+        if (props.treeConfig && checkboxOpts.isShiftKey) {
+          errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+        }
+        if (checkboxOpts.halfField) {
+          warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+        }
 
         // 检查是否有安装需要的模块
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          if (props.editConfig && !$xeTable.insert) {
-            errLog('vxe.error.reqModule', ['Edit'])
-          }
-          if (props.editRules && !$xeTable.validate) {
-            errLog('vxe.error.reqModule', ['Validator'])
-          }
-          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
-            errLog('vxe.error.reqModule', ['Keyboard'])
-          }
-          if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
-            errLog('vxe.error.reqModule', ['Export'])
-          }
+        if (props.editConfig && !$xeTable.insert) {
+          errLog('vxe.error.reqModule', ['Edit'])
+        }
+        if (props.editRules && !$xeTable.validate) {
+          errLog('vxe.error.reqModule', ['Validator'])
+        }
+        if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
+          errLog('vxe.error.reqModule', ['Keyboard'])
+        }
+        if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
+          errLog('vxe.error.reqModule', ['Export'])
         }
 
         Object.assign(scrollYStore, {