vxe-table 3.14.0-beta.9 → 3.14.0

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

@@ -99,8 +99,9 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
 
   const props = _vm
 
-  const $xeTable = _vm.$xeTable
-  const reactData = $xeTable
+  const $xeTable = _vm.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+  const reactData = $xeTable as unknown as TableReactData
+  const $xeGrid = $xeTable.$xeGrid
 
   const { customStore } = props
   const { isCustomStatus, customColumnList } = reactData
@@ -128,7 +129,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
   }
   const params = {
     $table: $xeTable,
-    $grid: $xeTable.xegrid,
+    $grid: $xeGrid,
     columns: customColumnList,
     isAllChecked,
     isAllIndeterminate,
@@ -268,7 +269,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
     class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
       'is--active': customStore.visible
     }],
-    style: maxHeight && !['left', 'right'].includes(placement)
+    style: maxHeight && !['left', 'right'].includes(placement || '')
       ? {
           maxHeight: `${maxHeight}px`
         }
@@ -406,9 +407,10 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
 
   const props = _vm
 
-  const $xeTable = _vm.$xeTable
+  const $xeTable = _vm.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
   const tableProps = $xeTable
-  const reactData = $xeTable
+  const reactData = $xeTable as unknown as TableReactData
+  const $xeGrid = $xeTable.$xeGrid
 
   const { customStore } = props
   const { resizable: allResizable } = tableProps
