vxe-table 3.3.12 → 3.3.14-beta.1

package/packages/form/src/form-gather.js

@@ -1,4 +1,5 @@
 import VxeFormItem from './form-item'
+import { UtilTools } from '../../tools'
 
 export default {
   name: 'VxeFormGather',
@@ -8,6 +9,15 @@ export default {
       xeformgather: this
     }
   },
+  created () {
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      this.$nextTick(() => {
+        if (this.$xeform && this.$xeform.customLayout) {
+          UtilTools.error('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>'])
+        }
+      })
+    }
+  },
   render (h) {
     return h('div', this.$slots.default)
   }

package/packages/form/src/form-item.js

@@ -1,4 +1,9 @@
+import XEUtils from 'xe-utils'
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import VXETable from '../../v-x-e-table'
+import { UtilTools, isEnableConf } from '../../tools'
 import { createItem, destroyItem, assemItem } from './util'
+import { renderTitle } from './render'
 
 const props = {
   title: String,
@@ -27,6 +32,100 @@ Object.keys(props).forEach(name => {
   }
 })
 
+const renderItem = (h, _vm, item, slots) => {
+  const { rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
+  const { title, folding, visible, visibleMethod, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  const span = item.span || _vm.span
+  const align = item.align || _vm.align
+  const titleAlign = item.titleAlign || _vm.titleAlign
+  const titleWidth = item.titleWidth || _vm.titleWidth
+  let itemVisibleMethod = visibleMethod
+  const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
+  const showEllipsis = itemOverflow === 'ellipsis'
+  const showTitle = itemOverflow === 'title'
+  const showTooltip = itemOverflow === true || itemOverflow === 'tooltip'
+  const hasEllipsis = showTitle || showTooltip || showEllipsis
+  const params = { data, property: field, item, $form: _vm }
+  let isRequired
+  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
+    itemVisibleMethod = compConf.itemVisibleMethod
+  }
+  if (rules) {
+    const itemRules = rules[field]
+    if (itemRules) {
+      isRequired = itemRules.some(rule => rule.required)
+    }
+  }
+  let contentVNs = []
+  if (slots && slots.default) {
+    contentVNs = _vm.callSlot(slots.default, params, h)
+  } else if (compConf && compConf.renderItemContent) {
+    contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
+  } else if (compConf && compConf.renderItem) {
+    contentVNs = compConf.renderItem.call(_vm, h, itemRender, params)
+  } else if (field) {
+    contentVNs = [`${XEUtils.get(data, field)}`]
+  }
+  const ons = showTooltip ? {
+    mouseenter (evnt) {
+      _vm.triggerHeaderHelpEvent(evnt, params)
+    },
+    mouseleave: _vm.handleTargetLeaveEvent
+  } : {}
+  return h('div', {
+    class: ['vxe-form--item', item.id, span ? `vxe-col--${span} is--span` : null, className ? (XEUtils.isFunction(className) ? className(params) : className) : '', {
+      'is--title': title,
+      'is--required': isRequired,
+      'is--hidden': visible === false || (folding && collapseAll),
+      'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+      'is--error': showError
+    }]
+  }, [
+    h('div', {
+      class: 'vxe-form--item-inner'
+    }, [
+      title || (slots && slots.title) ? h('div', {
+        class: ['vxe-form--item-title', titleAlign ? `align--${titleAlign}` : null, {
+          'is--ellipsis': hasEllipsis
+        }],
+        style: titleWidth ? {
+          width: isNaN(titleWidth) ? titleWidth : `${titleWidth}px`
+        } : null,
+        attrs: {
+          title: showTitle ? UtilTools.getFuncText(title) : null
+        },
+        on: ons
+      }, renderTitle(h, _vm, item)) : null,
+      h('div', {
+        class: ['vxe-form--item-content', align ? `align--${align}` : null]
+      }, contentVNs.concat(
+        [
+          collapseNode ? h('div', {
+            class: 'vxe-form--item-trigger-node',
+            on: {
+              click: _vm.toggleCollapseEvent
+            }
+          }, [
+            h('span', {
+              class: 'vxe-form--item-trigger-text'
+            }, collapseAll ? GlobalConfig.i18n('vxe.form.unfolding') : GlobalConfig.i18n('vxe.form.folding')),
+            h('i', {
+              class: ['vxe-form--item-trigger-icon', collapseAll ? GlobalConfig.icon.FORM_FOLDING : GlobalConfig.icon.FORM_UNFOLDING]
+            })
+          ]) : null,
+          errRule && validOpts.showMessage ? h('div', {
+            class: 'vxe-form--item-valid',
+            style: errRule.maxWidth ? {
+              width: `${errRule.maxWidth}px`
+            } : null
+          }, errRule.message) : null
+        ])
+      )
+    ])
+  ])
+}
+
 export default {
   name: 'VxeFormItem',
   props,
@@ -49,6 +148,7 @@ export default {
     destroyItem(this)
   },
   render (h) {
-    return h('div')
+    const { $xeform } = this
+    return $xeform && $xeform.customLayout ? renderItem(h, $xeform, this.itemConfig, this.$scopedSlots) : h('div')
   }
 }

package/packages/form/src/form.js

@@ -2,8 +2,9 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, isEnableConf } from '../../tools'
+import { UtilTools, DomTools, isEnableConf } from '../../tools'
 import { createItem } from './util'
