vxe-table 4.11.11 → 4.11.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.11.11",
+  "version": "4.11.13",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/body.ts

@@ -104,7 +104,7 @@ export default defineComponent({
     ) => {
       const { fullAllDataRowIdData } = tableInternalData
       const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
-      const { tableData, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
+      const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
       const { afterFullData, scrollXStore, scrollYStore } = tableInternalData
       const cellOpts = computeCellOpts.value
       const validOpts = computeValidOpts.value
@@ -276,10 +276,12 @@ export default defineComponent({
       const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
 
       let isVNPreEmptyStatus = false
-      if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-        isVNPreEmptyStatus = true
-      } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-        isVNPreEmptyStatus = true
+      if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+        if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+          isVNPreEmptyStatus = true
+        } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+          isVNPreEmptyStatus = true
+        }
       }
 
       const tcStyle: Record<string, string> = {}

package/packages/table/src/header.ts

@@ -45,7 +45,7 @@ export default defineComponent({
     const renderRows = (isGroup: boolean, isOptimizeMode: boolean, cols: VxeTableDefines.ColumnInfo[], $rowIndex: number) => {
       const { fixedType } = props
       const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
-      const { currentColumn, scrollXLoad, scrollYLoad, overflowX } = tableReactData
+      const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData
       const { scrollXStore } = tableInternalData
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
@@ -116,8 +116,10 @@ export default defineComponent({
 
         let isVNPreEmptyStatus = false
         if (!isGroup) {
-          if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-            isVNPreEmptyStatus = true
+          if (!dragCol || dragCol.id !== colid) {
+            if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+              isVNPreEmptyStatus = true
+            }
           }
         }
 

package/styles/components/table.scss

@@ -490,6 +490,46 @@
         }
       }
     }
+    &.sx-pos--top {
+      .vxe-table--scroll-x-left-corner {
+        &::before {
+          @extend %TopLeftRadius;
+        }
+      }
+      .vxe-table--scroll-x-right-corner {
+        &::before {
+          @extend %TopRightRadius;
+        }
+      }
+    }
+    &.sx-pos--bottom {
+      &.sy-pos--right {
+        .vxe-table--scroll-y-top-corner {
+          @extend %TopRightRadius;
+          &::before {
+            @extend %TopRightRadius;
+          }
+        }
+      }
+      &.sy-pos--left {
+        .vxe-table--scroll-y-top-corner {
+          @extend %TopLeftRadius;
+          &::before {
+            @extend %TopLeftRadius;
+          }
+        }
+      }
+      .vxe-table--scroll-x-left-corner {
+        &::before {
+          @extend %BottomLeftRadius;
+        }
+      }
+      .vxe-table--scroll-x-right-corner {
+        &::before {
+          @extend %BottomRightRadius;
+        }
+      }
+    }
   }
 }
 
@@ -1085,28 +1125,30 @@
       border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
     }
     .vxe-table--scroll-x-wrapper {
-      &::before,
       &::after {
         content: "";
         position: absolute;
         left: 0;
         width: 100%;
-        height: 0;
+        height: 100%;
         z-index: 1;
+        pointer-events: none;
       }
-      &::before {
-        top: 0;
-        border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-      }
-      &::after {
-        bottom: 0;
-        border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+    }
+    &.sx-pos--top {
+      .vxe-table--scroll-x-wrapper {
+        &::after {
+          top: 0;
+          border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+        }
       }
     }
     &.sx-pos--bottom {
       .vxe-table--scroll-x-wrapper {
-        &::before {
-          top: -1px;
+        &::after {
+          bottom: 0;
+          height: calc(100% + var(--vxe-ui-table-border-width));
+          border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
         }
       }
     }
@@ -1175,28 +1217,30 @@
       }
     }
     .vxe-table--scroll-y-wrapper {
-      &::before,
       &::after {
         content: "";
         position: absolute;
         top: 0;
-        width: 0;
+        width: 100%;
         height: 100%;
         z-index: 1;
+        pointer-events: none;
       }
-      &::before {
-        left: 0;
-        border-left: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-      }
-      &::after {
-        right: 0;
-        border-right: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+    }
+    &.sy-pos--left {
+      .vxe-table--scroll-y-wrapper {
+        &::after {
+          left: 0;
+          border-right: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+        }
       }
     }
     &.sy-pos--right {
       .vxe-table--scroll-y-wrapper {
-        &::before {
-          left: -1px;
+        &::after {
+          right: 0;
+          width: calc(100% + var(--vxe-ui-table-border-width));
+          border-left: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
         }
       }
     }