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

package/packages/button/src/button.js

@@ -21,7 +21,8 @@ export default {
     disabled: Boolean,
     loading: Boolean,
     destroyOnClose: Boolean,
-    className: String,
+    className: [String, Function],
+    popupClassName: [String, Function],
     transfer: { type: Boolean, default: () => GlobalConfig.button.transfer }
   },
   data () {
@@ -58,10 +59,10 @@ export default {
     GlobalEvent.off(this, 'mousewheel')
   },
   render (h) {
-    const { $scopedSlots, $listeners, className, inited, type, destroyOnClose, isFormBtn, status, btnType, vSize, name, disabled, loading, showPanel, animatVisible, panelPlacement } = this
+    const { $scopedSlots, $listeners, className, popupClassName, inited, type, destroyOnClose, isFormBtn, status, btnType, vSize, name, disabled, loading, showPanel, animatVisible, panelPlacement } = this
     const downsSlot = $scopedSlots.dropdowns
     return downsSlot ? h('div', {
-      class: ['vxe-button--dropdown', className, {
+      class: ['vxe-button--dropdown', className ? (XEUtils.isFunction(className) ? className({ $button: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
         'is--active': showPanel
       }]
@@ -92,7 +93,7 @@ export default {
       ])),
       h('div', {
         ref: 'panel',
-        class: ['vxe-button--dropdown-panel', {
+        class: ['vxe-button--dropdown-panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $button: this }) : popupClassName) : '', {
           [`size--${vSize}`]: vSize,
           'animat--leave': animatVisible,
           'animat--enter': showPanel

package/packages/pulldown/src/pulldown.js

@@ -3,6 +3,7 @@ import vSize from '../../mixins/size'
 import UtilTools from '../../tools/utils'
 import DomTools from '../../tools/dom'
 import { GlobalEvent } from '../../tools/event'
+import XEUtils from 'xe-utils'
 
 export default {
   name: 'VxePulldown',
@@ -12,6 +13,8 @@ export default {
     disabled: Boolean,
     placement: String,
     size: { type: String, default: () => GlobalConfig.size },
+    className: [String, Function],
+    popupClassName: [String, Function],
     destroyOnClose: Boolean,
     transfer: Boolean
   },
@@ -53,11 +56,11 @@ export default {
     GlobalEvent.off(this, 'blur')
   },
   render (h) {
-    const { $scopedSlots, inited, vSize, destroyOnClose, transfer, isActivated, disabled, animatVisible, visiblePanel, panelStyle, panelPlacement } = this
+    const { $scopedSlots, inited, className, popupClassName, vSize, destroyOnClose, transfer, isActivated, disabled, animatVisible, visiblePanel, panelStyle, panelPlacement } = this
     const defaultSlot = $scopedSlots.default
     const downSlot = $scopedSlots.dropdown
     return h('div', {
-      class: ['vxe-pulldown', {
+      class: ['vxe-pulldown', className ? (XEUtils.isFunction(className) ? className({ $pulldown: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
         'is--visivle': visiblePanel,
         'is--disabled': disabled,
@@ -70,7 +73,7 @@ export default {
       }, defaultSlot ? defaultSlot.call(this, { $pulldown: this }, h) : []),
       h('div', {
         ref: 'panel',
-        class: ['vxe-table--ignore-clear vxe-pulldown--panel', {
+        class: ['vxe-table--ignore-clear vxe-pulldown--panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $pulldown: this }) : popupClassName) : '', {
           [`size--${vSize}`]: vSize,
           'is--transfer': transfer,
           'animat--leave': animatVisible,

package/packages/select/src/select.js

@@ -254,6 +254,7 @@ export default {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    popupClassName: [String, Function],
     max: [String, Number],
     size: { type: String, default: () => GlobalConfig.select.size || GlobalConfig.size },
     filterable: Boolean,
@@ -408,7 +409,7 @@ export default {
     GlobalEvent.off(this, 'blur')
   },
   render (h) {
-    const { _e, $scopedSlots, vSize, className, inited, isActivated, loading, disabled, visiblePanel, filterable } = this
+    const { _e, $scopedSlots, vSize, className, popupClassName, inited, isActivated, loading, disabled, visiblePanel, filterable } = this
     const prefixSlot = $scopedSlots.prefix
     return h('div', {
       class: ['vxe-select', className ? (XEUtils.isFunction(className) ? className({ $select: this }) : className) : '', {
@@ -449,7 +450,7 @@ export default {
       }),
       h('div', {
         ref: 'panel',
-        class: ['vxe-table--ignore-clear vxe-select--panel', {
+        class: ['vxe-table--ignore-clear vxe-select--panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $select: this }) : popupClassName) : '', {
           [`size--${vSize}`]: vSize,
           'is--transfer': this.transfer,
           'animat--leave': !loading && this.animatVisible,

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) {
@@ -590,8 +590,8 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap (source) {
-    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData, tableSourceData } = this
-    let { fullDataRowIdData, fullAllDataRowIdData, sourceDataRowIdData } = this
+    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData } = this
+    let { fullDataRowIdData, fullAllDataRowIdData } = this
     const rowkey = getRowkey(this)
     const isLazy = treeConfig && treeOpts.lazy
     const handleCache = (row, index, items, path, parent, nodes) => {
@@ -618,14 +618,18 @@ const Methods = {
       fullDataRowMap.clear()
     }
     fullAllDataRowIdData = this.fullAllDataRowIdData = {}
-    sourceDataRowIdData = this.sourceDataRowIdData = {}
     fullAllDataRowMap.clear()
     if (treeConfig) {
       XEUtils.eachTree(tableFullTreeData, handleCache, treeOpts)
     } else {
       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)) {
@@ -639,10 +643,11 @@ const Methods = {
     }
     // 源数据缓存
     if (treeConfig && !treeOpts.transform) {
-      XEUtils.eachTree(tableSourceData, handleSourceRow, treeOpts)
+      XEUtils.eachTree(sourceData, handleSourceRow, treeOpts)
     } else {
-      tableSourceData.forEach(handleSourceRow)
+      sourceData.forEach(handleSourceRow)
     }
+    this.tableSourceData = sourceData
   },
   loadTreeChildren (row, childRecords) {
     const { keepSource, tableSourceData, treeOpts, fullDataRowIdData, fullDataRowMap, fullAllDataRowMap, fullAllDataRowIdData } = this
@@ -1080,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
           }
@@ -3807,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/packages/tooltip/src/tooltip.js

@@ -75,6 +75,7 @@ export default {
     content: { type: [String, Number], default: null },
     useHTML: Boolean,
     zIndex: [String, Number],
+    popupClassName: [String, Function],
     isArrow: { type: Boolean, default: true },
     enterable: Boolean,
     enterDelay: { type: Number, default: () => GlobalConfig.tooltip.enterDelay },
@@ -159,7 +160,7 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, vSize, theme, tipActive, isArrow, visible, tipStore, enterable } = this
+    const { $scopedSlots, vSize, popupClassName, theme, tipActive, isArrow, visible, tipStore, enterable } = this
     let on
     if (enterable) {
       on = {
@@ -168,7 +169,7 @@ export default {
       }
     }
     return h('div', {
-      class: ['vxe-table--tooltip-wrapper', `theme--${theme}`, {
+      class: ['vxe-table--tooltip-wrapper', `theme--${theme}`, popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $tooltip: this }) : popupClassName) : '', {
         [`size--${vSize}`]: vSize,
         [`placement--${tipStore.placement}`]: tipStore.placement,
         'is--enterable': enterable,