+import { renderTitle } from './render'
 import { eqEmptyValue } from '../../tools/src/utils'
 import { browse } from '../../tools/src/dom'
 
@@ -57,95 +58,6 @@ function getResetValue (value, resetValue) {
   return resetValue
 }
 
-function callSlot (_vm, slotFunc, params, h) {
-  if (slotFunc) {
-    const { $scopedSlots } = _vm
-    if (XEUtils.isString(slotFunc)) {
-      slotFunc = $scopedSlots[slotFunc] || null
-    }
-    if (XEUtils.isFunction(slotFunc)) {
-      return slotFunc.call(_vm, params, h)
-    }
-  }
-  return []
-}
-
-function renderPrefixIcon (h, titlePrefix) {
-  return h('span', {
-    class: 'vxe-form--item-title-prefix'
-  }, [
-    h('i', {
-      class: titlePrefix.icon || GlobalConfig.icon.FORM_PREFIX
-    })
-  ])
-}
-
-function renderSuffixIcon (h, titleSuffix) {
-  return h('span', {
-    class: 'vxe-form--item-title-suffix'
-  }, [
-    h('i', {
-      class: titleSuffix.icon || GlobalConfig.icon.FORM_SUFFIX
-    })
-  ])
-}
-
-function renderTitle (h, _vm, item) {
-  const { data } = _vm
-  const { slots, field, itemRender, titlePrefix, titleSuffix } = item
-  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-  const params = { data, property: field, item, $form: _vm }
-  const contVNs = []
-  const titVNs = []
-  if (titlePrefix) {
-    titVNs.push(
-      titlePrefix.message
-        ? h('vxe-tooltip', {
-          props: {
-            content: UtilTools.getFuncText(titlePrefix.message),
-            enterable: titlePrefix.enterable,
-            theme: titlePrefix.theme
-          }
-        }, [
-          renderPrefixIcon(h, titlePrefix)
-        ])
-        : renderPrefixIcon(h, titlePrefix)
-    )
-  }
-  titVNs.push(
-    h('span', {
-      class: 'vxe-form--item-title-label'
-    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? callSlot(_vm, slots.title, params, h) : UtilTools.getFuncText(item.title)))
-  )
-  contVNs.push(
-    h('div', {
-      class: 'vxe-form--item-title-content'
-    }, titVNs)
-  )
-  const fixVNs = []
-  if (titleSuffix) {
-    fixVNs.push(
-      titleSuffix.message
-        ? h('vxe-tooltip', {
-          props: {
-            content: UtilTools.getFuncText(titleSuffix.message),
-            enterable: titleSuffix.enterable,
-            theme: titleSuffix.theme
-          }
-        }, [
-          renderSuffixIcon(h, titleSuffix)
-        ])
-        : renderSuffixIcon(h, titleSuffix)
-    )
-  }
-  contVNs.push(
-    h('div', {
-      class: 'vxe-form--item-title-postfix'
-    }, fixVNs)
-  )
-  return contVNs
-}
-
 function renderItems (h, _vm, itemList) {
   const { _e, rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
   return itemList.map((item, index) => {
@@ -185,7 +97,7 @@ function renderItems (h, _vm, itemList) {
     }
     let contentVNs = []
     if (slots && slots.default) {
-      contentVNs = callSlot(_vm, slots.default, params, h)
+      contentVNs = _vm.callSlot(slots.default, params, h)
     } else if (compConf && compConf.renderItemContent) {
       contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
     } else if (compConf && compConf.renderItem) {
@@ -258,6 +170,7 @@ export default {
   name: 'VxeForm',
   mixins: [vSize],
   props: {
+    collapseStatus: { type: Boolean, default: true },
     loading: Boolean,
     data: Object,
     size: { type: String, default: () => GlobalConfig.form.size || GlobalConfig.size },
@@ -272,11 +185,12 @@ export default {
     items: Array,
     rules: Object,
     preventSubmit: { type: Boolean, default: () => GlobalConfig.form.preventSubmit },
-    validConfig: Object
+    validConfig: Object,
+    customLayout: { type: Boolean, default: () => GlobalConfig.form.customLayout }
   },
   data () {
     return {
-      collapseAll: true,
+      collapseAll: this.collapseStatus,
       staticItems: [],
       formItems: [],
 
@@ -305,24 +219,32 @@ export default {
       return opts
     }
   },
-  created () {
-    this.$nextTick(() => {
-      const { items } = this
-      if (items) {
-        this.loadItem(items)
-      }
-    })
-  },
   watch: {
     staticItems (value) {
       this.formItems = value
     },
     items (value) {
       this.loadItem(value)
+    },
+    collapseStatus (value) {
+      this.collapseAll = !!value
     }
   },
+  created () {
+    this.$nextTick(() => {
+      const { items } = this
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (this.customLayout && this.items) {
+          UtilTools.error('vxe.error.errConflicts', ['custom-layout', 'items'])
+        }
+      }
+      if (items) {
+        this.loadItem(items)
+      }
+    })
+  },
   render (h) {
-    const { _e, loading, className, data, vSize, tooltipOpts, formItems } = this
+    const { _e, loading, className, data, vSize, tooltipOpts, formItems, customLayout } = this
     const hasUseTooltip = VXETable._tooltip
     return h('form', {
       class: ['vxe-form', className ? (XEUtils.isFunction(className) ? className({ items: formItems, data, $form: this }) : className) : '', {
@@ -338,11 +260,11 @@ export default {
     }, [
       h('div', {
         class: 'vxe-form--wrapper vxe-row'
-      }, renderItems(h, this, formItems)),
+      }, customLayout ? this.$slots.default : renderItems(h, this, formItems)),
       h('div', {
         class: 'vxe-form-slots',
         ref: 'hideItem'
-      }, this.$slots.default),
+      }, customLayout ? [] : this.$slots.default),
       h('div', {
         class: ['vxe-loading', {
           'is--visible': loading
@@ -362,6 +284,18 @@ export default {
     ])
   },
   methods: {
+    callSlot (slotFunc, params, h) {
+      if (slotFunc) {
+        const { $scopedSlots } = this
+        if (XEUtils.isString(slotFunc)) {
+          slotFunc = $scopedSlots[slotFunc] || null
+        }
+        if (XEUtils.isFunction(slotFunc)) {
+          return slotFunc.call(this, params, h)
+        }
+      }
+      return []
+    },
     loadItem (list) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         const { $scopedSlots } = this
@@ -388,12 +322,16 @@ export default {
       return itemList
     },
     toggleCollapse () {
-      this.collapseAll = !this.collapseAll
+      const status = !this.collapseAll
+      this.collapseAll = status
+      this.$emit('update:collapseStatus', status)
       return this.$nextTick()
     },
     toggleCollapseEvent (evnt) {
       this.toggleCollapse()
-      this.$emit('toggle-collapse', { collapse: !this.collapseAll, data: this.data, $form: this, $event: evnt }, evnt)
+      const status = this.collapseAll
+      this.$emit('toggle-collapse', { status, collapse: status, data: this.data, $form: this, $event: evnt }, evnt)
+      this.$emit('collapse', { status, collapse: status, data: this.data, $form: this, $event: evnt }, evnt)
     },
     submitEvent (evnt) {
       evnt.preventDefault()
@@ -631,12 +569,16 @@ export default {
     handleFocus (fields) {
       const { $el } = this
       const itemList = this.getItems()
-      fields.some(property => {
+      fields.some((property, index) => {
         const item = itemList.find(item => item.field === property)
         if (item && isEnableConf(item.itemRender)) {
           const { itemRender } = item
           const compConf = VXETable.renderer.get(itemRender.name)
           let inputElem
+          // 定位到第一个
+          if (!index) {
+            DomTools.scrollToView($el.querySelector(`.${item.id}`))
+          }
           // 如果指定了聚焦 class
           if (itemRender.autofocus) {
             inputElem = $el.querySelector(`.${item.id} ${itemRender.autofocus}`)

package/packages/form/src/render.js

@@ -0,0 +1,79 @@
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import VXETable from '../../v-x-e-table'
+import { UtilTools, isEnableConf } from '../../tools'
+
+function renderPrefixIcon (h, titlePrefix) {
+  return h('span', {
+    class: 'vxe-form--item-title-prefix'
+  }, [
+    h('i', {
+      class: titlePrefix.icon || GlobalConfig.icon.FORM_PREFIX
+    })
+  ])
+}
+
+function renderSuffixIcon (h, titleSuffix) {
+  return h('span', {
+    class: 'vxe-form--item-title-suffix'
+  }, [
+    h('i', {
+      class: titleSuffix.icon || GlobalConfig.icon.FORM_SUFFIX
+    })
+  ])
+}
+
+export function renderTitle (h, _vm, item) {
+  const { data } = _vm
+  const { slots, field, itemRender, titlePrefix, titleSuffix } = item
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  const params = { data, property: field, item, $form: _vm }
+  const contVNs = []
+  const titVNs = []
+  if (titlePrefix) {
+    titVNs.push(
+      titlePrefix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titlePrefix.message),
+            enterable: titlePrefix.enterable,
+            theme: titlePrefix.theme
+          }
+        }, [
+          renderPrefixIcon(h, titlePrefix)
+        ])
+        : renderPrefixIcon(h, titlePrefix)
+    )
+  }
+  titVNs.push(
+    h('span', {
+      class: 'vxe-form--item-title-label'
+    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : UtilTools.getFuncText(item.title)))
+  )
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-content'
+    }, titVNs)
+  )
+  const fixVNs = []
+  if (titleSuffix) {
+    fixVNs.push(
+      titleSuffix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titleSuffix.message),
+            enterable: titleSuffix.enterable,
+            theme: titleSuffix.theme
+          }
+        }, [
+          renderSuffixIcon(h, titleSuffix)
+        ])
+        : renderSuffixIcon(h, titleSuffix)
+    )
+  }
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-postfix'
+    }, fixVNs)
+  )
+  return contVNs
+}

package/packages/grid/src/grid.js

@@ -40,8 +40,8 @@ function renderDefaultForm (h, _vm) {
         on: {
           submit: _vm.submitEvent,
           reset: _vm.resetEvent,
-          'submit-invalid': _vm.submitInvalidEvent,
-          'toggle-collapse': _vm.togglCollapseEvent
+          collapse: _vm.collapseEvent,
+          'submit-invalid': _vm.submitInvalidEvent
         },
         scopedSlots: formSlots
       })
@@ -428,9 +428,19 @@ export default {
       if (proxyConfig) {
         if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
           const formData = {}
-          formOpts.items.forEach(({ field, itemRender }) => {
+          formOpts.items.forEach(item => {
+            const { field, itemRender } = item
             if (field) {
-              formData[field] = itemRender && !XEUtils.isUndefined(itemRender.defaultValue) ? itemRender.defaultValue : undefined
+              let itemValue = null
+              if (itemRender) {
+                const { defaultValue } = itemRender
+                if (XEUtils.isFunction(defaultValue)) {
+                  itemValue = defaultValue({ item })
+                } else if (!XEUtils.isUndefined(defaultValue)) {
+                  itemValue = defaultValue
+                }
+              }
+              formData[field] = itemValue
             }
           })
           this.formData = formData
@@ -809,9 +819,10 @@ export default {
     submitInvalidEvent (params) {
       this.$emit('form-submit-invalid', Object.assign({ $grid: this }, params))
     },
-    togglCollapseEvent (params) {
+    collapseEvent (params) {
       this.$nextTick(() => this.recalculate(true))
       this.$emit('form-toggle-collapse', Object.assign({ $grid: this }, params))
+      this.$emit('form-collapse', Object.assign({ $grid: this }, params))
     },
     triggerZoomEvent (evnt) {
       this.zoom()

package/packages/modal/src/modal.js

@@ -44,6 +44,7 @@ export default {
     zIndex: Number,
     marginSize: { type: [Number, String], default: () => GlobalConfig.modal.marginSize },
     fullscreen: Boolean,
+    draggable: { type: Boolean, default: () => GlobalConfig.modal.draggable },
     remember: { type: Boolean, default: () => GlobalConfig.modal.remember },
     destroyOnClose: { type: Boolean, default: () => GlobalConfig.modal.destroyOnClose },
     showTitleOverflow: { type: Boolean, default: () => GlobalConfig.modal.showTitleOverflow },
@@ -115,14 +116,15 @@ export default {
     }
   },
   render (h) {
-    const { _e, $scopedSlots, slots = {}, inited, vSize, className, type, resize, showClose, showZoom, animat, loading, status, iconStatus, showFooter, zoomLocat, modalTop, dblclickZoom, contentVisible, visible, title, lockScroll, lockView, mask, isMsg, showTitleOverflow, destroyOnClose } = this
+    const { _e, $scopedSlots, slots = {}, inited, vSize, className, type, resize, showClose, showZoom, animat, draggable, loading, status, iconStatus, showFooter, zoomLocat, modalTop, dblclickZoom, contentVisible, visible, title, lockScroll, lockView, mask, isMsg, showTitleOverflow, destroyOnClose } = this
     const content = this.content || this.message
     const defaultSlot = $scopedSlots.default || slots.default
     const footerSlot = $scopedSlots.footer || slots.footer
     const headerSlot = $scopedSlots.header || slots.header
     const titleSlot = $scopedSlots.title || slots.title
-    const headerOns = {
-      mousedown: this.mousedownEvent
+    const headerOns = {}
+    if (draggable) {
+      headerOns.mousedown = this.mousedownEvent
     }
     if (showZoom && dblclickZoom && type === 'modal') {
       headerOns.dblclick = this.toggleZoomEvent
@@ -157,7 +159,10 @@ export default {
         ref: 'modalBox'
       }, [
         this.showHeader ? h('div', {
-          class: ['vxe-modal--header', !isMsg && showTitleOverflow ? 'is--ellipsis' : ''],
+          class: ['vxe-modal--header', {
+            'is--drag': draggable,
+            'is--ellipsis': !isMsg && showTitleOverflow
+          }],
           on: headerOns
         }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : headerSlot.call(this, { $modal: this }, h)) : [
           titleSlot ? titleSlot.call(this, { $modal: this }, h) : h('span', {

package/packages/table/src/body.js

@@ -574,13 +574,17 @@ export default {
      */
     scrollEvent (evnt) {
       const { $el: scrollBodyElem, $parent: $xetable, fixedType } = this
-      const { $refs, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
+      const { $refs, elemStore, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
       const { tableHeader, tableBody, leftBody, rightBody, tableFooter, validTip } = $refs
       const headerElem = tableHeader ? tableHeader.$el : null
       const footerElem = tableFooter ? tableFooter.$el : null
       const bodyElem = tableBody.$el
       const leftElem = leftBody ? leftBody.$el : null
       const rightElem = rightBody ? rightBody.$el : null
+      const bodyYElem = elemStore['main-body-ySpace']
+      const bodyXElem = elemStore['main-body-xSpace']
+      const bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0
+      const bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0
       let scrollTop = scrollBodyElem.scrollTop
       const scrollLeft = bodyElem.scrollLeft
       const isRollX = scrollLeft !== lastScrollLeft
@@ -622,16 +626,20 @@ export default {
       if (isRollX && validTip && validTip.visible) {
         validTip.updatePlacement()
       }
-      $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop, scrollLeft, isX: isRollX, isY: isRollY }, evnt)
+      $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop, scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
     },
     handleWheel (evnt, isTopWheel, deltaTop, isRollX, isRollY) {
       const { $parent: $xetable } = this
-      const { $refs } = $xetable
+      const { $refs, elemStore } = $xetable
       const { tableBody, leftBody, rightBody } = $refs
       const bodyElem = tableBody.$el
       const leftElem = leftBody ? leftBody.$el : null
       const rightElem = rightBody ? rightBody.$el : null
       const remainSize = this.isPrevWheelTop === isTopWheel ? Math.max(0, this.wheelYSize - this.wheelYTotal) : 0
+      const bodyYElem = elemStore['main-body-ySpace']
+      const bodyXElem = elemStore['main-body-xSpace']
+      const bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0
+      const bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0
       this.isPrevWheelTop = isTopWheel
       this.wheelYSize = Math.abs(isTopWheel ? deltaTop - remainSize : deltaTop + remainSize)
       this.wheelYInterval = 0
@@ -659,7 +667,7 @@ export default {
           }
           this.wheelYTotal = wheelYTotal
           this.wheelYInterval = wheelYInterval
-          $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: bodyElem.scrollLeft, isX: isRollX, isY: isRollY }, evnt)
+          $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: bodyElem.scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
         }
       }
       handleSmooth()

package/packages/table/src/methods.js

@@ -456,8 +456,7 @@ const Methods = {
    */
   loadColumn (columns) {
     const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn(this, column), { children: 'children' })
-    this.handleColumn(collectColumn)
-    return this.$nextTick()
+    return this.handleColumn(collectColumn)
   },
   /**
    * 加载列配置并恢复到初始状态
@@ -488,10 +487,11 @@ const Methods = {
         UtilTools.warn('vxe.error.scrollErrProp', ['column.type=expand'])
       }
     }
-    this.$nextTick(() => {
+    return this.$nextTick().then(() => {
       if (this.$toolbar) {
         this.$toolbar.syncUpdate({ collectColumn, $table: this })
       }
+      return this.recalculate()
     })
   },
   /**
@@ -775,13 +775,23 @@ const Methods = {
   defineField (record) {
     const { radioOpts, checkboxOpts, treeConfig, treeOpts, expandOpts } = this
     const rowkey = getRowkey(this)
-    this.visibleColumn.forEach(({ property, editRender }) => {
+    this.tableFullColumn.forEach(column => {
+      const { property, editRender } = column
       if (property && !XEUtils.has(record, property)) {
-        XEUtils.set(record, property, editRender && !XEUtils.isUndefined(editRender.defaultValue) ? editRender.defaultValue : null)
+        let cellValue = null
+        if (editRender) {
+          const { defaultValue } = editRender
+          if (XEUtils.isFunction(defaultValue)) {
+            cellValue = defaultValue({ column })
+          } else if (!XEUtils.isUndefined(defaultValue)) {
+            cellValue = defaultValue
+          }
+        }
+        XEUtils.set(record, property, cellValue)
       }
     })
-    const ohterFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField]
-    ohterFields.forEach((key) => {
+    const otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField]
+    otherFields.forEach((key) => {
       if (key && eqEmptyValue(XEUtils.get(record, key))) {
         XEUtils.set(record, key, null)
       }
@@ -3351,9 +3361,9 @@ const Methods = {
       clearAllSort(this)
     }
     if (!sortOpts.remote) {
-      return this.handleTableData(true)
+      this.handleTableData(true)
     }
-    return this.$nextTick()
+    return this.$nextTick().then(this.updateStyle)
   },
   // 在 v3 中废弃
   getSortColumn () {