vxe-table 4.11.7 → 4.11.9

package/packages/locale/lang/hu-HU.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'erősítse meg',
-      cancel: 'Mégsem'
+      cancel: 'Mégsem',
+      clear: '清除'
     },
     filter: {
       search: 'keresés'

package/packages/locale/lang/hy-AM.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'

package/packages/locale/lang/id-ID.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'

package/packages/locale/lang/it-IT.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'confermare',
-      cancel: 'Cancellare'
+      cancel: 'Cancellare',
+      clear: '清除'
     },
     filter: {
       search: 'ricerca'

package/packages/locale/lang/ja-JP.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'OK',
-      cancel: 'キャンセル'
+      cancel: 'キャンセル',
+      clear: '清除'
     },
     filter: {
       search: '検索'

package/packages/locale/lang/ko-KR.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '확인',
-      cancel: '취소'
+      cancel: '취소',
+      clear: '清除'
     },
     filter: {
       search: '검색'

package/packages/locale/lang/nb-NO.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'

package/packages/locale/lang/pt-BR.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'Confirmar',
-      cancel: 'Cancelar'
+      cancel: 'Cancelar',
+      clear: '清除'
     },
     filter: {
       search: 'Buscar'

package/packages/locale/lang/ru-RU.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'подтверждать',
-      cancel: 'Отмена'
+      cancel: 'Отмена',
+      clear: '清除'
     },
     filter: {
       search: 'поиск'

package/packages/locale/lang/th-TH.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'ยืนยัน',
-      cancel: 'ยกเลิก'
+      cancel: 'ยกเลิก',
+      clear: '清除'
     },
     filter: {
       search: 'ค้นหา'

package/packages/locale/lang/ug-CN.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'جەزىملەش',
-      cancel: 'ئەمەلدىن قالدۇرۇش'
+      cancel: 'ئەمەلدىن قالدۇرۇش',
+      clear: '清除'
     },
     filter: {
       search: 'ئىزدەش'

package/packages/locale/lang/uk-UA.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'Підтвердити',
-      cancel: 'Скасувати'
+      cancel: 'Скасувати',
+      clear: '清除'
     },
     filter: {
       search: 'Пошук'

package/packages/locale/lang/vi-VN.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'

package/packages/locale/lang/zh-CHT.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '確認',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜尋'

package/packages/locale/lang/zh-CN.ts

@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'

package/packages/table/module/export/hook.ts

@@ -1033,7 +1033,7 @@ 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: string[] = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
       const modes: string[] = defOpts.modes || []
@@ -1153,7 +1153,7 @@ 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: '',

package/packages/table/module/filter/hook.ts

@@ -14,7 +14,7 @@ const tableFilterMethodKeys: (keyof TableFilterMethods)[] = ['openFilter', 'setF
 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()
 
     // 确认筛选
@@ -69,12 +69,16 @@ hooks.add('tableFilterModule', {
        * @param {ColumnInfo} column 列配置
        * @param {Object} params 参数
        */
-      triggerFilterEvent (evnt, column, params) {
+      triggerFilterEvent (evnt: MouseEvent, 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 as HTMLDivElement
           const { visibleWidth } = getDomNode()
           const { filters, filterMultiple, filterRender } = column
           const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
@@ -100,11 +104,8 @@ hooks.add('tableFilterModule', {
           filterStore.visible = true
           initStore.filter = true
           nextTick(() => {
-            const tableHeader = refTableHeader.value
-            const tableBody = refTableBody.value
-            const headerElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
-            const bodyElem = tableBody.$el as HTMLDivElement
-            if (!bodyElem) {
+            const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
+            if (!headerScrollElem) {
               return
             }
             const tableFilter = refTableFilter.value
@@ -113,28 +114,25 @@ hooks.add('tableFilterModule', {
               return
             }
             const filterWidth = filterWrapperElem.offsetWidth
-            const filterHeight = filterWrapperElem.offsetHeight
             const filterHeadElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-header')
             const filterFootElem = filterWrapperElem.querySelector<HTMLDivElement>('.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 as HTMLTableCellElement
+            const trEl = thEl.offsetParent as HTMLTableCellElement
             const style: any = {
-              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight}px`
+              top: `${targetElem.offsetTop + thEl.offsetTop + targetElem.offsetHeight}px`
             }
             // 判断面板不能大于表格高度
-            let maxHeight: number | null = 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/packages/table/src/table.ts

@@ -9279,7 +9279,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/styles/components/table.scss

@@ -648,15 +648,6 @@
 .vxe-table {
   .vxe-table--header-wrapper {
     color: var(--vxe-ui-table-header-font-color);
-    &::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-cell--sort {
@@ -993,11 +984,6 @@
       }
     }
   }
-  &.header-cell--area {
-    .vxe-table--header-wrapper {
-      user-select: none;
-    }
-  }
   &.body-cell--area {
     .vxe-table--body-wrapper {
       user-select: none;
@@ -1249,11 +1235,6 @@
     .vxe-table--border-line {
       display: none;
     }
-    .vxe-table--header-wrapper {
-      &::after {
-        display: none;
-      }
-    }
   }
   
   &.size--medium {