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

package/packages/table/src/methods.js

@@ -357,6 +357,7 @@ const Methods = {
    */
   loadTableData (datas) {
     const { keepSource, treeConfig, treeOpts, editStore, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad, sXOpts, sYOpts } = this
+    const childrenField = treeOpts.children || treeOpts.childrenField
     let treeData = []
     let fullData = datas ? datas.slice(0) : []
     if (treeConfig) {
@@ -369,26 +370,26 @@ const Methods = {
           if (!treeOpts.parentField) {
             errLog('vxe.error.reqProp', ['table.tree-config.parentField'])
           }
-          if (!treeOpts.children) {
-            errLog('vxe.error.reqProp', ['tree-config.children'])
+          if (!childrenField) {
+            errLog('vxe.error.reqProp', ['tree-config.childrenField'])
           }
-          if (!treeOpts.mapChildren) {
-            errLog('vxe.error.reqProp', ['tree-config.mapChildren'])
+          if (!treeOpts.mapChildrenField) {
+            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
           }
-          if (treeOpts.children === treeOpts.mapChildren) {
-            errLog('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren'])
+          if (childrenField === treeOpts.mapChildrenField) {
+            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
           }
           fullData.forEach(row => {
-            if (row[treeOpts.children] && row[treeOpts.children].length) {
-              warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+            if (row[childrenField] && row[childrenField].length) {
+              warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
             }
           })
         }
         treeData = XEUtils.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: childrenField,
+          mapChildren: treeOpts.mapChildrenField
         })
         fullData = treeData.slice(0)
       } else {
@@ -414,7 +415,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) {
@@ -592,6 +593,8 @@ const Methods = {
   cacheRowMap (source) {
     const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData } = this
     let { fullDataRowIdData, fullAllDataRowIdData } = this
+    const childrenField = treeOpts.children || treeOpts.childrenField
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowkey = getRowkey(this)
     const isLazy = treeConfig && treeOpts.lazy
     const handleCache = (row, index, items, path, parent, nodes) => {
@@ -602,8 +605,8 @@ const Methods = {
         rowid = getRowUniqueId()
         XEUtils.set(row, rowkey, rowid)
       }
-      if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null
+      if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+        row[childrenField] = null
       }
       const rest = { row, rowid, seq, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent, level }
       if (source) {
@@ -625,9 +628,34 @@ 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
+    const { transform, mapChildrenField } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const rest = fullAllDataRowIdData[getRowid(this, row)]
     const parentLevel = rest ? rest.level : 0
     return this.createData(childRecords).then((rows) => {
@@ -635,7 +663,7 @@ const Methods = {
         const rowid = getRowid(this, row)
         const matchObj = XEUtils.findTree(tableSourceData, (item) => rowid === getRowid(this, item), treeOpts)
         if (matchObj) {
-          matchObj.item[children] = XEUtils.clone(rows, true)
+          matchObj.item[childrenField] = XEUtils.clone(rows, true)
         }
       }
       XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
@@ -646,9 +674,9 @@ const Methods = {
         fullAllDataRowIdData[rowid] = rest
         fullAllDataRowMap.set(childRow, rest)
       }, treeOpts)
-      row[children] = rows
+      row[childrenField] = rows
       if (transform) {
-        row[mapChildren] = rows
+        row[mapChildrenField] = rows
       }
       this.updateAfterDataIndex()
       return rows
@@ -906,6 +934,7 @@ const Methods = {
    */
   defineField (records) {
     const { radioOpts, checkboxOpts, treeConfig, treeOpts, expandOpts } = this
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const rowkey = getRowkey(this)
     if (!XEUtils.isArray(records)) {
       records = [records || {}]
@@ -932,8 +961,8 @@ const Methods = {
           XEUtils.set(record, key, null)
         }
       })
-      if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null
+      if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[childrenField])) {
+        record[childrenField] = null
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(XEUtils.get(record, rowkey))) {
@@ -1061,31 +1090,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
           }
@@ -1142,22 +1161,23 @@ const Methods = {
    */
   getCheckboxRecords (isFull) {
     const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData } = this
-    const { transform, children, mapChildren } = treeOpts
+    const { transform, mapChildrenField } = treeOpts
     const { checkField } = checkboxOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
     let rowList = []
     if (checkField) {
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildren : children })
+        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField })
       } else {
         rowList = currTableData.filter(row => XEUtils.get(row, checkField))
       }
     } else {
-      const { selection } = this
+      const { selectCheckboxRows } = this
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selection, row) > -1, { children: transform ? mapChildren : children })
+        rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selectCheckboxRows, row) > -1, { children: transform ? mapChildrenField : childrenField })
       } else {
-        rowList = currTableData.filter(row => this.findRowIndexOf(selection, row) > -1)
+        rowList = currTableData.filter(row => this.findRowIndexOf(selectCheckboxRows, row) > -1)
       }
     }
     return rowList
