vxe-table 3.7.0-beta.1 → 3.7.0-beta.4

package/packages/table/src/methods.js

@@ -414,7 +414,7 @@ const Methods = {
     this.tableSynchData = datas
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.tableSourceData = XEUtils.clone(fullData, true)
+      this.cacheSourceMap(fullData)
     }
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (sYLoad) {
@@ -625,6 +625,30 @@ const Methods = {
       tableFullData.forEach(handleCache)
     }
   },
+  cacheSourceMap (fullData) {
+    let { treeConfig, treeOpts, sourceDataRowIdData } = this
+    const sourceData = XEUtils.clone(fullData, true)
+    const rowkey = getRowkey(this)
+    sourceDataRowIdData = this.sourceDataRowIdData = {}
+    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(sourceData, handleSourceRow, treeOpts)
+    } else {
+      sourceData.forEach(handleSourceRow)
+    }
+    this.tableSourceData = sourceData
+  },
   loadTreeChildren (row, childRecords) {
     const { keepSource, tableSourceData, treeOpts, fullDataRowIdData, fullDataRowMap, fullAllDataRowMap, fullAllDataRowIdData } = this
     const { transform, children, mapChildren } = treeOpts
@@ -1061,31 +1085,21 @@ const Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow (row, field) {
-    const { tableFullColumn, keepSource, treeConfig, treeOpts, tableSourceData, fullDataRowIdData } = this
+    const { tableFullColumn, keepSource, sourceDataRowIdData, fullDataRowIdData } = this
     if (keepSource) {
-      let oRow, property
       const rowid = getRowid(this, row)
       // 新增的数据不需要检测
       if (!fullDataRowIdData[rowid]) {
         return false
       }
-      if (treeConfig) {
-        const children = treeOpts.children
-        const matchObj = XEUtils.findTree(tableSourceData, item => rowid === getRowid(this, item), treeOpts)
-        row = Object.assign({}, row, { [children]: null })
-        if (matchObj) {
-          oRow = Object.assign({}, matchObj.item, { [children]: null })
-        }
-      } else {
-        const oRowIndex = fullDataRowIdData[rowid].index
-        oRow = tableSourceData[oRowIndex]
-      }
-      if (oRow) {
+      const oldRest = sourceDataRowIdData[rowid]
+      if (oldRest) {
+        const oRow = oldRest.row
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field)
         }
         for (let index = 0, len = tableFullColumn.length; index < len; index++) {
-          property = tableFullColumn[index].field
+          const property = tableFullColumn[index].field
           if (property && !eqCellValue(oRow, row, property)) {
             return true
           }
@@ -1460,7 +1474,7 @@ const Methods = {
    */
   showColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true
       return this.handleCustom()
     }
@@ -3788,7 +3802,10 @@ const Methods = {
       if (!remote || (firstSortColumn && firstSortColumn.remoteSort)) {
         this.handleTableData(true)
       }
-      return this.$nextTick().then(this.updateStyle)
+      return this.$nextTick().then(() => {
+        this.updateCellAreas()
+        return this.updateStyle()
+      })
     }
     return this.$nextTick()
   },

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