vxe-table 4.11.7 → 4.11.9

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

@@ -9159,7 +9159,7 @@ export default defineComponent({
                 const el = refElem.value;
                 tablePrivateMethods.clearHoverRow();
                 if (el) {
-                    XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+                    XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
                 }
                 internalData.hoverRow = row;
             },

package/es/table/style.css

@@ -2211,15 +2211,6 @@
 .vxe-table .vxe-table--header-wrapper {
   color: var(--vxe-ui-table-header-font-color);
 }
-.vxe-table .vxe-table--header-wrapper::after {
-  content: "";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  height: 0;
-  width: 100%;
-  border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2467,11 +2458,6 @@
 .vxe-table--render-default.column--highlight .vxe-header--column:not(.col--seq):hover {
   background-color: var(--vxe-ui-table-column-hover-background-color);
 }
-.vxe-table--render-default.header-cell--area .vxe-table--header-wrapper {
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-}
 .vxe-table--render-default.body-cell--area .vxe-table--body-wrapper {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -2654,9 +2640,6 @@
 .vxe-table--render-default.border--none .vxe-table--border-line {
   display: none;
 }
-.vxe-table--render-default.border--none .vxe-table--header-wrapper::after {
-  display: none;
-}
 .vxe-table--render-default.size--medium {
   font-size: var(--vxe-ui-font-size-medium);
 }