vxe-table 4.12.0-beta.9 → 4.12.0

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '暂无数据',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -51,7 +51,8 @@ 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: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Nessun dato ancora',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'congelato a destra',
       cancelFixed: 'Sblocca colonna'
     },
+    datePicker: {
+      yearTitle: '{0} anni'
+    },
     input: {
       date: {
         m1: 'Gennaio',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'Ordinamento chiaro',
           sortAsc: 'Ordine crescente',
           sortDesc: 'ordine decrescente',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Ordinamento chiaro',
           sortAsc: 'Ordine crescente',
           sortDesc: 'ordine decrescente',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'ツリーテーブルはインポートをサポートしていません',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'データがありません',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '右側に固定',
       cancelFixed: '列固定を取消'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '1月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'ソートクリア',
           sortAsc: '昇順',
           sortDesc: '降順',
@@ -630,6 +635,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '트리 테이블은 가져오기를 지원하지 않습니다.',
       treeCrossDrag: '첫 번째 계층만 드래그할 수 있습니다.',
       treeDragChild: '부모 항목은 자신의 하위 항목으로 드래그할 수 없습니다.',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '데이터가 없습니다.',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '오른쪽에 고정',
       cancelFixed: '고정 해제'
     },
+    datePicker: {
+      yearTitle: '{0} 년'
+    },
     input: {
       date: {
         m1: '01 월',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '정렬 지우기',
           sortAsc: '오름차순',
           sortDesc: '내림차순',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '정렬 지우기',
           sortAsc: '오름차순',
           sortDesc: '내림차순',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Ingen data ennå',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -51,7 +51,8 @@ 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',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Sem dados',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'Freeze on the right',
       cancelFixed: 'Unfreeze column'
     },
+    datePicker: {
+      yearTitle: '{0} лет'
+    },
     input: {
       date: {
         m1: 'Janeiro',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -630,6 +635,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Limpar ordenação',
           sortAsc: 'Ordem ascendente',
           sortDesc: 'Ordem descendente',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'Древовидные таблицы не поддерживают импорт.',
       treeCrossDrag: 'Перетаскивать можно только первый уровень',
       treeDragChild: 'Родителя нельзя перетащить в своих дочерних элементов',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install.'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install.',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Данных пока нет',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'замер справа',
       cancelFixed: 'Разморозить столбец'
     },
+    datePicker: {
+      yearTitle: '{0} лет'
+    },
     input: {
       date: {
         m1: 'январь',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'Очистить сортировку',
           sortAsc: 'По возрастанию',
           sortDesc: 'порядок убывания',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Очистить сортировку',
           sortAsc: 'По возрастанию',
           sortDesc: 'порядок убывания',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'ตารางแผนผังไม่รองรับการนำเข้า',
       treeCrossDrag: 'สามารถลากได้เฉพาะระดับแรกเท่านั้น',
       treeDragChild: 'ผู้ปกครองไม่สามารถถูกลากเข้าไปในลูกของตัวเองได้',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'ยังไม่มีข้อมูล',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'แช่แข็งทางด้านขวา',
       cancelFixed: 'เลิกตรึงคอลัมน์'
     },
+    datePicker: {
+      yearTitle: '{0} ปี'
+    },
     input: {
       date: {
         m1: 'มกราคม',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'เรียงลำดับให้ชัดเจน',
           sortAsc: 'ลำดับจากน้อยไปหามาก',
           sortDesc: 'ลำดับจากมากไปน้อย',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'เรียงลำดับให้ชัดเจน',
           sortAsc: 'ลำดับจากน้อยไปหามาก',
           sortDesc: 'ลำดับจากมากไปน้อย',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'دەرەخ شەكىللىك جەدىۋەلنى ئەكىرىشنى قوللىمايدۇ',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'ھازىرچە ئۇچۇر يوق',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'ئوڭ ياندا توڭلىتىش',
       cancelFixed: 'قۇر توڭلىتىشنى ئەمەلدىن قالدۇرۇش'
     },
+    datePicker: {
+      yearTitle: '{0} يىل'
+    },
     input: {
       date: {
         m1: '01 ئاي',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'تەرتىپنى تازىلاش',
           sortAsc: 'ئېشىش',
           sortDesc: 'كېمىيىش',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'تەرتىپنى تازىلاش',
           sortAsc: 'ئېشىش',
           sortDesc: 'كېمىيىش',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'Деревовидна таблиця не підтримує імпорт',
       treeCrossDrag: 'Можна перетягувати тільки на першому рівні',
       treeDragChild: 'Батьківський елемент не можна перетягнути в свій дочірній елемент',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Немає даних',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'Зафіксувати праворуч',
       cancelFixed: 'Скасувати фіксацію стовпця'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 місяць',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'Очистити сортування',
           sortAsc: 'По зростанню',
           sortDesc: 'По спаданню',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Очистити сортування',
           sortAsc: 'По зростанню',
           sortDesc: 'По спаданню',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '暂无数据',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '樹表格不支援導入',
       treeCrossDrag: '只能拖曳第一層級',
       treeDragChild: '父級不能拖曳到自己的子級中',
-      reqPlugin: '擴展挿件未安裝 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '擴展挿件未安裝 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '暫無數據',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '凍結在右側',
       cancelFixed: '取消凍結列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: '暂无数据',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

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

@@ -12,7 +12,7 @@ VxeUI.hooks.add('tableCustomModule', {
     const { computeCustomOpts } = $xeTable.getComputeMaps()
     const { refElem } = $xeTable.getRefMaps()
 
-    const $xeGrid = $xeTable.xegrid
+    const $xeGrid = $xeTable.xeGrid
 
     const calcMaxHeight = () => {
       const { customStore } = reactData

package/packages/table/module/custom/panel.ts

@@ -508,6 +508,8 @@ export default defineComponent({
     }
 
     const renderSimplePanel = () => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { customStore } = props
       const { isCustomStatus, customColumnList } = reactData
       const customOpts = computeCustomOpts.value
@@ -534,7 +536,7 @@ export default defineComponent({
       }
       const params = {
         $table: $xeTable,
-        $grid: $xeTable.xegrid,
+        $grid: $xeGrid,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,
@@ -774,6 +776,8 @@ export default defineComponent({
     }
 
     const renderPopupPanel = () => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { customStore } = props
       const { resizable: allResizable } = tableProps
       const { isCustomStatus, customColumnList } = reactData
@@ -800,7 +804,7 @@ export default defineComponent({
       const isAllIndeterminate = customStore.isIndeterminate
       const params = {
         $table: $xeTable,
-        $grid: $xeTable.xegrid,
+        $grid: $xeGrid,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,

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

@@ -324,6 +324,8 @@ hooks.add('tableEditModule', {
     }
 
     const handleEditActive = (params: any, evnt: Event | null, isFocus: boolean, isPos: boolean) => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { editConfig, mouseConfig } = props
       const { editStore, tableColumn } = reactData
       const editOpts = computeEditOpts.value
@@ -340,7 +342,7 @@ hooks.add('tableEditModule', {
           if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
             // 判断是否禁用编辑
             let type: 'edit-disabled' | 'edit-activated' = 'edit-disabled'
-            if (!beforeEditMethod || beforeEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })) {
+            if (!beforeEditMethod || beforeEditMethod({ ...params, $table: $xeTable, $grid: $xeGrid })) {
               if (mouseConfig) {
                 $xeTable.clearSelected()
                 if ($xeTable.clearCellAreas) {
@@ -368,7 +370,7 @@ hooks.add('tableEditModule', {
                   $xeTable.handleFocus(params, evnt)
                 }
                 if (afterEditMethod) {
-                  afterEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })
+                  afterEditMethod({ ...params, $table: $xeTable, $grid: $xeGrid })
                 }
               })
             }
@@ -490,15 +492,14 @@ hooks.add('tableEditModule', {
        */
       remove (rows: any) {
         const { treeConfig } = props
-        const { mergeList, editStore, selectCheckboxMaps } = reactData
-        const { tableFullTreeData, afterFullData, tableFullData } = internalData
+        const { mergeList, editStore } = reactData
+        const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const treeOpts = computeTreeOpts.value
         const { transform, mapChildrenField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
         const { actived, removeMaps } = editStore
         const insertDataRowMaps = Object.assign({}, editStore.insertMaps)
-        const pendingDataRowMaps = Object.assign({}, reactData.pendingRowMaps)
         const { checkField } = checkboxOpts
         let delList: any[] = []
         if (!rows) {
@@ -515,14 +516,13 @@ hooks.add('tableEditModule', {
         })
         // 如果绑定了多选属性，则更新状态
         if (!checkField) {
-          const selectRowMaps = { ...selectCheckboxMaps }
           rows.forEach((row: any) => {
             const rowid = getRowid($xeTable, row)
-            if (selectRowMaps[rowid]) {
-              delete selectRowMaps[rowid]
+            if (selectCheckboxMaps[rowid]) {
+              delete selectCheckboxMaps[rowid]
             }
           })
-          reactData.selectCheckboxMaps = selectRowMaps
+          reactData.updateCheckboxFlag++
         }
         // 从数据源中移除
         if (tableFullData === rows) {
@@ -582,12 +582,12 @@ hooks.add('tableEditModule', {
           if (insertDataRowMaps[rowid]) {
             delete insertDataRowMaps[rowid]
           }
-          if (pendingDataRowMaps[rowid]) {
-            delete pendingDataRowMaps[rowid]
+          if (pendingRowMaps[rowid]) {
+            delete pendingRowMaps[rowid]
           }
         })
         editStore.insertMaps = insertDataRowMaps
-        reactData.pendingRowMaps = pendingDataRowMaps
+        reactData.pendingRowFlag++
         $xeTable.updateFooter()
         $xeTable.cacheRowMap(false)
         $xeTable.handleTableData(treeConfig && transform)

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

@@ -162,6 +162,8 @@ export default defineComponent({
     }
 
     const renderVN = () => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { defaultOptions, storeData } = props
       const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData
       const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData
@@ -242,7 +244,7 @@ export default defineComponent({
           default: () => {
             const params = {
               $table: $xeTable,
-              $grid: $xeTable.xegrid,
+              $grid: $xeGrid,
               options: defaultOptions,
               columns,
               params: defaultOptions.params as any
@@ -487,7 +489,7 @@ export default defineComponent({
           footer () {
             const params = {
               $table: $xeTable,
-              $grid: $xeTable.xegrid,
+              $grid: $xeGrid,
               options: defaultOptions,
               columns,
               params: defaultOptions.params as any

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

@@ -93,6 +93,8 @@ export default defineComponent({
     }
 
     const renderVN = () => {
+      const $xeGrid = $xeTable.xeGrid
+
       const { defaultOptions, storeData } = props
       const selectName = computeSelectName.value
       const hasFile = computeHasFile.value
@@ -127,7 +129,7 @@ export default defineComponent({
           default: () => {
             const params = {
               $table: $xeTable,
-              $grid: $xeTable.xegrid,
+              $grid: $xeGrid,
               options: defaultOptions,
               params: defaultOptions.params as any
             }
@@ -204,7 +206,7 @@ export default defineComponent({
           footer () {
             const params = {
               $table: $xeTable,
-              $grid: $xeTable.xegrid,
+              $grid: $xeGrid,
               options: defaultOptions,
               params: defaultOptions.params as any
             }

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

@@ -97,13 +97,23 @@ export default defineComponent({
       if (filterSlot) {
         return [
           h('div', {
-            class: 'vxe-table--filter-template'
+            class: 'vxe-table--filter-template',
+            style: maxHeight
+              ? {
+                  maxHeight: `${maxHeight}px`
+                }
+              : {}
           }, $xeTable.callSlot(filterSlot, params))
         ]
       } else if (rtFilter) {
         return [
           h('div', {
-            class: 'vxe-table--filter-template'
+            class: 'vxe-table--filter-template',
+            style: maxHeight
+              ? {
+                  maxHeight: `${maxHeight}px`
+                }
+              : {}
           }, getSlotVNs(rtFilter(filterRender, params)))
         ]
       }