vxe-table 3.20.1 → 3.20.3

package/es/table/module/filter/mixin.js

@@ -107,7 +107,7 @@ export default {
                 const tableEl = $xeTable.$refs.refElem;
                 const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                 const filterOpts = $xeTable.computeFilterOpts;
-                const { transfer } = filterOpts;
+                const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
                 const currEl = btnEl || colEl;
                 const tableRect = tableEl.getBoundingClientRect();
                 const filterRender = column ? column.filterRender : null;
@@ -164,14 +164,23 @@ export default {
                             }
                         }
                     }
-                    filterStore.style = {
+                    const fStys = {
                         top: toCssUnit(top),
                         left: toCssUnit(left)
                     };
+                    if (zIndex) {
+                        fStys.zIndex = zIndex;
+                    }
+                    filterStore.style = fStys;
                     // 筛选面板是自适应表格高度
                     if (compConf ? !compConf.tableFilterAutoHeight : false) {
                         maxHeight = 0;
                     }
+                    else {
+                        if (customMaxHeight) {
+                            maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+                        }
+                    }
                     // 判断面板不能大于表格高度
                     filterStore.maxHeight = maxHeight;
                 });

package/es/table/module/menu/mixin.js

@@ -172,7 +172,7 @@ export default {
             const isContentMenu = $xeTable.computeIsContentMenu;
             const menuOpts = $xeTable.computeMenuOpts;
             const config = menuOpts[type];
-            const { transfer, visibleMethod } = menuOpts;
+            const { zIndex, transfer, visibleMethod } = menuOpts;
             if (config) {
                 const { options, disabled } = config;
                 if (disabled) {
@@ -202,7 +202,7 @@ export default {
                                     selectChild: null,
                                     showChild: false,
                                     style: {
-                                        zIndex: internalData.tZindex,
+                                        zIndex: zIndex || internalData.tZindex,
                                         top: `${top}px`,
                                         left: `${left}px`
                                     }

package/es/table/src/body.js

@@ -11,9 +11,11 @@ const renderType = 'body';
 const isVMScrollProcess = ($xeTable) => {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
     const { delayHover } = tableProps;
-    const { lastScrollTime, isDragResize } = tableReactData;
-    return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
+    const { isDragResize } = tableReactData;
+    const { lastSTime } = tableInternalData;
+    return !!(isDragResize || (lastSTime && Date.now() < lastSTime + delayHover));
 };
 function renderLine(h, $xeTable, rowid, params, cellHeight) {
     const tableProps = $xeTable;

package/es/table/src/methods.js

@@ -3357,7 +3357,7 @@ function loadTableData($xeTable, datas, isReload, isReset) {
             if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
                 errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
             }
-            if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+            if (virtualYOpts.mode === 'scroll' && reactData.expandColumn && expandOpts.mode === 'fixed') {
                 warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
             }
             // if (showOverflow) {
@@ -3862,7 +3862,7 @@ function handleSyncScroll($xeTable, isRollX, isRollY) {
     return Promise.all([
         xRest,
         yRest,
-        $xeTable.updateCellAreas()
+        scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
     ]);
 }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
@@ -5108,6 +5108,48 @@ const tableMethods = {
         }
         return cellLabel;
     },
+    updateCellLabel(row, fieldOrColumn) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+            return null;
+        }
+        const { fullAllDataRowIdData } = internalData;
+        const rowid = getRowid($xeTable, row);
+        if (rowid) {
+            const colid = column.id;
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+                const formatData = rowRest.formatData;
+                if (formatData) {
+                    delete formatData[colid];
+                }
+            }
+        }
+        return $xeTable.getFooterCellLabel(row, column);
+    },
+    clearFormatterCache(isUpdate) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableData, tableColumn } = reactData;
+        const { fullAllDataRowIdData } = internalData;
+        XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+            if (rowRest.formatData) {
+                rowRest.formatData = undefined;
+            }
+        });
+        if (isUpdate) {
+            tableData.forEach(row => {
+                tableColumn.forEach(column => {
+                    $xeTable.getCellLabel(row, column);
+                });
+            });
+        }
+        return $xeTable.$nextTick();
+    },
     getFooterCellLabel(row, fieldOrColumn) {
         const $xeTable = this;
         const reactData = $xeTable;
@@ -5179,6 +5221,47 @@ const tableMethods = {
         }
         return cellLabel;
     },
+    updateFooterCellLabel(row, fieldOrColumn) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+            return null;
+        }
+        const { footerTableData } = reactData;
+        const { footerFullDataRowData } = internalData;
+        const colid = column.id;
+        const $rowIndex = footerTableData.indexOf(row);
+        const rowRest = footerFullDataRowData[$rowIndex];
+        if (rowRest) {
+            const formatData = rowRest.formatData;
+            if (formatData) {
+                delete formatData[colid];
+            }
+        }
+        return $xeTable.getFooterCellLabel(row, column);
+    },
+    clearFooterFormatterCache(isUpdate) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableData, tableColumn } = reactData;
+        const { footerFullDataRowData } = internalData;
+        XEUtils.each(footerFullDataRowData, (rowRest) => {
+            if (rowRest.formatData) {
+                rowRest.formatData = undefined;
+            }
+        });
+        if (isUpdate) {
+            tableData.forEach(row => {
+                tableColumn.forEach(column => {
+                    $xeTable.getFooterCellLabel(row, column);
+                });
+            });
+        }
+        return $xeTable.$nextTick();
+    },
     /**
      * 检查是否为临时行数据
      */
