vxe-table 3.7.0-beta.0 → 3.7.0-beta.3

package/packages/export/src/mixin.js

@@ -77,7 +77,7 @@ function toBooleanValue (cellValue) {
 
 function getLabelData ($xetable, opts, columns, datas) {
   const { isAllExpand, mode } = opts
-  const { treeConfig, treeOpts, radioOpts, checkboxOpts } = $xetable
+  const { treeConfig, treeOpts, radioOpts, checkboxOpts, columnOpts } = $xetable
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div')
   }
@@ -99,15 +99,18 @@ function getLabelData ($xetable, opts, columns, datas) {
         columns.forEach((column, $columnIndex) => {
           let cellValue = ''
           const renderOpts = column.editRender || column.cellRender
-          let exportLabelMethod = column.exportMethod
-          if (!exportLabelMethod && renderOpts && renderOpts.name) {
+          let bodyExportMethod = column.exportMethod
+          if (!bodyExportMethod && renderOpts && renderOpts.name) {
             const compConf = VXETable.renderer.get(renderOpts.name)
             if (compConf) {
-              exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod
+              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod
             }
           }
-          if (exportLabelMethod) {
-            cellValue = exportLabelMethod({ $table: $xetable, row, column, options: opts })
+          if (!bodyExportMethod) {
+            bodyExportMethod = columnOpts.exportMethod
+          }
+          if (bodyExportMethod) {
+            cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts })
           } else {
             switch (column.type) {
               case 'seq':
@@ -216,21 +219,26 @@ function getBooleanValue (cellValue) {
 }
 
 function getHeaderTitle ($xetable, opts, column) {
-  const { headerExportMethod } = column
-  return headerExportMethod ? headerExportMethod({ column, $table: $xetable }) : ((opts.original ? column.property : column.getTitle()) || '')
+  const { columnOpts } = $xetable
+  const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
+  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.property : column.getTitle()) || '')
 }
 
 function getFooterCellValue ($xetable, opts, items, column) {
+  const { columnOpts } = $xetable
   const renderOpts = column.editRender || column.cellRender
-  let exportLabelMethod = column.footerExportMethod
-  if (!exportLabelMethod && renderOpts && renderOpts.name) {
+  let footLabelMethod = column.footerExportMethod
+  if (!footLabelMethod && renderOpts && renderOpts.name) {
     const compConf = VXETable.renderer.get(renderOpts.name)
     if (compConf) {
-      exportLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod
+      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod
     }
   }
+  if (!footLabelMethod) {
+    footLabelMethod = columnOpts.footerExportMethod
+  }
   const _columnIndex = $xetable.getVTColumnIndex(column)
-  const cellValue = exportLabelMethod ? exportLabelMethod({ $table: $xetable, items, itemIndex: _columnIndex, _columnIndex, column, options: opts }) : XEUtils.toValueString(items[_columnIndex])
+  const cellValue = footLabelMethod ? footLabelMethod({ $table: $xetable, items, itemIndex: _columnIndex, _columnIndex, column, options: opts }) : XEUtils.toValueString(items[_columnIndex])
   return cellValue
 }
 

package/packages/table/src/methods.js

@@ -590,8 +590,8 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap (source) {
-    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData } = this
-    let { fullDataRowIdData, fullAllDataRowIdData } = this
+    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData, tableSourceData } = this
+    let { fullDataRowIdData, fullAllDataRowIdData, sourceDataRowIdData } = this
     const rowkey = getRowkey(this)
     const isLazy = treeConfig && treeOpts.lazy
     const handleCache = (row, index, items, path, parent, nodes) => {
@@ -618,12 +618,31 @@ const Methods = {
       fullDataRowMap.clear()
     }
     fullAllDataRowIdData = this.fullAllDataRowIdData = {}
+    sourceDataRowIdData = this.sourceDataRowIdData = {}
     fullAllDataRowMap.clear()
     if (treeConfig) {
       XEUtils.eachTree(tableFullTreeData, handleCache, treeOpts)
     } else {
       tableFullData.forEach(handleCache)
     }
+
+    const handleSourceRow = (row) => {
+      let rowid = getRowid(this, row)
+      if (eqEmptyValue(rowid)) {
+        rowid = getRowUniqueId()
+        XEUtils.set(row, rowkey, rowid)
+      }
+      sourceDataRowIdData[rowid] = {
+        row,
+        rowid
+      }
+    }
+    // 源数据缓存
+    if (treeConfig && !treeOpts.transform) {
+      XEUtils.eachTree(tableSourceData, handleSourceRow, treeOpts)
+    } else {
+      tableSourceData.forEach(handleSourceRow)
+    }
   },
   loadTreeChildren (row, childRecords) {
     const { keepSource, tableSourceData, treeOpts, fullDataRowIdData, fullDataRowMap, fullAllDataRowMap, fullAllDataRowIdData } = this
@@ -1460,7 +1479,7 @@ const Methods = {
    */
   showColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true
       return this.handleCustom()
     }

package/types/export.d.ts

@@ -231,6 +231,7 @@ export interface ColumnExportCellRenderParams extends GridRenderParams {
 
 export interface ColumnExportHeaderRenderParams extends GridRenderParams {
   column: ColumnInfo;
+  options: ExportParams;
 }
 
 export interface ColumnExportFooterRenderParams extends GridRenderParams {

package/types/table.d.ts

@@ -1250,6 +1250,7 @@ export interface TableColumnConfig {
   width?: number
   minWidth?: number
   maxWidth?: number
+  headerExportMethod?(params: any): string | number
 }
 export type ColumnDefaultConfig = TableColumnConfig