vxe-table 4.16.0 → 4.16.2

package/es/table/src/util.js

@@ -80,14 +80,19 @@ export function createInternalData() {
         sourceDataRowIdData: {},
         fullColumnIdData: {},
         fullColumnFieldData: {},
+        // 合并表头单元格的数据
+        mergeHeaderList: [],
+        mergeHeaderMaps: {},
+        // 已合并单元格数据集合
+        mergeHeaderCellMaps: {},
         // 合并单元格的数据
         mergeBodyList: [],
         mergeBodyMaps: {},
+        // 已合并单元格数据集合
+        mergeBodyCellMaps: {},
         // 合并表尾的数据
         mergeFooterList: [],
         mergeFooterMaps: {},
-        // 已合并单元格数据集合
-        mergeBodyCellMaps: {},
         // 已合并表尾数据集合
         mergeFooterCellMaps: {},
         // 已展开的行集合
@@ -181,6 +186,69 @@ export const convertHeaderColumnToRows = (originColumns) => {
     });
     return rows;
 };
+export function convertHeaderToGridRows(spanColumns) {
+    const rSize = spanColumns.length;
+    const cSize = spanColumns[0].reduce((sum, cell) => sum + cell.colSpan, 0);
+    const occupiedRows = [];
+    const fullRows = [];
+    for (let rIndex = 0; rIndex < rSize; rIndex++) {
+        const oCols = [];
+        const dCols = [];
+        for (let cIndex = 0; cIndex < cSize; cIndex++) {
+            oCols.push(false);
+            dCols.push('');
+        }
+        occupiedRows.push(oCols);
+        fullRows.push(dCols);
+    }
+    for (let rIndex = 0; rIndex < rSize; rIndex++) {
+        let currColIndex = 0;
+        for (const column of spanColumns[rIndex]) {
+            const { colSpan, rowSpan } = column;
+            let startColIndex = -1;
+            for (let ccIndex = currColIndex; ccIndex <= cSize - colSpan; ccIndex++) {
+                let oFlag = true;
+                for (let csIndex = 0; csIndex < colSpan; csIndex++) {
+                    if (occupiedRows[rIndex][ccIndex + csIndex]) {
+                        oFlag = false;
+                        break;
+                    }
+                }
+                if (oFlag) {
+                    startColIndex = ccIndex;
+                    break;
+                }
+            }
+            if (startColIndex === -1) {
+                for (let j = 0; j <= cSize - colSpan; j++) {
+                    let oFlag = true;
+                    for (let k = 0; k < colSpan; k++) {
+                        if (occupiedRows[rIndex][j + k]) {
+                            oFlag = false;
+                            break;
+                        }
+                    }
+                    if (oFlag) {
+                        startColIndex = j;
+                        break;
+                    }
+                }
+                if (startColIndex === -1) {
+                    // error
+                    break;
+                }
+            }
+            for (let srIndex = rIndex; srIndex < rIndex + rowSpan; srIndex++) {
+                for (let scIndex = startColIndex; scIndex < startColIndex + colSpan; scIndex++) {
+                    occupiedRows[srIndex][scIndex] = true;
+                    fullRows[srIndex][scIndex] = column;
+                }
+            }
+            currColIndex = startColIndex + colSpan;
+        }
+    }
+    return fullRows;
+}
 export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     const internalData = $xeTable.internalData;
     if (scrollLeft || scrollTop) {

package/es/table/style.css

@@ -2216,9 +2216,6 @@
   overflow-x: scroll;
   height: 18px;
 }
-.vxe-table .vxe-table--scroll-x-wrapper {
-  height: 100%;
-}
 .vxe-table .vxe-table--scroll-y-handle,
 .vxe-table .vxe-table--scroll-y-wrapper {
   width: 100%;
@@ -2459,9 +2456,6 @@
   right: auto;
   left: -0.3em;
 }
-.vxe-table--fixed-right-wrapper .vxe-header--column:last-child > .vxe-cell--col-resizable {
-  left: 0;
-}
 
 .vxe-body--column .vxe-cell--row-resizable {
   position: absolute;
@@ -2868,8 +2862,7 @@
 .vxe-table--render-default.border--default .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--full .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--outer .vxe-table--scroll-y-bottom-corner, .vxe-table--render-default.border--inner .vxe-table--scroll-y-bottom-corner {
   border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner .vxe-table--scroll-x-wrapper::after {
-  content: "";
+.vxe-table--render-default.border--default .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--full .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--outer .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--inner .vxe-table--scroll-x-handle-appearance {
   position: absolute;
   left: 0;
   width: 100%;
@@ -2877,11 +2870,11 @@
   z-index: 1;
   pointer-events: none;
 }
-.vxe-table--render-default.border--default.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer.sx-pos--top .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner.sx-pos--top .vxe-table--scroll-x-wrapper::after {
+.vxe-table--render-default.border--default.sx-pos--top .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--full.sx-pos--top .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--outer.sx-pos--top .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--inner.sx-pos--top .vxe-table--scroll-x-handle-appearance {
   top: 0;
   border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--full.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--outer.sx-pos--bottom .vxe-table--scroll-x-wrapper::after, .vxe-table--render-default.border--inner.sx-pos--bottom .vxe-table--scroll-x-wrapper::after {
+.vxe-table--render-default.border--default.sx-pos--bottom .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--full.sx-pos--bottom .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--outer.sx-pos--bottom .vxe-table--scroll-x-handle-appearance, .vxe-table--render-default.border--inner.sx-pos--bottom .vxe-table--scroll-x-handle-appearance {
   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);
@@ -2930,8 +2923,7 @@
   width: calc(100% + 1px);
   left: -1px;
 }
-.vxe-table--render-default.border--default .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full .vxe-table--scroll-y-wrapper::after {
-  content: "";
+.vxe-table--render-default.border--default .vxe-table--scroll-y-handle-appearance, .vxe-table--render-default.border--full .vxe-table--scroll-y-handle-appearance {
   position: absolute;
   top: 0;
   width: 100%;
@@ -2939,11 +2931,11 @@
   z-index: 1;
   pointer-events: none;
 }
-.vxe-table--render-default.border--default.sy-pos--left .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full.sy-pos--left .vxe-table--scroll-y-wrapper::after {
+.vxe-table--render-default.border--default.sy-pos--left .vxe-table--scroll-y-handle-appearance, .vxe-table--render-default.border--full.sy-pos--left .vxe-table--scroll-y-handle-appearance {
   left: 0;
   border-right: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-wrapper::after, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-wrapper::after {
+.vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-handle-appearance, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-handle-appearance {
   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);
@@ -3511,8 +3503,8 @@
   position: absolute;
   left: 50%;
   font-size: 12px;
-  line-height: 1.2em;
-  transform: translateX(-50%);
+  line-height: 1em;
+  transform: translate(-50%, -50%);
   text-align: left;
   z-index: 4;
   padding: 0 var(--vxe-ui-table-cell-padding-default);
@@ -3524,7 +3516,7 @@
   pointer-events: auto;
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-theme-beautify {
-  padding: 0.2em 0.6em 0.3em 0.6em;
+  padding: 0.2em 0.6em 0.25em 0.6em;
   color: #fff;
   background-color: var(--vxe-ui-table-validate-error-color);
 }
@@ -3549,9 +3541,11 @@
 }
 .vxe-table--render-default.valid-msg--single .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   bottom: 100%;
+  transform: translate(-50%, 50%);
 }
 .vxe-table--render-default.valid-msg--single .vxe-body--row:last-child:first-child .vxe-cell--valid-error-tip {
   bottom: auto;
+  transform: translate(-50%, -50%);
 }
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);