@@ -11074,7 +11157,6 @@ const tableMethods = {
     handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const $xeTable = this;
         const props = $xeTable;
-        const reactData = $xeTable;
         const internalData = $xeTable;
         const { highlightHoverRow } = props;
         const { lastScrollLeft, lastScrollTop } = internalData;
@@ -11140,7 +11222,7 @@ const tableMethods = {
             }
             internalData.lastScrollTop = scrollTop;
         }
-        reactData.lastScrollTime = Date.now();
+        internalData.lastSTime = Date.now();
         const evntParams = Object.assign({ source: sourceType, scrollTop,
             scrollLeft,
             bodyHeight,
@@ -11396,7 +11478,7 @@ const tableMethods = {
         if (!bodyScrollElem) {
             return;
         }
-        const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
+        const wheelSpeed = getWheelSpeed(internalData.lastSTime);
         const deltaTop = shiftKey ? 0 : (deltaY * wheelSpeed);
         const deltaLeft = (shiftKey ? (deltaX || deltaY) : deltaX) * wheelSpeed;
         const currScrollTop = bodyScrollElem.scrollTop;
@@ -11883,14 +11965,18 @@ const tableMethods = {
             setScrollLeft(bodyScrollElem, scrollLeft);
             setScrollLeft(headerScrollElem, scrollLeft);
             setScrollLeft(footerScrollElem, scrollLeft);
-            loadScrollXData($xeTable);
+            if (reactData.scrollXLoad) {
+                loadScrollXData($xeTable);
+            }
         }
         if (XEUtils.isNumber(scrollTop)) {
             setScrollTop(yHandleEl, scrollTop);
             setScrollTop(bodyScrollElem, scrollTop);
             setScrollTop(leftScrollElem, scrollTop);
             setScrollTop(rightScrollElem, scrollTop);
-            loadScrollYData($xeTable);
+            if (reactData.scrollYLoad) {
+                loadScrollYData($xeTable);
+            }
         }
         return new Promise(resolve => {
             setTimeout(() => {

package/es/table/src/table.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { getFuncText, isEnableConf } from '../../ui/src/utils';
-import { initTpImg } from '../../ui/src/dom';
+import { initTpImg, toCssUnit } from '../../ui/src/dom';
 import { createReactData, createInternalData, createHandleGetRowId, getCalcHeight, hasDeepKey } from './util';
 import { VxeUI } from '../../ui';
 import methods from './methods';
@@ -1136,6 +1136,19 @@ export default {
             }
             return '';
         },
+        computeTableStyle() {
+            const $xeTable = this;
+            const scrollbarOpts = $xeTable.computeScrollbarOpts;
+            const { width, height } = scrollbarOpts;
+            const tStys = {};
+            if (width) {
+                tStys['--vxe-ui-table-view-scrollbar-width'] = toCssUnit(width);
+            }
+            if (height) {
+                tStys['--vxe-ui-table-view-scrollbar-height'] = toCssUnit(height);
+            }
+            return tStys;
+        },
         computeTableRowExpandedList() {
             const $xeTable = this;
             const reactData = $xeTable;
@@ -1919,6 +1932,7 @@ export default {
             footer: slots.footerTooltip || slots['footer-tooltip']
         };
         const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
+        const tableStyle = $xeTable.computeTableStyle;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const tableTipConfig = $xeTable.computeTableTipConfig;
         const validTipConfig = $xeTable.computeValidTipConfig;
@@ -1986,6 +2000,7 @@ export default {
                     'is--virtual-x': scrollXLoad,
                     'is--virtual-y': scrollYLoad
                 }],
+            style: tableStyle,
             attrs: {
                 spellcheck: false
             },

package/es/table/src/util.js

@@ -124,6 +124,7 @@ export function createInternalData() {
         tFooterHeight: 0,
         teleportToWrapperElem: null,
         popupToWrapperElem: null,
+        lastSTime: 0,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,
@@ -153,8 +154,6 @@ export function createReactData() {
         scrollbarWidth: 0,
         // 横向滚动条的高度
         scrollbarHeight: 0,
-        // 最后滚动时间戳
-        lastScrollTime: 0,
         // 行高
         rowHeight: 0,
         // 表格父容器的高度

package/es/table/style.css

@@ -2415,7 +2415,7 @@
 .vxe-table .vxe-table--scroll-x-handle {
   overflow-y: hidden;
   overflow-x: scroll;
-  height: 18px;
+  height: var(--vxe-ui-table-view-scrollbar-height);
 }
 .vxe-table .vxe-table--scroll-y-handle,
 .vxe-table .vxe-table--scroll-y-wrapper {
@@ -2427,7 +2427,7 @@
 .vxe-table .vxe-table--scroll-y-handle {
   overflow-y: scroll;
   overflow-x: hidden;
-  width: 18px;
+  width: var(--vxe-ui-table-view-scrollbar-width);
   height: 100%;
 }
 .vxe-table .vxe-table--scroll-x-space {