vxe-table 4.11.7 → 4.11.8

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/ui/index.js

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

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.11.7"}`;
+const version = `table v${"4.11.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.7";
+const version = "4.11.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.7"}`;
+const log_version = `table v${"4.11.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -22090,8 +22090,7 @@ hook_hooks.add('tableFilterModule', {
       internalData
     } = $xeTable;
     const {
-      refTableHeader,
-      refTableBody,
+      refElem,
       refTableFilter
     } = $xeTable.getRefMaps();
     const {
@@ -22159,13 +22158,19 @@ hook_hooks.add('tableFilterModule', {
           initStore,
           filterStore
         } = reactData;
+        const {
+          elemStore
+        } = internalData;
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false;
         } else {
           const {
-            target: targetElem,
+            clientY,
             pageX
           } = evnt;
+          const el = refElem.value;
+          const tableRect = el.getBoundingClientRect();
+          const targetElem = evnt.target;
           const {
             visibleWidth
           } = getDomNode();
@@ -22204,11 +22209,8 @@ hook_hooks.add('tableFilterModule', {
           filterStore.visible = true;
           initStore.filter = true;
           (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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;
@@ -22217,28 +22219,25 @@ hook_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;
@@ -25310,7 +25309,7 @@ export_hook_hooks.add('tableExportModule', {
         isMerge: hasMerge,
         useStyle: true,
         current: 'current',
-        modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+        modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty'])
       }, options);
       const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
       const modes = defOpts.modes || [];
@@ -25451,7 +25450,7 @@ export_hook_hooks.add('tableExportModule', {
           isMerge: hasMerge,
           useStyle: true,
           current: 'current',
-          modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty']),
           download: true,
           type: 'csv'
           // filename: '',
@@ -31047,7 +31046,8 @@ const Grid = VxeGrid;
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'