vxe-table 3.15.28 → 3.15.29

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTarge
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -23,8 +23,9 @@ function eqCellValue(row1, row2, field) {
     }
     return XEUtils.isEqual(val1, val2);
 }
-function getNextSortOrder(_vm, column) {
-    const orders = _vm.sortOpts.orders;
+function getNextSortOrder($xeTable, column) {
+    const sortOpts = $xeTable.computeSortOpts;
+    const { orders = [] } = sortOpts;
     const currOrder = column.order || null;
     const oIndex = orders.indexOf(currOrder) + 1;
     return orders[oIndex < orders.length ? oIndex : 0];
@@ -1949,8 +1950,57 @@ function removeFooterMerges($xeTable, merges) {
     }
     return rest;
 }
-function clearAllSort(_vm) {
-    _vm.tableFullColumn.forEach((column) => {
+function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+    const sortOpts = $xeTable.computeSortOpts;
+    const { multiple, remote, orders } = sortOpts;
+    if (!XEUtils.isArray(sortConfs)) {
+        sortConfs = [sortConfs];
+    }
+    if (sortConfs && sortConfs.length) {
+        if (!multiple) {
+            sortConfs = [sortConfs[0]];
+            clearAllSort($xeTable);
+        }
+        let firstColumn = null;
+        sortConfs.forEach((confs, index) => {
+            let { field, order } = confs;
+            let column = field;
+            if (XEUtils.isString(field)) {
+                column = $xeTable.getColumnByField(field);
+            }
+            if (!firstColumn) {
+                firstColumn = column;
+            }
+            if (column && column.sortable) {
+                if (orders && orders.indexOf(order) === -1) {
+                    order = getNextSortOrder($xeTable, column);
+                }
+                if (column.order !== order) {
+                    column.order = order;
+                }
+                column.sortTime = Date.now() + index;
+            }
+        });
+        if (isUpdate) {
+            if (!remote) {
+                $xeTable.handleTableData(true);
+            }
+        }
+        if (evnt) {
+            $xeTable.handleColumnSortEvent(evnt, firstColumn);
+        }
+        return $xeTable.$nextTick().then(() => {
+            updateRowOffsetTop($xeTable);
+            $xeTable.updateCellAreas();
+            return updateStyle($xeTable);
+        });
+    }
+    return $xeTable.$nextTick();
+}
+function clearAllSort($xeTable) {
+    const internalData = $xeTable;
+    const { tableFullColumn } = internalData;
+    tableFullColumn.forEach((column) => {
         column.order = null;
     });
 }
@@ -3162,7 +3212,7 @@ function lazyScrollYData($xeTable) {
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { scrollXLoad, scrollYLoad } = reactData;
+    const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
     const { lcsTimeout } = internalData;
     if (lcsTimeout) {
         clearTimeout(lcsTimeout);
@@ -3177,13 +3227,19 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
         internalData.inBodyScroll = false;
         internalData.inFooterScroll = false;
         internalData.scrollRenderType = '';
-        calcCellHeight($xeTable);
+        if (!isAllOverflow) {
+            calcCellHeight($xeTable);
+            updateRowOffsetTop($xeTable);
+        }
         if (isRollX && scrollXLoad) {
             $xeTable.updateScrollXData();
         }
         if (isRollY && scrollYLoad) {
             $xeTable.updateScrollYData().then(() => {
-                calcCellHeight($xeTable);
+                if (!isAllOverflow) {
+                    calcCellHeight($xeTable);
+                    updateRowOffsetTop($xeTable);
+                }
                 $xeTable.updateScrollYSpace();
             });
         }
@@ -4624,6 +4680,7 @@ const Methods = {
                 }
                 XEUtils.eachTree([targetColumn], (column) => {
                     column.fixed = fixed;
+                    column.renderFixed = fixed;
                 });
                 $xeTable.saveCustomStore('update:fixed');
                 if (!status) {
@@ -4649,6 +4706,7 @@ const Methods = {
             if (targetColumn && targetColumn.fixed) {
                 XEUtils.eachTree([targetColumn], (column) => {
                     column.fixed = null;
+                    column.renderFixed = null;
                 });
                 $xeTable.saveCustomStore('update:fixed');
                 if (!status) {
@@ -6233,10 +6291,14 @@ const Methods = {
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
             const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
             let ovEl = null;
+            let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
             if (column.treeNode) {
                 ovEl = tdEl.querySelector('.vxe-tree-cell');
             }
-            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            if (!tipEl) {
+                tipEl = ctEl;
+            }
+            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     /**
@@ -6250,7 +6312,16 @@ const Methods = {
         const tdEl = evnt.currentTarget;
         handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+            let ovEl = null;
+            let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
+            if (column.type === 'html') {
+                ovEl = tdEl.querySelector('.vxe-cell--html');
+            }
+            if (!tipEl) {
+                tipEl = ctEl;
+            }
+            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     openTooltip(target, content) {
@@ -8267,49 +8338,12 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        const sortOpts = $xeTable.computeSortOpts;
-        const { multiple, remote, orders } = sortOpts;
-        if (!XEUtils.isArray(sortConfs)) {
-            sortConfs = [sortConfs];
-        }
-        if (sortConfs && sortConfs.length) {
-            if (!multiple) {
-                sortConfs = [sortConfs[0]];
-                clearAllSort($xeTable);
-            }
-            let firstColumn = null;
-            sortConfs.forEach((confs, index) => {
-                let { field, order } = confs;
-                let column = field;
-                if (XEUtils.isString(field)) {
-                    column = $xeTable.getColumnByField(field);
-                }
-                if (!firstColumn) {
-                    firstColumn = column;
-                }
-                if (column && column.sortable) {
-                    if (orders && orders.indexOf(order) === -1) {
-                        order = getNextSortOrder($xeTable, column);
-                    }
-                    if (column.order !== order) {
-                        column.order = order;
-                    }
-                    column.sortTime = Date.now() + index;
-                }
-            });
-            if (isUpdate) {
-                if (!remote) {
-                    $xeTable.handleTableData(true);
-                }
-                $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
-            }
-            return $xeTable.$nextTick().then(() => {
-                updateRowOffsetTop($xeTable);
-                $xeTable.updateCellAreas();
-                return updateStyle($xeTable);
-            });
-        }
-        return $xeTable.$nextTick();
+        // 已废弃，即将去掉事件触发 new Event('click') -> null
+        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+    },
+    setSortByEvent(evnt, sortConfs, isUpdate) {
+        const $xeTable = this;
+        return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
     },
     /**
      * 清空指定列的排序条件
@@ -8402,6 +8436,17 @@ const Methods = {
         }
         return sortList;
     },
+    setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+        const $xeTable = this;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (column && column.filters) {
+            column.filters = toFilters(options || []);
+            if (isUpdate) {
+                return $xeTable.handleColumnConfirmFilter(column, evnt);
+            }
+        }
+        return $xeTable.$nextTick();
+    },
     /**
      * 关闭筛选
      * @param {Event} evnt 事件

package/es/table/style.css

@@ -2550,6 +2550,12 @@
 .vxe-table--render-default .vxe-footer--column.col--right > .vxe-cell {
   justify-content: right;
 }
+.vxe-table--render-default .vxe-header--column.col--ellipsis.col--center .vxe-cell--wrapper {
+  justify-content: center;
+}
+.vxe-table--render-default .vxe-header--column.col--ellipsis.col--right .vxe-cell--wrapper {
+  justify-content: right;
+}
 .vxe-table--render-default .vxe-header--column.col--ellipsis.col--center .vxe-cell,
 .vxe-table--render-default .vxe-footer--column.col--ellipsis.col--center .vxe-cell {
   justify-content: center;