@@ -1176,7 +1196,7 @@ const Methods = {
           expandMaps.set(row, 1)
           fullData.push(row)
         }
-      }, { children: treeOpts.mapChildren })
+      }, { children: treeOpts.mapChildrenField })
       this.afterFullData = fullData
       this.updateScrollYStatus(fullData)
       return fullData
@@ -1300,6 +1320,7 @@ const Methods = {
    */
   updateAfterDataIndex () {
     const { treeConfig, afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData, treeOpts } = this
+    const childrenField = treeOpts.children || treeOpts.childrenField
     if (treeConfig) {
       XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
         const rowid = getRowid(this, row)
@@ -1313,7 +1334,7 @@ const Methods = {
           fullAllDataRowIdData[rowid] = rest
           fullDataRowIdData[rowid] = rest
         }
-      }, { children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children })
+      }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
@@ -1460,7 +1481,7 @@ const Methods = {
    */
   showColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true
       return this.handleCustom()
     }
@@ -2035,6 +2056,7 @@ const Methods = {
   },
   updateHeight () {
     this.customHeight = calcHeight(this, 'height')
+    this.customMinHeight = calcHeight(this, 'minHeight')
     this.customMaxHeight = calcHeight(this, 'maxHeight')
   },
   updateStyle () {
@@ -2044,6 +2066,7 @@ const Methods = {
       fullColumnIdData,
       tableColumn,
       customHeight,
+      customMinHeight,
       customMaxHeight,
       border,
       headerHeight,
@@ -2156,15 +2179,22 @@ const Methods = {
         } else if (layout === 'body') {
           const emptyBlockElem = elemStore[`${name}-${layout}-emptyBlock`]
           if (isNodeElement(wrapperElem)) {
+            const bodyMinHeight = fixedType ? ((customMinHeight - headerHeight - footerHeight) - (showFooter ? 0 : scrollbarHeight)) : (customMinHeight - headerHeight - footerHeight)
+            let bodyMaxHeight = 0
             if (customMaxHeight) {
-              wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight}px`
-            } else {
-              if (customHeight > 0) {
-                wrapperElem.style.height = `${fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight}px`
-              } else {
-                wrapperElem.style.height = ''
+              bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? (customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight)) : (customMaxHeight - headerHeight - footerHeight))
+              wrapperElem.style.maxHeight = `${bodyMaxHeight}px`
+            }
+            if (customHeight > 0) {
+              let bodyHeight = fixedType ? ((customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight)) : (customHeight - headerHeight - footerHeight)
+              if (bodyMaxHeight) {
+                bodyHeight = Math.min(bodyMaxHeight, bodyHeight)
               }
+              wrapperElem.style.height = `${Math.max(bodyMinHeight, bodyHeight)}px`
+            } else {
+              wrapperElem.style.height = ''
             }
+            wrapperElem.style.minHeight = `${bodyMinHeight}px`
           }
 
           // 如果是固定列
@@ -2933,12 +2963,12 @@ const Methods = {
     return this.handleCheckedCheckboxRow(rows, value, true)
   },
   isCheckedByCheckboxRow (row) {
-    const { selection } = this
+    const { selectCheckboxRows } = this
     const { checkField } = this.checkboxOpts
     if (checkField) {
       return XEUtils.get(row, checkField)
     }
-    return this.findRowIndexOf(selection, row) > -1
+    return this.findRowIndexOf(selectCheckboxRows, row) > -1
   },
   isIndeterminateByCheckboxRow (row) {
     const { treeIndeterminates } = this
@@ -2949,7 +2979,7 @@ const Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow ({ row }, value, isForce) {
-    const { selection, afterFullData, treeConfig, treeOpts, treeIndeterminates, checkboxOpts } = this
+    const { selectCheckboxRows, afterFullData, treeConfig, treeOpts, treeIndeterminates, checkboxOpts } = this
     const { checkField, checkStrictly, checkMethod } = checkboxOpts
     if (checkField) {
       if (treeConfig && !checkStrictly) {
@@ -2994,15 +3024,15 @@ const Methods = {
           if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row)
           }
-          XEUtils.remove(selection, item => this.eqRow(item, row))
+          XEUtils.remove(selectCheckboxRows, item => this.eqRow(item, row))
         } else {
           // 更新子节点状态
           XEUtils.eachTree([row], (item) => {
             if (this.eqRow(item, row) || (isForce || (!checkMethod || checkMethod({ row: item })))) {
               if (value) {
-                selection.push(item)
+                selectCheckboxRows.push(item)
               } else {
-                XEUtils.remove(selection, select => this.eqRow(select, item))
+                XEUtils.remove(selectCheckboxRows, select => this.eqRow(select, item))
               }
               XEUtils.remove(treeIndeterminates, half => this.eqRow(half, item))
               this.handleCheckboxReserveRow(row, value)
@@ -3018,7 +3048,7 @@ const Methods = {
           if (indeterminatesItem) {
             parentStatus = -1
           } else {
-            const selectItems = matchObj.items.filter(item => this.findRowIndexOf(selection, item) > -1)
+            const selectItems = matchObj.items.filter(item => this.findRowIndexOf(selectCheckboxRows, item) > -1)
             parentStatus = selectItems.filter(item => this.findRowIndexOf(vItems, item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
           }
           return this.handleSelectRow({ row: matchObj.parent }, parentStatus, isForce)
@@ -3026,11 +3056,11 @@ const Methods = {
       } else {
         if (isForce || (!checkMethod || checkMethod({ row }))) {
           if (value) {
-            if (this.findRowIndexOf(selection, row) === -1) {
-              selection.push(row)
+            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
+              selectCheckboxRows.push(row)
             }
           } else {
-            XEUtils.remove(selection, item => this.eqRow(item, row))
+            XEUtils.remove(selectCheckboxRows, item => this.eqRow(item, row))
           }
           this.handleCheckboxReserveRow(row, value)
         }
@@ -3039,10 +3069,10 @@ const Methods = {
     this.checkSelectionStatus()
   },
   handleToggleCheckRowEvent (evnt, params) {
-    const { selection, checkboxOpts } = this
+    const { selectCheckboxRows, checkboxOpts } = this
     const { checkField } = checkboxOpts
     const { row } = params
-    const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selection, row) === -1
+    const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value)
     } else {
@@ -3065,17 +3095,17 @@ const Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow (row) {
-    const { selection, checkboxOpts } = this
+    const { selectCheckboxRows, checkboxOpts } = this
     const { checkField } = checkboxOpts
-    const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selection, row) === -1
+    const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1
     this.handleSelectRow({ row }, value, true)
     return this.$nextTick()
   },
   handleCheckedAllCheckboxRow (value, isForce) {
-    const { afterFullData, treeConfig, treeOpts, selection, checkboxReserveRowMap, checkboxOpts } = this
+    const { afterFullData, treeConfig, treeOpts, selectCheckboxRows, checkboxReserveRowMap, checkboxOpts } = this
     const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
     let selectRows = []
-    const beforeSelection = treeConfig ? [] : selection.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
+    const beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
     if (checkStrictly) {
       this.isAllSelected = value
     } else {
@@ -3122,7 +3152,7 @@ const Methods = {
              */
             if (!isForce && checkMethod) {
               XEUtils.eachTree(afterFullData, (row) => {
-                if (checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1) {
+                if (checkMethod({ row }) ? 0 : this.findRowIndexOf(selectCheckboxRows, row) > -1) {
                   selectRows.push(row)
                 }
               }, treeOpts)
@@ -3136,7 +3166,7 @@ const Methods = {
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter((row) => this.findRowIndexOf(selection, row) > -1 || checkMethod({ row }))
+              selectRows = afterFullData.filter((row) => this.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({ row }))
             } else {
               selectRows = afterFullData.slice(0)
             }
@@ -3147,7 +3177,7 @@ const Methods = {
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
             if (!isForce && checkMethod) {
-              selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1)
+              selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 : this.findRowIndexOf(selectCheckboxRows, row) > -1)
             }
           }
         }
@@ -3161,7 +3191,7 @@ const Methods = {
           afterFullData.forEach(row => this.handleCheckboxReserveRow(row, false))
         }
       }
-      this.selection = checkField ? [] : beforeSelection.concat(selectRows)
+      this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows)
     }
     this.treeIndeterminates = []
     this.checkSelectionStatus()
@@ -3175,7 +3205,7 @@ const Methods = {
     return this.handleCheckedAllCheckboxRow(value, true)
   },
   checkSelectionStatus () {
-    const { afterFullData, selection, treeIndeterminates, checkboxOpts, treeConfig } = this
+    const { afterFullData, selectCheckboxRows, treeIndeterminates, checkboxOpts, treeConfig } = this
     const { checkField, halfField, checkStrictly, checkMethod } = checkboxOpts
     if (!checkStrictly) {
       const disableRows = []
@@ -3221,19 +3251,19 @@ const Methods = {
                   disableRows.push(row)
                   return true
                 }
-                if (this.findRowIndexOf(selection, row) > -1) {
+                if (this.findRowIndexOf(selectCheckboxRows, row) > -1) {
                   checkRows.push(row)
                   return true
                 }
                 return false
               }
-            : row => this.findRowIndexOf(selection, row) > -1
+            : row => this.findRowIndexOf(selectCheckboxRows, row) > -1
         )
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(treeIndeterminates, row) > -1 || this.findRowIndexOf(selection, row) > -1)
+          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(treeIndeterminates, row) > -1 || this.findRowIndexOf(selectCheckboxRows, row) > -1)
         } else {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(selection, row) > -1)
+          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(selectCheckboxRows, row) > -1)
         }
       }
       this.isAllSelected = isAllSelected
@@ -3242,7 +3272,7 @@ const Methods = {
   },
   // 还原展开、选中等相关状态
   handleReserveStatus () {
-    const { expandColumn, treeOpts, treeConfig, fullDataRowIdData, fullAllDataRowMap, currentRow, selectRow, radioReserveRow, radioOpts, checkboxOpts, selection, rowExpandeds, treeExpandeds, expandOpts } = this
+    const { expandColumn, treeOpts, treeConfig, fullDataRowIdData, fullAllDataRowMap, currentRow, selectRow, radioReserveRow, radioOpts, checkboxOpts, selectCheckboxRows, rowExpandeds, treeExpandeds, expandOpts } = this
     // 单选框
     if (selectRow && !fullAllDataRowMap.has(selectRow)) {
       this.selectRow = null // 刷新单选行状态
@@ -3255,7 +3285,7 @@ const Methods = {
       }
     }
     // 复选框
-    this.selection = getRecoverRow(this, selection) // 刷新多选行状态
+    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows) // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true)
@@ -3393,7 +3423,7 @@ const Methods = {
     }
     this.isAllSelected = false
     this.isIndeterminate = false
-    this.selection = []
+    this.selectCheckboxRows = []
     this.treeIndeterminates = []
     return this.$nextTick()
   },
@@ -3743,7 +3773,10 @@ const Methods = {
       } else {
         this.sort({ field, order })
       }
-      const params = { column, field, property: field, order: column.order, sortList: this.getSortColumns() }
+      const params = { $table: this, $event: evnt, column, field, property: field, order: column.order, sortList: this.getSortColumns(), sortTime: column.sortTime }
+      if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
+        return this.handleSortEvent(evnt, params)
+      }
       this.emitEvent('sort-change', params, evnt)
     }
   },
@@ -3788,7 +3821,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()
   },
@@ -3955,7 +3991,16 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setAllRowExpand (expanded) {
-    return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded)
+    const { treeConfig, treeOpts, tableFullData, tableFullTreeData } = this
+    let expandedRows = []
+    if (treeConfig) {
+      XEUtils.eachTree(tableFullTreeData, (row) => {
+        expandedRows.push(row)
+      }, treeOpts)
+    } else {
+      expandedRows = tableFullData
+    }
+    return this.setRowExpand(expandedRows, expanded)
   },
   handleAsyncRowExpand (row) {
     const rest = this.fullAllDataRowMap.get(row)
@@ -4104,8 +4149,9 @@ const Methods = {
    */
   reloadTreeExpand (row) {
     const { treeOpts, treeLazyLoadeds } = this
-    const { transform, lazy, hasChild } = treeOpts
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+    const { transform, lazy } = treeOpts
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
+    if (lazy && row[hasChildField] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(() => {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
@@ -4214,10 +4260,11 @@ const Methods = {
    */
   setAllTreeExpand (expanded) {
     const { tableFullData, treeOpts } = this
-    const { lazy, children } = treeOpts
+    const { lazy } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const expandeds = []
     XEUtils.eachTree(tableFullData, row => {
-      const rowChildren = row[children]
+      const rowChildren = row[childrenField]
       if (lazy || (rowChildren && rowChildren.length)) {
         expandeds.push(row)
       }
@@ -4232,7 +4279,9 @@ const Methods = {
    */
   handleBaseTreeExpand (rows, expanded) {
     const { fullAllDataRowMap, tableFullData, treeExpandeds, treeOpts, treeLazyLoadeds, treeNodeColumn } = this
-    const { reserve, lazy, hasChild, children, accordion, toggleMethod } = treeOpts
+    const { reserve, lazy, accordion, toggleMethod } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const result = []
     const columnIndex = this.getColumnIndex(treeNodeColumn)
     const $columnIndex = this.getVMColumnIndex(treeNodeColumn)
@@ -4249,12 +4298,12 @@ const Methods = {
       validRows.forEach(row => {
         if (treeExpandeds.indexOf(row) === -1) {
           const rest = fullAllDataRowMap.get(row)
-          const isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1
+          const isLoad = lazy && row[(hasChildField)] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1
           // 是否使用懒加载
           if (isLoad) {
             result.push(this.handleAsyncTreeExpandChilds(row))
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField] && row[childrenField].length) {
               treeExpandeds.push(row)
             }
           }
@@ -4654,12 +4703,12 @@ const Methods = {
    * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
    * 如果单元格配置了校验规则，则会进行校验
    */
-  updateStatus (scope, cellValue) {
+  updateStatus (slotParams, cellValue) {
     const customVal = !XEUtils.isUndefined(cellValue)
     return this.$nextTick().then(() => {
       const { $refs, editRules, validStore } = this
-      if (scope && $refs.tableBody && editRules) {
-        const { row, column } = scope
+      if (slotParams && $refs.tableBody && editRules) {
+        const { row, column } = slotParams
         const type = 'change'
         if (this.hasCellRules(type, row, column)) {
           const cell = this.getCell(row, column)
@@ -4826,11 +4875,11 @@ const Methods = {
       }
       const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
       if (XEUtils.isString(formatter)) {
-        const globalFunc = formats.get(formatter)
-        cellLabel = globalFunc ? globalFunc(formatParams) : ''
+        const gFormatOpts = formats.get(formatter)
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : ''
       } else if (XEUtils.isArray(formatter)) {
-        const globalFunc = formats.get(formatter[0])
-        cellLabel = globalFunc ? globalFunc(formatParams, ...formatter.slice(1)) : ''
+        const gFormatOpts = formats.get(formatter[0])
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : ''
       } else {
         cellLabel = formatter(formatParams)
       }