@@ -436,7 +438,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
   const isAllIndeterminate = customStore.isIndeterminate
   const params = {
     $table: $xeTable,
-    $grid: $xeTable.xegrid,
+    $grid: $xeGrid,
     columns: customColumnList,
     isAllChecked,
     isAllIndeterminate,
@@ -829,9 +831,6 @@ export default {
   inject: {
     $xeTable: {
       default: null
-    },
-    $xetable: {
-      default: null
     }
   },
   data () {
@@ -851,8 +850,9 @@ export default {
     const VxeUIRadioGroupComponent = VxeUI.getComponent<VxeRadioGroupComponent>('VxeRadioGroup')
 
     this.$nextTick(() => {
-      const { $xetable } = this
-      const { customOpts } = $xetable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      const { customOpts } = $xeTable
       const { mode } = customOpts
       if (!VxeUIModalComponent) {
         errLog('vxe.error.reqComp', ['vxe-modal'])
@@ -882,16 +882,20 @@ export default {
   },
   methods: {
     handleWrapperMouseenterEvent (evnt: any) {
-      const { $xetable, customStore } = this
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      const { customStore } = this
       customStore.activeWrapper = true
-      $xetable.customOpenEvent(evnt)
+      $xeTable.customOpenEvent(evnt)
     },
     handleWrapperMouseleaveEvent  (evnt: any) {
-      const { $xetable, customStore } = this
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      const { customStore } = this
       customStore.activeWrapper = false
       setTimeout(() => {
         if (!customStore.activeBtn && !customStore.activeWrapper) {
-          $xetable.customCloseEvent(evnt)
+          $xeTable.customCloseEvent(evnt)
         }
       }, 300)
     },
@@ -899,8 +903,8 @@ export default {
       return {}
     },
     confirmCustomEvent ({ $event }: any) {
-      const $xeTable = this.$xeTable
-      const reactData = $xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       reactData.isCustomStatus = true
       $xeTable.saveCustom()
@@ -908,23 +912,24 @@ export default {
       $xeTable.emitCustomEvent('confirm', $event)
     },
     cancelCloseEvent ({ $event }: any) {
-      const $xeTable = this.$xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('close', $event)
     },
     cancelCustomEvent ({ $event }: any) {
-      const $xeTable = this.$xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
       $xeTable.cancelCustom()
       $xeTable.closeCustom()
       $xeTable.emitCustomEvent('cancel', $event)
     },
     handleResetCustomEvent (evnt: any) {
-      const { $xetable } = this
-      $xetable.resetCustom(true)
-      $xetable.closeCustom()
-      $xetable.emitCustomEvent('reset', evnt)
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      $xeTable.resetCustom(true)
+      $xeTable.closeCustom()
+      $xeTable.emitCustomEvent('reset', evnt)
     },
     resetCustomEvent  (evnt: any) {
       if (VxeUI.modal) {
@@ -957,8 +962,8 @@ export default {
       }
     },
     handleOptionCheck (column: any) {
-      const $xeTable = this.$xeTable
-      const reactData = $xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const { customColumnList } = reactData
       const matchObj = XEUtils.findTree(customColumnList, item => item === column) as any
@@ -972,8 +977,8 @@ export default {
       }
     },
     changeCheckboxOption (column: any) {
-      const $xeTable = this.$xeTable
-      const reactData = $xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const customOpts = $xeTable.computeCustomOpts
       const isChecked = !column.renderVisible
@@ -996,8 +1001,8 @@ export default {
       $xeTable.checkCustomStatus()
     },
     changeColumnWidth (column: VxeTableDefines.ColumnInfo) {
-      const $xeTable = this.$xetable
-      const reactData = $xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const customOpts = $xeTable.computeCustomOpts
       if (customOpts.immediate) {
@@ -1011,8 +1016,8 @@ export default {
       }
     },
     changeFixedOption  (column: any, colFixed: any) {
-      const $xeTable = this.$xetable
-      const reactData = $xeTable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
 
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
       const customOpts = $xeTable.computeCustomOpts
@@ -1048,12 +1053,12 @@ export default {
       }
     },
     allOptionEvent () {
-      const { $xetable } = this
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
-      $xetable.toggleCustomAllCheckbox()
+      $xeTable.toggleCustomAllCheckbox()
     },
     sortMousedownEvent (evnt: MouseEvent) {
-      const $xeTable = this.$xetable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
       const btnEl = evnt.currentTarget as HTMLElement
       const cellEl = btnEl.parentElement as HTMLElement
@@ -1081,7 +1086,7 @@ export default {
       }
     },
     sortDragendEvent (evnt: any) {
-      const $xeTable = this.$xetable as VxeTableConstructor & VxeTablePrivateMethods
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
       const tableProps = $xeTable
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
@@ -1269,7 +1274,7 @@ export default {
       removeClass(trEl, 'active--drag-origin')
     },
     sortDragoverEvent  (evnt: any) {
-      const $xeTable = this.$xetable
+      const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
 
       const { dragCol } = this
 

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

@@ -323,6 +323,7 @@ function handleClearEdit ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
 function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, params: any, evnt: Event | null, isFocus: boolean, isPos: boolean) {
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
+  const $xeGrid = $xeTable.$xeGrid
 
   const { editConfig, mouseConfig } = props
   const { editStore, tableColumn } = reactData
@@ -340,7 +341,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
       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 +369,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
               $xeTable.handleFocus(params, evnt)
             }
             if (afterEditMethod) {
-              afterEditMethod({ ...params, $table: $xeTable, $grid: $xeTable.xegrid })
+              afterEditMethod({ ...params, $table: $xeTable, $grid: $xeGrid })
             }
           })
         }
@@ -494,19 +495,20 @@ export default {
      * 如果为空则删除所有
      */
     _remove (rows: any[]) {
-      const $xeTable = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
-      const reactData = $xeTable
-      const internalData = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
 
       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 = $xeTable.computeCheckboxOpts
       const treeOpts = $xeTable.computeTreeOpts
       const { transform, mapChildrenField } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
-      const { actived, removeMaps, insertMaps } = editStore
+      const { actived, removeMaps } = editStore
+      const insertDataRowMaps = Object.assign({}, editStore.insertMaps)
       const { checkField } = checkboxOpts
       let delList: any[] = []
       if (!rows) {
@@ -523,14 +525,13 @@ export default {
       })
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
-        const selectRowMaps = { ...selectCheckboxMaps }
         rows.forEach((row) => {
           const rowid = getRowid(this, row)
-          if (selectRowMaps[rowid]) {
-            delete selectRowMaps[rowid]
+          if (selectCheckboxMaps[rowid]) {
+            delete selectCheckboxMaps[rowid]
           }
         })
-        this.selectCheckboxMaps = selectRowMaps
+        reactData.updateCheckboxFlag++
       }
       // 从数据源中移除
       if (tableFullData === rows) {
@@ -587,10 +588,15 @@ export default {
       // 从新增中移除已删除的数据
       rows.forEach((row: any) => {
         const rowid = getRowid($xeTable, row)
-        if (insertMaps[rowid]) {
-          delete insertMaps[rowid]
+        if (insertDataRowMaps[rowid]) {
+          delete insertDataRowMaps[rowid]
+        }
+        if (pendingRowMaps[rowid]) {
+          delete pendingRowMaps[rowid]
         }
       })
+      editStore.insertMaps = insertDataRowMaps
+      reactData.pendingRowFlag++
       $xeTable.updateFooter()
       $xeTable.cacheRowMap(false)
       $xeTable.handleTableData(treeConfig && transform)

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

@@ -5,6 +5,7 @@ import { formatText } from '../../../ui/src/utils'
 import { errLog } from '../../../ui/src/log'
 
 import type { VxeModalComponent, VxeInputComponent, VxeCheckboxComponent, VxeSelectComponent, VxeButtonComponent } from 'vxe-pc-ui'
+import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
 
 const { getI18n, getIcon, globalMixins, renderEmptyElement } = VxeUI
 
@@ -84,7 +85,8 @@ export default {
     })
   },
   render (this: any, h: CreateElement) {
-    const $xeTable = this.$xeTable
+    const $xeTable = this.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid
 
     const { _e, checkedAll, isAll: isAllChecked, isIndeterminate: isAllIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this
     const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData
@@ -168,7 +170,7 @@ export default {
         default: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             columns,
             params: defaultOptions.params as any
@@ -437,7 +439,7 @@ export default {
         footer: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             columns,
             params: defaultOptions.params as any
@@ -541,9 +543,10 @@ export default {
       }
     },
     printEvent () {
-      const $xetable = this.$parent
+      const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
+
       this.storeData.visible = false
-      $xetable.print(Object.assign({}, $xetable.printOpts, this.getExportOption()))
+      $xeTable.print(Object.assign({}, $xeTable.printOpts, this.getExportOption()))
     },
     exportEvent () {
       const $xeTable = this.$xeTable

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

@@ -5,6 +5,7 @@ import { parseFile } from '../../../ui/src/utils'
 import { errLog } from '../../../ui/src/log'
 
 import type { VxeModalComponent, VxeSelectComponent, VxeButtonComponent } from 'vxe-pc-ui'
+import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
 
 const { getI18n, getIcon, globalMixins, renderEmptyElement } = VxeUI
 
@@ -68,7 +69,8 @@ export default {
     })
   },
   render (this: any, h: CreateElement) {
-    const $xeTable = this.$xeTable
+    const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid
 
     const { hasFile, loading, parseTypeLabel, defaultOptions, storeData, selectName } = this
     const slots = defaultOptions.slots || {}
@@ -105,7 +107,7 @@ export default {
         default: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             params: defaultOptions.params as any
           }
@@ -196,7 +198,7 @@ export default {
         footer: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             params: defaultOptions.params as any
           }
@@ -238,8 +240,9 @@ export default {
       })
     },
     selectFileEvent () {
-      const $xetable = this.$parent
-      $xetable.readFile(this.defaultOptions).then((params: any) => {
+      const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
+
+      $xeTable.readFile(this.defaultOptions).then((params: any) => {
         const { file } = params
         Object.assign(this.storeData, parseFile(file), { file })
       }).catch((e: any) => e)
@@ -257,9 +260,10 @@ export default {
       this.storeData.visible = false
     },
     importEvent () {
-      const $xetable = this.$parent
+      const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
+
       this.loading = true
-      $xetable.importByFile(this.storeData.file, Object.assign({}, $xetable.importOpts, this.defaultOptions)).then(() => {
+      $xeTable.importByFile(this.storeData.file, Object.assign({}, $xeTable.importOpts, this.defaultOptions)).then(() => {
         this.loading = false
         this.storeData.visible = false
       }).catch(() => {

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

@@ -204,27 +204,27 @@ function getBodyLabelData ($xeTable: VxeTableConstructor, opts: VxeTablePropType
   })
 }
 
-function getExportData ($xetable: any, opts: VxeTablePropTypes.ExportHandleOptions) {
+function getExportData ($xeTable: any, opts: VxeTablePropTypes.ExportHandleOptions) {
   const { columns, dataFilterMethod } = opts
   let datas = opts.data
   if (dataFilterMethod) {
     datas = datas.filter((row: any, index: any) => dataFilterMethod({ row, $rowIndex: index }))
   }
-  return getBodyLabelData($xetable, opts, columns, datas)
+  return getBodyLabelData($xeTable, opts, columns, datas)
 }
 
 function getBooleanValue (cellValue: any) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true
 }
 
-function getHeaderTitle ($xetable: any, opts: any, column: any) {
-  const { columnOpts } = $xetable
+function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: any, column: any) {
+  const columnOpts = $xeTable.computeColumnOpts
   const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
-  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.field : column.getTitle()) || '')
+  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xeTable }) : ((opts.original ? column.field : column.getTitle()) || '')
 }
 
-function getFooterCellValue ($xetable: any, opts: any, row: any, column: any) {
-  const { columnOpts } = $xetable
+function getFooterCellValue ($xeTable: any, opts: any, row: any, column: any) {
+  const columnOpts = $xeTable.computeColumnOpts
   const renderOpts = column.editRender || column.cellRender
   let footLabelMethod = column.footerExportMethod
   if (!footLabelMethod && renderOpts && renderOpts.name) {
@@ -236,9 +236,9 @@ function getFooterCellValue ($xetable: any, opts: any, row: any, column: any) {
   if (!footLabelMethod) {
     footLabelMethod = columnOpts.footerExportMethod
   }
-  const _columnIndex = $xetable.getVTColumnIndex(column)
+  const _columnIndex = $xeTable.getVTColumnIndex(column)
   if (footLabelMethod) {
-    return footLabelMethod({ $table: $xetable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts })
+    return footLabelMethod({ $table: $xeTable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts })
   }
   // 兼容老模式
   if (XEUtils.isArray(row)) {
@@ -282,7 +282,7 @@ function toTxtCellLabel (val: any) {
   return val
 }
 
-function toCsv ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
+function toCsv ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
   const reactData = $xeTable as unknown as TableReactData
 
   let content = csvBOM
@@ -302,7 +302,7 @@ function toCsv ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHan
   return content
 }
 
-function toTxt ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
+function toTxt ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
   const reactData = $xeTable as unknown as TableReactData
 
   let content = ''
@@ -322,7 +322,7 @@ function toTxt ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHan
   return content
 }
 
-function hasEllipsis ($xeTable: VxeTableConstructor, column: VxeTableDefines.ColumnInfo, property: 'showOverflow' | 'showHeaderOverflow', allColumnOverflow: VxeTablePropTypes.ShowOverflow | undefined) {
+function hasEllipsis ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, column: VxeTableDefines.ColumnInfo, property: 'showOverflow' | 'showHeaderOverflow', allColumnOverflow: VxeTablePropTypes.ShowOverflow | undefined) {
   const reactData = $xeTable as unknown as TableReactData
 
   const columnOverflow = column[property]
@@ -339,7 +339,7 @@ function hasEllipsis ($xeTable: VxeTableConstructor, column: VxeTableDefines.Col
   return isEllipsis
 }
 
-function toHtml ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
+function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
 
@@ -506,7 +506,9 @@ function toHtml ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHa
   return isPrint ? tables.join('') : createHtmlPage(opts, tables.join(''))
 }
 
-function toXML ($xetable: any, opts: any, columns: any[], datas: any[]) {
+function toXML ($xeTable: any, opts: any, columns: any[], datas: any[]) {
+  const reactData = $xeTable as unknown as TableReactData
+
   let xml = [
     '<?xml version="1.0"?>',
     '<?mso-application progid="Excel.Sheet"?>',
@@ -527,22 +529,22 @@ function toXML ($xetable: any, opts: any, columns: any[], datas: any[]) {
     columns.map(column => `<Column ss:Width="${column.renderWidth}"/>`).join('')
   ].join('')
   if (opts.isHeader) {
-    xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getHeaderTitle($xetable, opts, column)}</Data></Cell>`).join('')}</Row>`
+    xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getHeaderTitle($xeTable, opts, column)}</Data></Cell>`).join('')}</Row>`
   }
   datas.forEach(row => {
     xml += '<Row>' + columns.map(column => `<Cell><Data ss:Type="String">${row[column.id]}</Data></Cell>`).join('') + '</Row>'
   })
   if (opts.isFooter) {
-    const footerTableData = $xetable.footerTableData
+    const { footerTableData } = reactData
     const footers = getFooterData(opts, footerTableData)
     footers.forEach((row: any) => {
-      xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xetable, opts, row, column)}</Data></Cell>`).join('')}</Row>`
+      xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue($xeTable, opts, row, column)}</Data></Cell>`).join('')}</Row>`
     })
   }
   return `${xml}</Table></Worksheet></Workbook>`
 }
 
-function getContent ($xeTable: VxeTableConstructor, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
+function getContent ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) {
   if (columns.length) {
     switch (opts.type) {
       case 'csv':
@@ -590,7 +592,7 @@ export function saveLocalFile (options: any) {
   return Promise.reject(new Error(getI18n('vxe.error.notExp')))
 }
 
-function downloadFile ($xetable: any, opts: any, content: any) {
+function downloadFile ($xeTable: any, opts: any, content: any) {
   const { filename, type, download } = opts
   if (!download) {
     const blob = getExportBlobByContent(content, opts)
@@ -886,8 +888,10 @@ function handleImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
   }
 }
 
-function handleFileImport ($xetable: any, file: any, opts: any) {
-  const { importOpts } = $xetable
+function handleFileImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, file: any, opts: any) {
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const importOpts = $xeTable.computeImportOpts
   const { importMethod, afterImportMethod } = opts
   const { type, filename } = parseFile(file)
 
@@ -907,21 +911,21 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
   const rest = new Promise((resolve, reject) => {
     const _importResolve = (params: any) => {
       resolve(params)
-      $xetable._importResolve = null
-      $xetable._importReject = null
+      ;($xeTable as any)._importResolve = null
+      ;($xeTable as any)._importReject = null
     }
     const _importReject = (params: any) => {
       reject(params)
-      $xetable._importResolve = null
-      $xetable._importReject = null
+      ;($xeTable as any)._importResolve = null
+      ;($xeTable as any)._importReject = null
     }
-    $xetable._importResolve = _importResolve
-    $xetable._importReject = _importReject
+    ;($xeTable as any)._importResolve = _importResolve
+    ;($xeTable as any)._importReject = _importReject
     if (window.FileReader) {
       const options = Object.assign({ mode: 'insertTop' }, opts, { type, filename })
       if (options.remote) {
         if (importMethod) {
-          Promise.resolve(importMethod({ file, options, $table: $xetable })).then(() => {
+          Promise.resolve(importMethod({ file, options, $table: $xeTable })).then(() => {
             _importResolve({ status: true })
           }).catch(() => {
             _importResolve({ status: true })
@@ -930,14 +934,15 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
           _importResolve({ status: true })
         }
       } else {
-        $xetable.preventEvent(null, 'event.import', { file, options, columns: $xetable.tableFullColumn }, () => {
+        const { tableFullColumn } = internalData
+        $xeTable.preventEvent(null, 'event.import', { file, options, columns: tableFullColumn }, () => {
           const reader = new FileReader()
           reader.onerror = () => {
             errLog('vxe.error.notType', [type])
             _importReject({ status: false })
           }
           reader.onload = (e: any) => {
-            handleImport($xetable, e.target.result, options)
+            handleImport($xeTable, e.target.result, options)
           }
           reader.readAsText(file, options.encoding || 'UTF-8')
         })
@@ -951,11 +956,11 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
 
   return rest.then(() => {
     if (afterImportMethod) {
-      afterImportMethod({ status: true, options: opts, $table: $xetable })
+      afterImportMethod({ status: true, options: opts, $table: $xeTable })
     }
   }).catch((e) => {
     if (afterImportMethod) {
-      afterImportMethod({ status: false, options: opts, $table: $xetable })
+      afterImportMethod({ status: false, options: opts, $table: $xeTable })
     }
     return Promise.reject(e)
   })