vxe-table 4.15.7 → 4.16.0-beta.0

package/es/table/src/body.js

@@ -79,7 +79,7 @@ export default defineVxeComponent({
         const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
             const $xeGrid = $xeTable.xeGrid;
             const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
-            const { tableData, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
+            const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
             const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
             const cellOpts = computeCellOpts.value;
             const validOpts = computeValidOpts.value;
@@ -265,10 +265,10 @@ export default defineVxeComponent({
             let isVNPreEmptyStatus = false;
             if (!isMergeCell) {
                 if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-                    if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+                    if (overflowY && scrollYLoad && tableData.length > 16 && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
-                    else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                    else if (overflowX && scrollXLoad && tableColumn.length > 10 && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
                 }

package/es/table/src/footer.js

@@ -148,7 +148,7 @@ export default defineVxeComponent({
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
                 if (isOptimizeMode && overflowX && !isMergeCell) {
-                    if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                    if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
                 }

package/es/table/src/header.js

@@ -37,7 +37,7 @@ export default defineVxeComponent({
             const $xeGrid = $xeTable.xeGrid;
             const { fixedType } = props;
             const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
-            const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
+            const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX, tableColumn } = tableReactData;
             const { fullColumnIdData, scrollXStore } = tableInternalData;
             const virtualXOpts = computeVirtualXOpts.value;
             const columnOpts = computeColumnOpts.value;
@@ -117,7 +117,7 @@ export default defineVxeComponent({
                 let isVNPreEmptyStatus = false;
                 if (isOptimizeMode && overflowX && !isGroup) {
                     if (!dragCol || dragCol.id !== colid) {
-                        if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                             isVNPreEmptyStatus = true;
                         }
                     }

package/es/table/src/table.js

@@ -1504,8 +1504,11 @@ export default defineVxeComponent({
                     fullColFieldData[field] = rest;
                 }
                 else {
-                    if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
+                    if (storage && !type) {
+                        errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`]);
+                    }
+                    if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+                        errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
                     }
                 }
                 if (!hasFixed && fixed) {
@@ -5630,6 +5633,7 @@ export default defineVxeComponent({
              * @param {Row} row 行对象
              */
             setCurrentRow(row) {
+                const $xeGanttView = internalData.xeGanttView;
                 const rowOpts = computeRowOpts.value;
                 const el = refElem.value;
                 tableMethods.clearCurrentRow();
@@ -5640,6 +5644,9 @@ export default defineVxeComponent({
                         XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
                     }
                 }
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateCurrentRow(row);
+                }
                 return nextTick();
             },
             isCheckedByRadioRow(row) {
@@ -5679,12 +5686,16 @@ export default defineVxeComponent({
              * 用于当前行，手动清空当前高亮的状态
              */
             clearCurrentRow() {
+                const $xeGanttView = internalData.xeGanttView;
                 const el = refElem.value;
                 reactData.currentRow = null;
                 internalData.hoverRow = null;
                 if (el) {
                     XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
                 }
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateCurrentRow();
+                }
                 return nextTick();
             },
             /**
@@ -11018,6 +11029,7 @@ export default defineVxeComponent({
                 tablePrivateMethods.setHoverRow(row);
             },
             setHoverRow(row) {
+                const $xeGanttView = internalData.xeGanttView;
                 const rowid = getRowid($xeTable, row);
                 const el = refElem.value;
                 tablePrivateMethods.clearHoverRow();
@@ -11025,13 +11037,20 @@ export default defineVxeComponent({
                     XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
                 }
                 internalData.hoverRow = row;
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateHoverRow(row);
+                }
             },
             clearHoverRow() {
+                const $xeGanttView = internalData.xeGanttView;
                 const el = refElem.value;
                 if (el) {
                     XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
                 }
                 internalData.hoverRow = null;
+                if ($xeGanttView) {
+                    $xeGanttView.handleUpdateHoverRow();
+                }
             },
             /**
              * 已废弃，被 getCellElement 替换

package/es/table/style.css

@@ -2670,9 +2670,6 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
-.vxe-table--render-default .vxe-table--footer-wrapper {
-  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
 .vxe-table--render-default.border--default .vxe-table--scroll-y-top-corner::before,
 .vxe-table--render-default.border--default .vxe-table--scroll-y-bottom-corner::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-top-corner::before,
 .vxe-table--render-default.border--full .vxe-table--scroll-y-bottom-corner::before, .vxe-table--render-default.border--outer .vxe-table--scroll-y-top-corner::before,
@@ -2740,6 +2737,9 @@
   background-size: 100% var(--vxe-ui-table-border-width);
   background-position: right bottom;
 }
+.vxe-table--render-default.border--default .vxe-table--footer-wrapper, .vxe-table--render-default.border--full .vxe-table--footer-wrapper, .vxe-table--render-default.border--inner .vxe-table--footer-wrapper {
+  border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+}
 .vxe-table--render-default.border--default .vxe-table--scroll-y-top-corner::before, .vxe-table--render-default.border--full .vxe-table--scroll-y-top-corner::before {
   border-left-width: var(--vxe-ui-table-border-width);
   border-right-width: var(--vxe-ui-table-border-width);