vxe-table 3.17.9 → 3.18.0-beta.0

package/es/table/src/body.js

@@ -61,7 +61,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const tableInternalData = $xeTable;
     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 = $xeTable.computeCellOpts;
     const validOpts = $xeTable.computeValidOpts;
@@ -246,10 +246,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     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 && !treeConfig && tableData.length > 16 && !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

@@ -122,7 +122,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         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

@@ -13,7 +13,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     const tableInternalData = $xeTable;
     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 = $xeTable.computeVirtualXOpts;
     const columnOpts = $xeTable.computeColumnOpts;
@@ -94,7 +94,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         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/methods.js

@@ -280,8 +280,11 @@ function cacheColumnMap($xeTable) {
             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) {
@@ -7534,15 +7537,22 @@ const Methods = {
      * @param {Row} row 行对象
      */
     setCurrentRow(row) {
-        const { $el, rowOpts } = this;
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        const rowOpts = $xeTable.computeRowOpts;
         this.clearCurrentRow();
         // this.clearCurrentColumn()
         this.currentRow = row;
         if (rowOpts.isCurrent || this.highlightCurrentRow) {
-            if ($el) {
-                XEUtils.arrayEach($el.querySelectorAll(`[rowid="${getRowid(this, row)}"]`), elem => addClass(elem, 'row--current'));
+            if (el) {
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'));
             }
         }
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateCurrentRow(row);
+        }
         return this.$nextTick();
     },
     isCheckedByRadioRow(row) {
@@ -7589,13 +7599,20 @@ const Methods = {
      * 用于当前行，手动清空当前高亮的状态
      */
     clearCurrentRow() {
-        const { $el } = this;
-        this.currentRow = null;
-        this.hoverRow = null;
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        reactData.currentRow = null;
+        internalData.hoverRow = null;
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'));
         }
-        return this.$nextTick();
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateCurrentRow();
+        }
+        return $xeTable.$nextTick();
     },
     /**
      * 用于单选行，手动清空用户的选择
@@ -7657,20 +7674,31 @@ const Methods = {
         this.setHoverRow(row);
     },
     setHoverRow(row) {
-        const { $el } = this;
-        const rowid = getRowid(this, row);
-        this.clearHoverRow();
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        $xeTable.clearHoverRow();
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--hover'));
+        }
+        internalData.hoverRow = row;
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateHoverRow(row);
         }
-        this.hoverRow = row;
     },
     clearHoverRow() {
-        const { $el } = this;
-        if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const $xeGanttView = internalData.xeGanttView;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'));
+        }
+        internalData.hoverRow = null;
+        if ($xeGanttView) {
+            $xeGanttView.handleUpdateHoverRow();
         }
-        this.hoverRow = null;
     },
     triggerHeaderCellClickEvent(evnt, params) {
         const $xeTable = this;

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);