vxe-table 4.11.6 → 4.11.8

package/packages/locale/lang/es-ES.ts

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'La tabla de árbol no soporta importación.',
       treeCrossDrag: 'Only drag and drop the first level',
       treeDragChild: 'The parent cannot be dragged into its own child',
-      reqPlugin: 'Optional extension "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'No hay datos',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'Confirmar',
-      cancel: 'Cancelar'
+      cancel: 'Cancelar',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Datos actuales (datos de la página actual)',
         selected: 'Datos seleccionados (datos seleccionados en la página actual)',
         all: 'Todos los datos (incluidos todos los datos de paginación)'

package/packages/locale/lang/fr-FR.ts

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: "Aucune donnée pour l'instant",
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'A fatáblák nem támogatják az importálást',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'Még nincsenek adatok',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'erősítse meg',
-      cancel: 'Mégsem'
+      cancel: 'Mégsem',
+      clear: '清除'
     },
     filter: {
       search: 'keresés'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Aktuális adatok (az aktuális oldal adatai)',
         selected: 'Kijelölt adatok (kijelölt adatok az aktuális oldalon)',
         all: 'Teljes adat (beleértve az összes oldalszámozott adatot)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: "Le tabelle dell'albero non supportano l'importazione",
       treeCrossDrag: 'È possibile trascinare solo il primo livello',
       treeDragChild: 'Un genitore non può essere trascinato nei propri figli',
-      reqPlugin: 'Estensione facoltativa "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'Nessun dato ancora',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'confermare',
-      cancel: 'Cancellare'
+      cancel: 'Cancellare',
+      clear: '清除'
     },
     filter: {
       search: 'ricerca'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Dati attuali (dati della pagina corrente)',
         selected: 'Dati selezionati (dati selezionati nella pagina corrente)',
         all: 'Dati completi (compresi tutti i dati impaginati)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'ツリーテーブルはインポートをサポートしていません',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'データがありません',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'OK',
-      cancel: 'キャンセル'
+      cancel: 'キャンセル',
+      clear: '清除'
     },
     filter: {
       search: '検索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '表示中のデータ(表示中のページのデータ)',
         selected: '選択したデータ(表示中のページに選択したデータ)',
         all: '全てのデータ（全てのページのデータを含む）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '트리 테이블은 가져오기를 지원하지 않습니다.',
       treeCrossDrag: '첫 번째 계층만 드래그할 수 있습니다.',
       treeDragChild: '부모 항목은 자신의 하위 항목으로 드래그할 수 없습니다.',
-      reqPlugin: '선택적 확장 플러그인 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '데이터가 없습니다.',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '확인',
-      cancel: '취소'
+      cancel: '취소',
+      clear: '清除'
     },
     filter: {
       search: '검색'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '현재 데이터(현재 페이지의 데이터)',
         selected: '선택된 데이터(현재 페이지에서 선택된 데이터)',
         all: '전체 데이터(모든 페이지의 데이터 포함)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'Ingen data ennå',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'A tabela de árvore não suporta importação.',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'Sem dados',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'Confirmar',
-      cancel: 'Cancelar'
+      cancel: 'Cancelar',
+      clear: '清除'
     },
     filter: {
       search: 'Buscar'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Dados atuais (dados da página atual)',
         selected: 'Dados selecionados (dados selecionados na página atual)',
         all: 'Todos os dados (incluindo todos os dados de paginação)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'Древовидные таблицы не поддерживают импорт.',
       treeCrossDrag: 'Перетаскивать можно только первый уровень',
       treeDragChild: 'Родителя нельзя перетащить в своих дочерних элементов',
-      reqPlugin: 'Дополнительное расширение "{1}" https://vxeui.com/other{0}/#/{1}/install.'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install.'
     },
     table: {
       emptyText: 'Данных пока нет',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'подтверждать',
-      cancel: 'Отмена'
+      cancel: 'Отмена',
+      clear: '清除'
     },
     filter: {
       search: 'поиск'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Текущие данные (данные текущей страницы)',
         selected: 'Выбранные данные (выбранные данные на текущей странице)',
         all: 'Полные данные (включая все данные с разбивкой на страницы)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'ตารางแผนผังไม่รองรับการนำเข้า',
       treeCrossDrag: 'สามารถลากได้เฉพาะระดับแรกเท่านั้น',
       treeDragChild: 'ผู้ปกครองไม่สามารถถูกลากเข้าไปในลูกของตัวเองได้',
-      reqPlugin: 'ส่วนขยายเพิ่มเติม "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'ยังไม่มีข้อมูล',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'ยืนยัน',
-      cancel: 'ยกเลิก'
+      cancel: 'ยกเลิก',
+      clear: '清除'
     },
     filter: {
       search: 'ค้นหา'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'ข้อมูลปัจจุบัน (ข้อมูลของหน้าปัจจุบัน)',
         selected: 'ข้อมูลที่เลือก (ข้อมูลที่เลือกในหน้าปัจจุบัน)',
         all: 'ข้อมูลทั้งหมด (รวมถึงข้อมูลที่แบ่งหน้าทั้งหมด)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'دەرەخ شەكىللىك جەدىۋەلنى ئەكىرىشنى قوللىمايدۇ',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'ھازىرچە ئۇچۇر يوق',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'جەزىملەش',
-      cancel: 'ئەمەلدىن قالدۇرۇش'
+      cancel: 'ئەمەلدىن قالدۇرۇش',
+      clear: '清除'
     },
     filter: {
       search: 'ئىزدەش'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'ھازىرقى ئۇچۇر(نۆۋەتتىكى بەتتىكى ئۇچۇر)',
         selected: 'تاللانغان ئۇچۇر(نۆۋەتتىكى بەتتىكى بارلىق تاللانغان ئۇچۇر)',
         all: 'بارلىق ئۇچۇر(بارلىق بەتكە ئايرىلغان ئۇچۇرلارنى ئۆز ئىچىگە ئالىدۇ)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: 'Деревовидна таблиця не підтримує імпорт',
       treeCrossDrag: 'Можна перетягувати тільки на першому рівні',
       treeDragChild: 'Батьківський елемент не можна перетягнути в свій дочірній елемент',
-      reqPlugin: 'Опційний розширений плагін "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: 'Немає даних',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: 'Підтвердити',
-      cancel: 'Скасувати'
+      cancel: 'Скасувати',
+      clear: '清除'
     },
     filter: {
       search: 'Пошук'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: 'Поточні дані (дані поточної сторінки)',
         selected: 'Вибрані дані (дані, вибрані на поточній сторінці)',
         all: 'Всі дані (включаючи дані з усіх сторінок)'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '樹表格不支援導入',
       treeCrossDrag: '只能拖曳第一層級',
       treeDragChild: '父級不能拖曳到自己的子級中',
-      reqPlugin: '選用擴充插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '擴展挿件未安裝 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暫無數據',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '確認',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜尋'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '目前數據（當前頁的數據）',
         selected: '選取資料（目前頁選取的資料）',
         all: '全量資料（包括所有分頁的資料）'

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

@@ -50,7 +50,7 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',
@@ -118,7 +118,8 @@ export default {
     },
     button: {
       confirm: '确认',
-      cancel: '取消'
+      cancel: '取消',
+      clear: '清除'
     },
     filter: {
       search: '搜索'
@@ -170,6 +171,7 @@ export default {
         pdf: 'PDF (*.pdf)'
       },
       modes: {
+        empty: '空数据',
         current: '当前数据（当前页的数据）',
         selected: '选中数据（当前页选中的数据）',
         all: '全量数据（包括所有分页的数据）'

package/packages/table/module/export/export-panel.ts

@@ -247,6 +247,8 @@ export default defineComponent({
               columns,
               params: defaultOptions.params as any
             }
+            const hasEmptyData = defaultOptions.mode === 'empty'
+
             return h('div', {
               class: 'vxe-table-export--panel'
             }, [
@@ -386,7 +388,8 @@ export default defineComponent({
                                 }, [
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: defaultOptions.isHeader,
+                                      modelValue: hasEmptyData || defaultOptions.isHeader,
+                                      disabled: hasEmptyData,
                                       title: getI18n('vxe.export.expHeaderTitle'),
                                       content: getI18n('vxe.export.expOptHeader'),
                                       'onUpdate:modelValue' (value: any) {
@@ -407,7 +410,8 @@ export default defineComponent({
                                     : createCommentVNode(),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
-                                      modelValue: defaultOptions.original,
+                                      modelValue: hasEmptyData ? false : defaultOptions.original,
+                                      disabled: hasEmptyData,
                                       title: getI18n('vxe.export.expOriginalTitle'),
                                       content: getI18n('vxe.export.expOptOriginal'),
                                       'onUpdate:modelValue' (value: any) {
@@ -437,7 +441,7 @@ export default defineComponent({
                                     ? h(VxeUICheckboxComponent, {
                                       modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
                                       title: getI18n('vxe.export.expMergeTitle'),
-                                      disabled: !hasMerge || !supportMerge || !checkedAll,
+                                      disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
                                       content: getI18n('vxe.export.expOptMerge'),
                                       'onUpdate:modelValue' (value: any) {
                                         defaultOptions.isMerge = value
@@ -458,7 +462,7 @@ export default defineComponent({
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
                                       modelValue: hasTree ? defaultOptions.isAllExpand : false,
-                                      disabled: !hasTree,
+                                      disabled: hasEmptyData || !hasTree,
                                       title: getI18n('vxe.export.expAllExpandTitle'),
                                       content: getI18n('vxe.export.expOptAllExpand'),
                                       'onUpdate:modelValue' (value: any) {

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

@@ -1033,7 +1033,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: 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'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+          modes: (proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []).concat(['current', 'selected', 'empty']),
           download: true,
           type: 'csv'
           // filename: '',
@@ -1366,7 +1366,7 @@ hooks.add('tableExportModule', {
                   })
               }
             }
-          } else if (mode === 'current') {
+          } if (mode === 'current') {
             handleOptions.data = afterFullData
           }
         }

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