vxe-table 4.21.2 → 4.21.3

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

@@ -471,6 +471,10 @@ VxeUI.hooks.add('tableCustomModule', {
             handleUpdateCustomColumn,
             handleCustomStyle() {
                 const reactData = $xeTable.reactData;
+                const { customStore } = reactData;
+                if (!customStore.visible) {
+                    return nextTick();
+                }
                 reactData.isCustomDragStatus = false;
                 return updatePopupStyle();
             }

package/es/table/module/export/export-panel.js

@@ -117,9 +117,10 @@ export default defineVxeComponent({
             const { hasMerge, columns } = storeData;
             const checkedAll = computeCheckedAll.value;
             const supportMerge = computeSupportMerge.value;
-            const expColumns = XEUtils.searchTree(columns, (column) => column.checked, { children: 'children', mapChildren: 'childNodes', original: true });
+            // 内部导出使用 _columns -> _children 为自定义子集
+            const expColumns = XEUtils.searchTree(columns, (column) => column.checked, { children: 'children', mapChildren: '_children', original: true });
             return Object.assign({}, defaultOptions, {
-                columns: expColumns,
+                _columns: expColumns,
                 isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
             });
         };

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

@@ -257,7 +257,7 @@ const tableExportMethodKeys = ['exportData', 'importByFile', 'importData', 'save
 hooks.add('tableExportModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
-        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
+        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
         const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
             const seqOpts = computeSeqOpts.value;
             const seqMd = seqOpts.seqMethod || column.seqMethod;
@@ -1214,9 +1214,9 @@ hooks.add('tableExportModule', {
             const { initStore, isGroup, rowGroupList, footerTableData, exportStore, exportParams } = reactData;
             const { collectColumn, mergeBodyList, mergeFooterList } = internalData;
             const exportOpts = computeExportOpts.value;
+            const printOpts = computePrintOpts.value;
             const hasTree = !!treeConfig;
             const hasRowGroup = rowGroupList.length > 0;
-            const customOpts = computeCustomOpts.value;
             const selectRecords = $xeTable.getCheckboxRecords();
             const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {};
             const hasFooter = !!footerTableData.length;
@@ -1237,9 +1237,9 @@ hooks.add('tableExportModule', {
                 warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
                 defOpts.isTreeAllExpanded = defOpts.isAllExpand;
             }
-            const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
+            const types = isPrint ? [] : (defOpts.types || XEUtils.keys(exportOpts._typeMaps));
             const modes = defOpts.modes || [];
-            const checkMethod = customOpts.checkMethod;
+            const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod;
             const exportColumns = collectColumn.slice(0);
             const { columns, excludeFields, includeFields, extraFields } = defOpts;
             // 处理类型
@@ -1346,10 +1346,10 @@ hooks.add('tableExportModule', {
                 }
             }
             if (!modeList.some(item => item.value === mode)) {
-                exportParams.mode = modeList[0].value;
+                exportParams.mode = modeList.length ? modeList[0].value : '';
             }
             if (!typeList.some(item => item.value === type)) {
-                exportParams.type = typeList[0].value;
+                exportParams.type = typeList.length ? typeList[0].value : '';
             }
             if (!exportParams.widthMode) {
                 exportParams.widthMode = '';
@@ -1438,7 +1438,13 @@ hooks.add('tableExportModule', {
                 }
                 let isCustomCol = false;
                 let customCols = [];
-                if (columns) {
+                const _columns = opts._columns;
+                if (_columns) {
+                    // 内部导出使用 _columns -> _children 为自定义子集
+                    isCustomCol = true;
+                    customCols = XEUtils.searchTree(_columns, () => true, { children: '_children', mapChildren: 'childNodes', original: true });
+                }
+                else if (columns) {
                     isCustomCol = true;
                     customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
                 }

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

@@ -15,6 +15,92 @@ hooks.add('tableFilterModule', {
         const { props, reactData, internalData } = $xeTable;
         const { refElem, refTableFilter } = $xeTable.getRefMaps();
         const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps();
+        const updatePopupStyle = () => {
+            const { filterStore } = reactData;
+            const { elemStore } = internalData;
+            const { column, targetEl } = filterStore;
+            if (!column || !targetEl) {
+                return nextTick();
+            }
+            const tableEl = refElem.value;
+            const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
+            const filterOpts = computeFilterOpts.value;
+            const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
+            const currEl = targetEl;
+            const tableRect = tableEl.getBoundingClientRect();
+            const filterRender = column ? column.filterRender : null;
+            const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
+            const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+            if (!headerScrollElem) {
+                return nextTick();
+            }
+            const tableFilter = refTableFilter.value;
+            const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value : null;
+            if (!filterWrapperElem) {
+                return nextTick();
+            }
+            const btnRect = currEl.getBoundingClientRect();
+            const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
+            const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
+            const filterWidth = filterWrapperElem.offsetWidth;
+            const centerWidth = currEl ? filterWidth / 2 : ((filterWidth - column.renderWidth) / 2);
+            let left = 0;
+            let top = 0;
+            let maxHeight = 0;
+            /**
+             * 是否显示筛选按钮图标
+             * 如果不存在图标，则相对单元格居中显示
+             */
+            if (transfer) {
+                left = btnRect.left - centerWidth + scrollLeft;
+                top = btnRect.top + currEl.clientHeight + scrollTop;
+                maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
+                if (left < 16) {
+                    left = 16;
+                }
+                else if (left > (visibleWidth - filterWidth - 16)) {
+                    left = visibleWidth - filterWidth - 16;
+                }
+            }
+            else {
+                left = btnRect.left - tableRect.left - centerWidth;
+                top = btnRect.top - tableRect.top + currEl.clientHeight;
+                maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+                if (left < 1) {
+                    left = 1;
+                }
+                else if (left > (tableEl.clientWidth - filterWidth - 1)) {
+                    left = tableEl.clientWidth - filterWidth - 1;
+                }
+                if ($xeGGWrapper) {
+                    const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value;
+                    if (wrapperEl) {
+                        const wrapperRect = wrapperEl.getBoundingClientRect();
+                        top += tableRect.top - wrapperRect.top;
+                    }
+                }
+            }
+            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;
+            return nextTick();
+        };
         const filterPrivateMethods = {
             checkFilterOptions() {
                 const { filterStore } = reactData;
@@ -27,96 +113,21 @@ hooks.add('tableFilterModule', {
             },
             handleOpenFilterColumn(evnt, btnEl, colEl, column, params) {
                 const { initStore, filterStore } = reactData;
-                const { elemStore } = internalData;
                 if (filterStore.column === column && filterStore.visible) {
                     filterStore.visible = false;
                 }
                 else {
-                    const tableEl = refElem.value;
-                    const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
-                    const filterOpts = computeFilterOpts.value;
-                    const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
                     const currEl = btnEl || colEl;
-                    const tableRect = tableEl.getBoundingClientRect();
-                    const filterRender = column ? column.filterRender : null;
-                    const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
                     $xeTable.handleFilterOptions(column);
                     internalData._currFilterParams = params;
+                    filterStore.targetEl = currEl;
                     filterStore.style = null;
                     filterStore.visible = true;
                     initStore.filter = true;
-                    nextTick(() => {
-                        const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
-                        if (!headerScrollElem) {
-                            return;
-                        }
-                        const tableFilter = refTableFilter.value;
-                        const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value : null;
-                        if (!filterWrapperElem) {
-                            return;
-                        }
-                        const btnRect = currEl.getBoundingClientRect();
-                        const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
-                        const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
-                        const filterWidth = filterWrapperElem.offsetWidth;
-                        const centerWidth = btnEl ? filterWidth / 2 : ((filterWidth - column.renderWidth) / 2);
-                        let left = 0;
-                        let top = 0;
-                        let maxHeight = 0;
-                        /**
-                         * 是否显示筛选按钮图标
-                         * 如果不存在图标，则相对单元格居中显示
-                         */
-                        if (transfer) {
-                            left = btnRect.left - centerWidth + scrollLeft;
-                            top = btnRect.top + currEl.clientHeight + scrollTop;
-                            maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
-                            if (left < 16) {
-                                left = 16;
-                            }
-                            else if (left > (visibleWidth - filterWidth - 16)) {
-                                left = visibleWidth - filterWidth - 16;
-                            }
-                        }
-                        else {
-                            left = btnRect.left - tableRect.left - centerWidth;
-                            top = btnRect.top - tableRect.top + currEl.clientHeight;
-                            maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
-                            if (left < 1) {
-                                left = 1;
-                            }
-                            else if (left > (tableEl.clientWidth - filterWidth - 1)) {
-                                left = tableEl.clientWidth - filterWidth - 1;
-                            }
-                            if ($xeGGWrapper) {
-                                const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value;
-                                if (wrapperEl) {
-                                    const wrapperRect = wrapperEl.getBoundingClientRect();
-                                    top += tableRect.top - wrapperRect.top;
-                                }
-                            }
-                        }
-                        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;
-                    });
                 }
+                nextTick(() => {
+                    updatePopupStyle();
+                });
                 $xeTable.dispatchEvent('filter-visible', { column, field: column.field, property: column.field, filterList: $xeTable.getCheckedFilters(), visible: filterStore.visible }, evnt);
             },
             /**
@@ -274,6 +285,13 @@ hooks.add('tableFilterModule', {
                         $xeTable.dispatchEvent('clear-filter', { filterList: [] }, evnt);
                     }
                 }
+            },
+            handleFilterStyle() {
+                const { filterStore } = reactData;
+                if (!filterStore.visible) {
+                    return nextTick();
+                }
+                return updatePopupStyle();
             }
         };
         const filterMethods = {

package/es/table/src/table.js

@@ -8414,6 +8414,11 @@ export default defineVxeComponent({
             }
         };
         const handleGlobalScrollEvent = (evnt) => {
+            const { filterStore } = reactData;
+            const filterOpts = computeFilterOpts.value;
+            if (filterStore.visible && filterOpts.transfer) {
+                $xeTable.handleFilterStyle();
+            }
             reUpdateCustomStyleEvent(evnt);
         };
         /**

package/es/table/src/util.js

@@ -230,6 +230,7 @@ export function createReactData() {
         customColumnList: [],
         // 当前选中的筛选列
         filterStore: {
+            targetEl: null,
             isAllSelected: false,
             isIndeterminate: false,
             style: null,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.21.2";
+export const version = "4.21.3";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/dom.js

@@ -15,7 +15,7 @@ export function getTpImg() {
     return tpImgEl;
 }
 export function getPropClass(property, params) {
-    return property ? XEUtils.isFunction(property) ? property(params) : property : '';
+    return property ? (XEUtils.isFunction(property) ? property(params) : property) || '' : '';
 }
 function getClsRE(cls) {
     if (!reClsMap[cls]) {

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.2"}`;
+const tableVersion = `table v${"4.21.3"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';