vxe-table 4.11.6 → 4.11.8

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

@@ -971,7 +971,7 @@ hooks.add('tableExportModule', {
                 isMerge: hasMerge,
                 useStyle: true,
                 current: 'current',
-                modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+                modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty'])
             }, options);
             const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
             const modes = defOpts.modes || [];
@@ -1093,7 +1093,7 @@ hooks.add('tableExportModule', {
                     isMerge: hasMerge,
                     useStyle: true,
                     current: 'current',
-                    modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+                    modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty']),
                     download: true,
                     type: 'csv'
                     // filename: '',
@@ -1309,7 +1309,7 @@ hooks.add('tableExportModule', {
                             }
                         }
                     }
-                    else if (mode === 'current') {
+                    if (mode === 'current') {
                         handleOptions.data = afterFullData;
                     }
                 }

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

@@ -9,7 +9,7 @@ const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'saveFi
 hooks.add('tableFilterModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
-        const { refTableHeader, refTableBody, refTableFilter } = $xeTable.getRefMaps();
+        const { refElem, refTableFilter } = $xeTable.getRefMaps();
         const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps();
         // 确认筛选
         const handleFilterConfirmFilter = (evnt) => {
@@ -61,11 +61,15 @@ hooks.add('tableFilterModule', {
              */
             triggerFilterEvent(evnt, column, params) {
                 const { initStore, filterStore } = reactData;
+                const { elemStore } = internalData;
                 if (filterStore.column === column && filterStore.visible) {
                     filterStore.visible = false;
                 }
                 else {
-                    const { target: targetElem, pageX } = evnt;
+                    const { clientY, pageX } = evnt;
+                    const el = refElem.value;
+                    const tableRect = el.getBoundingClientRect();
+                    const targetElem = evnt.target;
                     const { visibleWidth } = getDomNode();
                     const { filters, filterMultiple, filterRender } = column;
                     const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
@@ -91,11 +95,8 @@ hooks.add('tableFilterModule', {
                     filterStore.visible = true;
                     initStore.filter = true;
                     nextTick(() => {
-                        const tableHeader = refTableHeader.value;
-                        const tableBody = refTableBody.value;
-                        const headerElem = tableHeader ? tableHeader.$el : null;
-                        const bodyElem = tableBody.$el;
-                        if (!bodyElem) {
+                        const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+                        if (!headerScrollElem) {
                             return;
                         }
                         const tableFilter = refTableFilter.value;
@@ -104,30 +105,27 @@ hooks.add('tableFilterModule', {
                             return;
                         }
                         const filterWidth = filterWrapperElem.offsetWidth;
-                        const filterHeight = filterWrapperElem.offsetHeight;
                         const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
                         const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
                         const centerWidth = filterWidth / 2;
                         const minMargin = 10;
-                        const maxLeft = bodyElem.clientWidth - filterWidth - minMargin;
+                        const maxLeft = el.clientWidth - filterWidth - minMargin;
                         let left, right;
+                        const thEl = targetElem.offsetParent;
+                        const trEl = thEl.offsetParent;
                         const style = {
-                            top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight}px`
+                            top: `${targetElem.offsetTop + thEl.offsetTop + targetElem.offsetHeight}px`
                         };
                         // 判断面板不能大于表格高度
-                        let maxHeight = null;
-                        const bodyHeight = bodyElem.clientHeight - (headerElem ? headerElem.clientHeight / 2 : 0);
-                        if (filterHeight >= bodyHeight) {
-                            maxHeight = Math.max(40, bodyHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0));
-                        }
+                        const maxHeight = Math.max(40, el.clientHeight - (clientY - tableRect.y) - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
                         if (column.fixed === 'left') {
-                            left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth;
+                            left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth;
                         }
                         else if (column.fixed === 'right') {
-                            right = (targetElem.offsetParent.offsetWidth - targetElem.offsetLeft) + (targetElem.offsetParent.offsetParent.offsetWidth - targetElem.offsetParent.offsetLeft) - column.renderWidth - centerWidth;
+                            right = (thEl.offsetWidth - targetElem.offsetLeft) + (trEl.offsetWidth - trEl.offsetLeft) - column.renderWidth - centerWidth;
                         }
                         else {
-                            left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth - bodyElem.scrollLeft;
+                            left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth - headerScrollElem.scrollLeft;
                         }
                         if (left) {
                             const overflowWidth = (pageX + filterWidth - centerWidth + minMargin) - visibleWidth;

package/es/table/src/table.js

@@ -2305,7 +2305,7 @@ export default defineComponent({
             reactData.isIndeterminate = false;
             reactData.treeIndeterminateMaps = {};
             internalData.treeIndeterminateRowMaps = {};
-            tablePrivateMethods.checkSelectionStatus();
+            $xeTable.checkSelectionStatus();
             return nextTick();
         };
         // 还原展开、选中等相关状态
@@ -2341,12 +2341,12 @@ export default defineComponent({
             reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
             // 还原保留状态
             if (expandColumn && expandOpts.reserve) {
-                tableMethods.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
+                $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
             }
             // 树展开
             reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
             if (treeConfig && treeOpts.reserve) {
-                tableMethods.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
+                $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
             }
         };
         /**
@@ -3089,9 +3089,9 @@ export default defineComponent({
             handleCheckedAllCheckboxRow(value);
             if (evnt) {
                 dispatchEvent('checkbox-all', {
-                    records: tableMethods.getCheckboxRecords(),
-                    reserves: tableMethods.getCheckboxReserveRecords(),
-                    indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+                    records: $xeTable.getCheckboxRecords(),
+                    reserves: $xeTable.getCheckboxReserveRecords(),
+                    indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
                     checked: value
                 }, evnt);
             }

package/es/table/style.css

@@ -2383,7 +2383,7 @@
   background-color: var(--vxe-ui-layout-background-color);
 }
 .vxe-table--render-default .vxe-table--footer-wrapper {
-  margin-top: -1px;
+  margin-top: calc(var(--vxe-ui-table-border-width) * -1);
   background-color: var(--vxe-ui-table-footer-background-color);
 }
 .vxe-table--render-default .vxe-table--header,