vxe-table 4.18.1 → 4.18.3

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

@@ -35,7 +35,7 @@ hooks.add('tableFilterModule', {
                     const tableEl = refElem.value;
                     const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                     const filterOpts = computeFilterOpts.value;
-                    const { transfer } = filterOpts;
+                    const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
                     const currEl = btnEl || colEl;
                     const tableRect = tableEl.getBoundingClientRect();
                     const filterRender = column ? column.filterRender : null;
@@ -96,14 +96,23 @@ hooks.add('tableFilterModule', {
                                 }
                             }
                         }
-                        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/hook.js

@@ -23,7 +23,7 @@ hooks.add('tableMenuModule', {
             const isContentMenu = computeIsContentMenu.value;
             const menuOpts = computeMenuOpts.value;
             const config = menuOpts[type];
-            const { transfer, visibleMethod } = menuOpts;
+            const { zIndex, transfer, visibleMethod } = menuOpts;
             if (config) {
                 const { options, disabled } = config;
                 if (disabled) {
@@ -56,7 +56,7 @@ hooks.add('tableMenuModule', {
                                     selectChild: null,
                                     showChild: false,
                                     style: {
-                                        zIndex: internalData.tZindex,
+                                        zIndex: zIndex || internalData.tZindex,
                                         top: `${top}px`,
                                         left: `${left}px`
                                     }

package/es/table/src/body.js

@@ -35,8 +35,9 @@ export default defineVxeComponent({
         // 滚动、拖动过程中不需要触发
         const isVMScrollProcess = () => {
             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));
         };
         const renderLine = (rowid, params, cellHeight) => {
             const { column } = params;

package/es/table/src/table.js

@@ -518,6 +518,18 @@ export default defineVxeComponent({
             }
             return '';
         });
+        const computeTableStyle = computed(() => {
+            const scrollbarOpts = computeScrollbarOpts.value;
+            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;
+        });
         const computeTableRowExpandedList = computed(() => {
             const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
             const { visibleDataRowIdData, rowExpandedMaps } = internalData;
@@ -3590,7 +3602,7 @@ export default defineVxeComponent({
                     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) {
@@ -4281,7 +4293,7 @@ export default defineVxeComponent({
             return Promise.all([
                 xRest,
                 yRest,
-                $xeTable.updateCellAreas()
+                scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
             ]);
         };
         const checkLastSyncScroll = (isRollX, isRollY) => {
@@ -5116,6 +5128,43 @@ export default defineVxeComponent({
                 }
                 return cellLabel;
             },
+            updateCellLabel(row, fieldOrColumn) {
+                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 { 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 nextTick();
+            },
             getFooterCellLabel(row, fieldOrColumn) {
                 const column = handleFieldOrColumn($xeTable, fieldOrColumn);
                 if (!column) {
@@ -5184,6 +5233,41 @@ export default defineVxeComponent({
                 }
                 return cellLabel;
             },
+            updateFooterCellLabel(row, fieldOrColumn) {
+                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 { 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 nextTick();
+            },
             /**
              * 检查是否为临时行数据
              */
@@ -7131,14 +7215,18 @@ export default defineVxeComponent({
                     setScrollLeft(bodyScrollElem, scrollLeft);
                     setScrollLeft(headerScrollElem, scrollLeft);
                     setScrollLeft(footerScrollElem, scrollLeft);
-                    loadScrollXData();
+                    if (reactData.scrollXLoad) {
+                        loadScrollXData();
+                    }
                 }
                 if (XEUtils.isNumber(scrollTop)) {
                     setScrollTop(yHandleEl, scrollTop);
                     setScrollTop(bodyScrollElem, scrollTop);
                     setScrollTop(leftScrollElem, scrollTop);
                     setScrollTop(rightScrollElem, scrollTop);
-                    loadScrollYData();
+                    if (reactData.scrollYLoad) {
+                        loadScrollYData();
+                    }
                 }
                 return new Promise(resolve => {
                     setTimeout(() => {
@@ -11471,7 +11559,7 @@ export default defineVxeComponent({
                     }
                     internalData.lastScrollTop = scrollTop;
                 }
-                reactData.lastScrollTime = Date.now();
+                internalData.lastSTime = Date.now();
                 const evntParams = Object.assign({ source: sourceType, scrollTop,
                     scrollLeft,
                     bodyHeight,
@@ -11711,7 +11799,7 @@ export default defineVxeComponent({
                 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;
@@ -12689,6 +12777,7 @@ export default defineVxeComponent({
                 footer: slots.footerTooltip || slots['footer-tooltip']
             };
             const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
+            const tableStyle = computeTableStyle.value;
             const rowDragOpts = computeRowDragOpts.value;
             const tableTipConfig = computeTableTipConfig.value;
             const validTipConfig = computeValidTipConfig.value;
@@ -12753,7 +12842,7 @@ export default defineVxeComponent({
                         'not--scroll-x': !overflowX,
                         'is--virtual-x': scrollXLoad,
                         'is--virtual-y': scrollYLoad
-                    }], spellcheck: false }, tbOns), [
+                    }], style: tableStyle, spellcheck: false }, tbOns), [
                 /**
                  * 隐藏列
                  */

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 {