vxe-table 4.11.14 → 4.11.16

package/lib/table/src/table.js

@@ -9310,6 +9310,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             const dragParams = {
               oldRow: dragRow,
               newRow: prevDragRow,
+              dragRow,
               dragPos: prevDragPos,
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex
@@ -9451,6 +9452,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               dispatchEvent('row-dragend', {
                 oldRow: dragRow,
                 newRow: prevDragRow,
+                dragRow,
                 dragPos: prevDragPos,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -9634,11 +9636,12 @@ var _default = exports.default = (0, _vue.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,
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex
@@ -9651,14 +9654,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
               let oafIndex = -1;
               let nafIndex = -1;
               const oldAllMaps = {};
-              _xeUtils.default.eachTree([oldColumn], column => {
+              _xeUtils.default.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;
                   }
@@ -9679,7 +9682,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     }
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
                 // 子到根
                 if (!isCrossDrag) {
                   return;
@@ -9704,7 +9707,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               } else {
                 // 根到根
               }
-              const oldewMatchRest = _xeUtils.default.findTree(collectColumn, item => item.id === oldColumn.id);
+              const oldewMatchRest = _xeUtils.default.findTree(collectColumn, item => item.id === dragColumn.id);
               // 改变层级
               if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                 if (oldewMatchRest) {
@@ -9712,12 +9715,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     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) {
@@ -9741,11 +9744,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 } = 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;
@@ -9768,8 +9771,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 }
               }
               dispatchEvent('column-dragend', {
-                oldColumn,
+                oldColumn: dragColumn,
                 newColumn,
+                dragColumn,
                 dragPos: prevDragPos,
                 dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
@@ -10226,7 +10230,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           target,
           deltaY,
-          deltaX
+          deltaX,
+          shiftKey
         } = evnt;
         if (target && /^textarea$/i.test(target.tagName)) {
           return;
@@ -10267,8 +10272,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           return;
         }
         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;
         // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -11458,6 +11463,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       (0, _vue.nextTick)(() => {
         const {
           data,
+          exportConfig,
+          importConfig,
           treeConfig,
           showOverflow
         } = props;
@@ -11472,132 +11479,121 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const checkboxOpts = computeCheckboxOpts.value;
         const expandOpts = computeExpandOpts.value;
         const rowOpts = computeRowOpts.value;
-        if (process.env.NODE_ENV === 'development') {
-          if (props.rowId) {
-            (0, _log.warnLog)('vxe.error.delProp', ['row-id', 'row-config.keyField']);
-          }
-          if (props.rowKey) {
-            (0, _log.warnLog)('vxe.error.delProp', ['row-key', 'row-config.useKey']);
-          }
-          if (props.columnKey) {
-            (0, _log.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)) {
-            (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
-          }
-          if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
-            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
-          }
-          if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
-            (0, _log.warnLog)('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
-          }
-          if (treeConfig && !treeOpts.transform && props.stripe) {
-            (0, _log.warnLog)('vxe.error.noTree', ['stripe']);
-          }
-          if (props.showFooter && !(props.footerMethod || props.footerData)) {
-            (0, _log.warnLog)('vxe.error.reqProp', ['footer-data | footer-method']);
-          }
-          if (rowOpts.height) {
-            (0, _log.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.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
-            (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
-          }
-          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(exportOpts._typeMaps), exportOpts.types)) {
-            (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(exportOpts._typeMaps).join(',')]);
-          }
+        const customOpts = computeCustomOpts.value;
+        const mouseOpts = computeMouseOpts.value;
+        const exportOpts = computeExportOpts.value;
+        const importOpts = computeImportOpts.value;
+        if (props.rowId) {
+          (0, _log.warnLog)('vxe.error.delProp', ['row-id', 'row-config.keyField']);
         }
-        if (process.env.NODE_ENV === 'development') {
-          const customOpts = computeCustomOpts.value;
-          const mouseOpts = computeMouseOpts.value;
-          const rowOpts = computeRowOpts.value;
-          if (!props.id) {
-            if ((props.customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && customOpts.storage) {
-              (0, _log.errLog)('vxe.error.reqProp', ['id']);
-            }
-          }
-          if (props.treeConfig && checkboxOpts.range) {
-            (0, _log.errLog)('vxe.error.noTree', ['checkbox-config.range']);
-          }
-          if (rowOpts.height && !props.showOverflow) {
-            (0, _log.warnLog)('vxe.error.notProp', ['table.show-overflow']);
-          }
-          if (!$xeTable.handleMousedownCellAreaEvent) {
-            if (props.areaConfig) {
-              (0, _log.warnLog)('vxe.error.notProp', ['area-config']);
-            }
-            if (props.clipConfig) {
-              (0, _log.warnLog)('vxe.error.notProp', ['clip-config']);
-            }
-            if (props.fnrConfig) {
-              (0, _log.warnLog)('vxe.error.notProp', ['fnr-config']);
-            }
-            if (mouseOpts.area) {
-              (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
-              return;
-            }
-          }
-          if (props.dragConfig) {
-            (0, _log.warnLog)('vxe.error.delProp', ['drag-config', 'row-drag-config']);
-          }
-          if (props.treeConfig && treeOpts.children) {
-            (0, _log.warnLog)('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
-          }
-          if (props.treeConfig && treeOpts.line) {
-            (0, _log.warnLog)('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
-          }
-          if (mouseOpts.area && mouseOpts.selected) {
-            (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+        if (props.rowKey) {
+          (0, _log.warnLog)('vxe.error.delProp', ['row-key', 'row-config.useKey']);
+        }
+        if (props.columnKey) {
+          (0, _log.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)) {
+          (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
+        }
+        if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
+          (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
+        }
+        if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
+          (0, _log.warnLog)('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
+        }
+        if (treeConfig && !treeOpts.transform && props.stripe) {
+          (0, _log.warnLog)('vxe.error.noTree', ['stripe']);
+        }
+        if (props.showFooter && !(props.footerMethod || props.footerData)) {
+          (0, _log.warnLog)('vxe.error.reqProp', ['footer-data | footer-method']);
+        }
+        if (rowOpts.height) {
+          (0, _log.warnLog)('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+        }
+        if (props.highlightCurrentRow) {
+          (0, _log.warnLog)('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
+        }
+        if (props.highlightHoverRow) {
+          (0, _log.warnLog)('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
+        }
+        if (props.highlightCurrentColumn) {
+          (0, _log.warnLog)('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
+        }
+        if (props.highlightHoverColumn) {
+          (0, _log.warnLog)('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
+        }
+        // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
+        if (importConfig && importOpts.types && !importOpts.importMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
+          (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
+        }
+        if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(exportOpts._typeMaps), exportOpts.types)) {
+          (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(exportOpts._typeMaps).join(',')]);
+        }
+        if (!props.id) {
+          if ((props.customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && customOpts.storage) {
+            (0, _log.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) {
-            (0, _log.errLog)('vxe.error.noTree', ['mouse-config.area']);
+        }
+        if (props.treeConfig && checkboxOpts.range) {
+          (0, _log.errLog)('vxe.error.noTree', ['checkbox-config.range']);
+        }
+        if (rowOpts.height && !props.showOverflow) {
+          (0, _log.warnLog)('vxe.error.notProp', ['table.show-overflow']);
+        }
+        if (!$xeTable.handleMousedownCellAreaEvent) {
+          if (props.areaConfig) {
+            (0, _log.warnLog)('vxe.error.notProp', ['area-config']);
           }
-          if (props.editConfig && editOpts.activeMethod) {
-            (0, _log.warnLog)('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+          if (props.clipConfig) {
+            (0, _log.warnLog)('vxe.error.notProp', ['clip-config']);
           }
-          if (props.treeConfig && checkboxOpts.isShiftKey) {
-            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+          if (props.fnrConfig) {
+            (0, _log.warnLog)('vxe.error.notProp', ['fnr-config']);
           }
-          if (checkboxOpts.halfField) {
-            (0, _log.warnLog)('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+          if (mouseOpts.area) {
+            (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
+            return;
           }
         }
+        if (treeConfig && rowOpts.drag && !treeOpts.transform) {
+          (0, _log.warnLog)('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+        }
+        if (props.dragConfig) {
+          (0, _log.warnLog)('vxe.error.delProp', ['drag-config', 'row-drag-config']);
+        }
+        if (props.treeConfig && treeOpts.children) {
+          (0, _log.warnLog)('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+        }
+        if (props.treeConfig && treeOpts.line) {
+          (0, _log.warnLog)('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
+        }
+        if (mouseOpts.area && mouseOpts.selected) {
+          (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+        }
+        if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
+          (0, _log.errLog)('vxe.error.noTree', ['mouse-config.area']);
+        }
+        if (props.editConfig && editOpts.activeMethod) {
+          (0, _log.warnLog)('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+        }
+        if (props.treeConfig && checkboxOpts.isShiftKey) {
+          (0, _log.errLog)('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
+        }
+        if (checkboxOpts.halfField) {
+          (0, _log.warnLog)('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+        }
         // 检查是否有安装需要的模块
-        if (process.env.NODE_ENV === 'development') {
-          if (props.editConfig && !$xeTable.insert) {
-            (0, _log.errLog)('vxe.error.reqModule', ['Edit']);
-          }
-          if (props.editRules && !$xeTable.validate) {
-            (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
-          }
-          if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
-            (0, _log.errLog)('vxe.error.reqModule', ['Keyboard']);
-          }
-          if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
-            (0, _log.errLog)('vxe.error.reqModule', ['Export']);
-          }
+        if (props.editConfig && !$xeTable.insert) {
+          (0, _log.errLog)('vxe.error.reqModule', ['Edit']);
+        }
+        if (props.editRules && !$xeTable.validate) {
+          (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
+        }
+        if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
+          (0, _log.errLog)('vxe.error.reqModule', ['Keyboard']);
+        }
+        if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
+          (0, _log.errLog)('vxe.error.reqModule', ['Export']);
         }
         Object.assign(scrollYStore, {
           startIndex: 0,