vxe-table 3.4.12-beta.2 → 3.4.14-beta.1

package/packages/grid/src/grid.js

@@ -253,7 +253,7 @@ export default {
   created () {
     const { data, formOpts, proxyOpts, proxyConfig } = this
     if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-      console.error('[vxe-grid] There is a conflict between the props proxy-config and data.')
+      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -401,7 +401,7 @@ export default {
     handleActiveMethod (params) {
       const { editConfig } = this
       const activeMethod = editConfig ? editConfig.activeMethod : null
-      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod(params))
+      return this.pendingRecords.indexOf(params.row) === -1 && (!activeMethod || activeMethod({ ...params, $grid: this }))
     },
     initToolbar () {
       this.$nextTick(() => {
@@ -531,6 +531,7 @@ export default {
                 }
                 sortList = defaultSort.map((item) => {
                   return {
+                    field: item.field,
                     property: item.field,
                     order: item.order
                   }

package/packages/header/src/header.js

@@ -39,6 +39,17 @@ export default {
     elemStore[`${prefix}xSpace`] = $refs.xSpace
     elemStore[`${prefix}repair`] = $refs.repair
   },
+  destroyed () {
+    const { $parent: $xetable, fixedType } = this
+    const { elemStore } = $xetable
+    const prefix = `${fixedType || 'main'}-header-`
+    elemStore[`${prefix}wrapper`] = null
+    elemStore[`${prefix}table`] = null
+    elemStore[`${prefix}colgroup`] = null
+    elemStore[`${prefix}list`] = null
+    elemStore[`${prefix}xSpace`] = null
+    elemStore[`${prefix}repair`] = null
+  },
   render (h) {
     const { _e, $parent: $xetable, fixedType, headerColumn, fixedColumn } = this
     const { $listeners: tableListeners, tId, isGroup, resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable

package/packages/input/src/input.js

@@ -756,15 +756,10 @@ export default {
       return this.maxDate ? XEUtils.toStringDate(this.maxDate) : null
     },
     dateValue () {
-      const { value, isDatePickerType, type, dateValueFormat } = this
+      const { value, isDatePickerType, dateValueFormat } = this
       let val = null
       if (value && isDatePickerType) {
-        let date
-        if (type === 'time') {
-          date = toStringTimeDate(value)
-        } else {
-          date = XEUtils.toStringDate(value, dateValueFormat)
-        }
+        const date = this.parseDate(value, dateValueFormat)
         if (XEUtils.isValidDate(date)) {
           val = date
         }
@@ -1272,6 +1267,13 @@ export default {
       }
       this.$emit('clear', { $panel: $refs.panel, value, $event: evnt })
     },
+    parseDate (value, format) {
+      const { type } = this
+      if (type === 'time') {
+        return toStringTimeDate(value)
+      }
+      return XEUtils.toStringDate(value, format)
+    },
     /**
      * 检查初始值
      */
@@ -1321,12 +1323,7 @@ export default {
             if (type === 'week' || type === 'quarter') {
               // 周和季度选择器不支持解析，无需处理
             } else {
-              let inpDateVal
-              if (type === 'time') {
-                inpDateVal = toStringTimeDate(inputValue)
-              } else {
-                inpDateVal = XEUtils.toStringDate(inputValue, dateLabelFormat)
-              }
+              let inpDateVal = this.parseDate(inputValue, dateLabelFormat)
               if (XEUtils.isValidDate(inpDateVal)) {
                 if (type === 'time') {
                   inpDateVal = toStringTimeDate(inpDateVal)
@@ -1660,11 +1657,7 @@ export default {
       let dValue = null
       let dLabel = ''
       if (date) {
-        if (type === 'time') {
-          dValue = toStringTimeDate(date)
-        } else {
-          dValue = XEUtils.toStringDate(date, valueFormat)
-        }
+        dValue = this.parseDate(date, valueFormat)
       }
       if (XEUtils.isValidDate(dValue)) {
         dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek })

package/packages/modal/src/modal.js

@@ -459,7 +459,7 @@ export default {
     maximize () {
       return this.$nextTick().then(() => {
         if (!this.zoomLocat) {
-          const marginSize = this.marginSize
+          const marginSize = Math.max(0, this.marginSize)
           const modalBoxElem = this.getBox()
           const { visibleHeight, visibleWidth } = DomTools.getDomNode()
           this.zoomLocat = {

package/packages/pulldown/src/pulldown.js

@@ -6,6 +6,7 @@ export default {
   name: 'VxePulldown',
   mixins: [vSize],
   props: {
+    value: Boolean,
     disabled: Boolean,
     placement: String,
     size: { type: String, default: () => GlobalConfig.size },
@@ -24,6 +25,15 @@ export default {
       isActivated: false
     }
   },
+  watch: {
+    value (value) {
+      if (value) {
+        this.showPanel()
+      } else {
+        this.hidePanel()
+      }
+    }
+  },
   created () {
     GlobalEvent.on(this, 'mousewheel', this.handleGlobalMousewheelEvent)
     GlobalEvent.on(this, 'mousedown', this.handleGlobalMousedownEvent)
@@ -140,6 +150,7 @@ export default {
           this.animatVisible = true
           setTimeout(() => {
             this.visiblePanel = true
+            this.$emit('update:input', true)
             this.updatePlacement()
             setTimeout(() => {
               resolve(this.updatePlacement())
@@ -156,6 +167,7 @@ export default {
      */
     hidePanel () {
       this.visiblePanel = false
+      this.$emit('update:input', false)
       return new Promise(resolve => {
         if (this.animatVisible) {
           this.hidePanelTimeout = setTimeout(() => {

package/packages/table/src/body.js

@@ -455,6 +455,18 @@ export default {
     this.$el._onscroll = null
     this.$el.onscroll = null
   },
+  destroyed () {
+    const { $parent: $xetable, fixedType } = this
+    const { elemStore } = $xetable
+    const prefix = `${fixedType || 'main'}-body-`
+    elemStore[`${prefix}wrapper`] = null
+    elemStore[`${prefix}table`] = null
+    elemStore[`${prefix}colgroup`] = null
+    elemStore[`${prefix}list`] = null
+    elemStore[`${prefix}xSpace`] = null
+    elemStore[`${prefix}ySpace`] = null
+    elemStore[`${prefix}emptyBlock`] = null
+  },
   render (h) {
     const { _e, $parent: $xetable, fixedColumn, fixedType } = this
     let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts } = $xetable
@@ -595,8 +607,8 @@ export default {
       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
+      const bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight
+      const bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth
       let scrollTop = scrollBodyElem.scrollTop
       const scrollLeft = bodyElem.scrollLeft
       const isRollX = scrollLeft !== lastScrollLeft
@@ -638,11 +650,22 @@ export default {
       if (isRollX && validTip && validTip.visible) {
         validTip.updatePlacement()
       }
-      $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop, scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
+      $xetable.emitEvent('scroll', {
+        type: renderType,
+        fixed: fixedType,
+        scrollTop,
+        scrollLeft,
+        scrollHeight: bodyElem.scrollHeight,
+        scrollWidth: bodyElem.scrollWidth,
+        bodyHeight,
+        bodyWidth,
+        isX: isRollX,
+        isY: isRollY
+      }, evnt)
     },
     handleWheel (evnt, isTopWheel, deltaTop, isRollX, isRollY) {
       const { $parent: $xetable } = this
-      const { $refs, elemStore } = $xetable
+      const { $refs, elemStore, scrollYLoad, scrollXLoad } = $xetable
       const { tableBody, leftBody, rightBody } = $refs
       const bodyElem = tableBody.$el
       const leftElem = leftBody ? leftBody.$el : null
@@ -650,8 +673,8 @@ export default {
       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
+      const bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight
+      const bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth
       this.isPrevWheelTop = isTopWheel
       this.wheelYSize = Math.abs(isTopWheel ? deltaTop - remainSize : deltaTop + remainSize)
       this.wheelYInterval = 0
@@ -679,7 +702,18 @@ export default {
           }
           this.wheelYTotal = wheelYTotal
           this.wheelYInterval = wheelYInterval
-          $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: bodyElem.scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
+          $xetable.emitEvent('scroll', {
+            type: renderType,
+            fixed: fixedType,
+            scrollTop: bodyElem.scrollTop,
+            scrollLeft: bodyElem.scrollLeft,
+            scrollHeight: bodyElem.scrollHeight,
+            scrollWidth: bodyElem.scrollWidth,
+            bodyHeight,
+            bodyWidth,
+            isX: isRollX,
+            isY: isRollY
+          }, evnt)
         }
       }
       handleSmooth()

package/packages/table/src/cell.js

@@ -352,25 +352,23 @@ export const Cell = {
    */
   renderCheckboxHeader (h, params) {
     const { $table, column, isHidden } = params
-    const { isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
+    const { isAllSelected: isAllCheckboxSelected, isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
     const { slots } = column
     const headerSlot = slots ? slots.header : null
     const titleSlot = slots ? slots.title : null
     const checkboxOpts = $table.checkboxOpts
     const headerTitle = column.getTitle()
-    let isChecked = false
     let on
     if (!isHidden) {
-      isChecked = isAllCheckboxDisabled ? false : $table.isAllSelected
       on = {
         click (evnt) {
           if (!isAllCheckboxDisabled) {
-            $table.triggerCheckAllEvent(evnt, !isChecked)
+            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected)
           }
         }
       }
     }
-    const checkboxParams = { ...params, checked: isChecked, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
+    const checkboxParams = { ...params, checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
     if (headerSlot) {
       return renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h))
     }
@@ -384,7 +382,7 @@ export const Cell = {
     return renderTitleContent(h, checkboxParams, [
       h('span', {
         class: ['vxe-cell--checkbox', {
-          'is--checked': isChecked,
+          'is--checked': isAllCheckboxSelected,
           'is--disabled': isAllCheckboxDisabled,
           'is--indeterminate': isAllCheckboxIndeterminate
         }],

package/packages/table/src/methods.js

@@ -1083,20 +1083,21 @@ const Methods = {
    * 用于多选行，获取已选中的数据
    */
   getCheckboxRecords (isFull) {
-    const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts } = this
+    const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData } = this
+    const { transform, children, mapChildren } = treeOpts
     const { checkField: property } = checkboxOpts
-    const currTableData = isFull ? tableFullData : afterFullData
+    const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
     let rowList = []
     if (property) {
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, property), treeOpts)
+        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, property), { children: transform ? mapChildren : children })
       } else {
         rowList = currTableData.filter(row => XEUtils.get(row, property))
       }
     } else {
       const { selection } = this
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => selection.indexOf(row) > -1, treeOpts)
+        rowList = XEUtils.filterTree(currTableData, row => selection.indexOf(row) > -1, { children: transform ? mapChildren : children })
       } else {
         rowList = currTableData.filter(row => selection.indexOf(row) > -1)
       }
@@ -1138,7 +1139,7 @@ const Methods = {
     const filterColumns = []
     const orderColumns = []
     tableFullColumn.forEach(column => {
-      const { sortable, order, filters } = column
+      const { property, sortable, order, filters } = column
       if (!allRemoteFilter && filters && filters.length) {
         const valueList = []
         const itemList = []
@@ -1153,7 +1154,7 @@ const Methods = {
         }
       }
       if (!allRemoteSort && sortable && order) {
-        orderColumns.push({ column, property: column.property, order })
+        orderColumns.push({ column, field: column.property, property, order })
       }
     })
     if (filterColumns.length) {
@@ -2461,7 +2462,7 @@ const Methods = {
           // }
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
-            if (!editOpts.activeMethod || editOpts.activeMethod(selected.args)) {
+            if (!editOpts.activeMethod || editOpts.activeMethod({ ...selected.args, $table: this })) {
               if (editMethod) {
                 editMethod({
                   row: selected.row,
@@ -2963,14 +2964,28 @@ const Methods = {
     const { afterFullData, selection, treeIndeterminates, checkboxOpts, treeConfig } = this
     const { checkField, halfField, checkStrictly, checkMethod } = checkboxOpts
     if (!checkStrictly) {
+      const disableRows = []
+      const checkRows = []
+      let isAllResolve = false
       let isAllSelected = false
       let isIndeterminate = false
       if (checkField) {
-        isAllSelected = afterFullData.length && afterFullData.every(
+        isAllResolve = afterFullData.every(
           checkMethod
-            ? (row) => !checkMethod({ row }) || XEUtils.get(row, checkField)
+            ? (row) => {
+              if (!checkMethod({ row })) {
+                disableRows.push(row)
+                return true
+              }
+              if (XEUtils.get(row, checkField)) {
+                checkRows.push(row)
+                return true
+              }
+              return false
+            }
             : row => XEUtils.get(row, checkField)
         )
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
           if (halfField) {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || treeIndeterminates.indexOf(row) > -1)
@@ -2985,11 +3000,22 @@ const Methods = {
           }
         }
       } else {
-        isAllSelected = afterFullData.length && afterFullData.every(
+        isAllResolve = afterFullData.every(
           checkMethod
-            ? (row) => !checkMethod({ row }) || selection.indexOf(row) > -1
+            ? (row) => {
+              if (!checkMethod({ row })) {
+                disableRows.push(row)
+                return true
+              }
+              if (selection.indexOf(row) > -1) {
+                checkRows.push(row)
+                return true
+              }
+              return false
+            }
             : row => selection.indexOf(row) > -1
         )
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(row => treeIndeterminates.indexOf(row) > -1 || selection.indexOf(row) > -1)
         } else {
@@ -3585,9 +3611,9 @@ const Methods = {
   getSortColumns () {
     const sortList = []
     this.tableFullColumn.forEach((column) => {
-      const { order } = column
+      const { property, order } = column
       if ((column.sortable || column.remoteSort) && order) {
-        sortList.push({ column, property: column.property, order })
+        sortList.push({ column, field: column.property, property, order })
       }
     })
     return sortList
@@ -4584,7 +4610,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/tools/src/utils.js

@@ -57,6 +57,7 @@ class ColumnInfo {
       // 基本属性
       type: _vm.type,
       property: _vm.field,
+      field: _vm.field,
       title: _vm.title,
       width: _vm.width,
       minWidth: _vm.minWidth,

package/packages/validator/src/mixin.js

@@ -127,7 +127,16 @@ export default {
                 colVailds.push(
                   this.validCellRules('all', row, column)
                     .catch(({ rule, rules }) => {
-                      const rest = { rule, rules, rowIndex: this.getRowIndex(row), row, columnIndex: this.getColumnIndex(column), column, $table: this }
+                      const rest = {
+                        rule,
+                        rules,
+                        rowIndex: this.getRowIndex(row),
+                        row,
+                        columnIndex: this.getColumnIndex(column),
+                        column,
+                        field: column.property,
+                        $table: this
+                      }
                       if (!validRest[column.property]) {
                         validRest[column.property] = []
                       }
@@ -250,6 +259,7 @@ export default {
                   rowIndex: this.getRowIndex(row),
                   column,
                   columnIndex: this.getColumnIndex(column),
+                  field: column.property,
                   $table: this
                 })
                 if (customValid) {

package/styles/base/checked.scss

@@ -170,5 +170,10 @@
         border-color: $vxe-primary-disabled-color;
       }
     }
+    .vxe-checkbox--indeterminate-icon {
+      &:after {
+        background-color: $vxe-primary-disabled-color;
+      }
+    }
   }
 }

package/styles/button.scss

@@ -124,7 +124,7 @@ $btnThemeList: (
     line-height: 1;
     border: 1px solid $vxe-input-border-color;
     &.is--round {
-      border-radius: $vxe-button-height-default * 0.5;
+      border-radius: $vxe-button-round-border-radius-default;
     }
     &:not(.is--round) {
       border-radius: $vxe-border-radius;
@@ -223,7 +223,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-medium;
       }
       &.is--round {
-        border-radius: $vxe-button-height-medium * 0.5;
+        border-radius: $vxe-button-round-border-radius-medium;
       }
     }
     .vxe-button--loading-icon,
@@ -239,7 +239,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-small;
       }
       &.is--round {
-        border-radius: $vxe-button-height-small * 0.5;
+        border-radius: $vxe-button-round-border-radius-small;
       }
     }
     .vxe-button--loading-icon,
@@ -255,7 +255,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-mini;
       }
       &.is--round {
-        border-radius: $vxe-button-height-mini * 0.5;
+        border-radius: $vxe-button-round-border-radius-mini;
       }
     }
     .vxe-button--loading-icon,

package/styles/modal.scss

@@ -294,7 +294,8 @@
     }
   }
   .vxe-modal--resize {
-    $SpaceSize: 8;
+    $SpaceSize: 8px;
+    $SpaceWidth: 5px;
     .wl-resize,
     .wr-resize,
     .swst-resize,
@@ -308,32 +309,32 @@
     }
     .wl-resize,
     .wr-resize {
-      width: #{$SpaceSize}px;
+      width: $SpaceSize;
       height: 100%;
       top: 0;
       cursor: w-resize;
     }
     .wl-resize {
-      left: -#{$SpaceSize * 0.5 + 1}px;
+      left: -$SpaceWidth;
     }
     .wr-resize {
-      right: -#{$SpaceSize * 0.5 + 1}px;
+      right: -$SpaceWidth;
     }
     .swst-resize,
     .sest-resize,
     .swlb-resize,
     .selb-resize {
-      width: #{$SpaceSize + 2}px;
-      height: #{$SpaceSize + 2}px;
+      width: $SpaceSize + 2;
+      height: $SpaceSize + 2;
       z-index: 101;
     }
     .swst-resize,
     .sest-resize {
-      top: -#{$SpaceSize}px;
+      top: -$SpaceSize;
     }
     .swlb-resize,
     .selb-resize {
-      bottom: -#{$SpaceSize}px;
+      bottom: -$SpaceSize;
     }
     .sest-resize,
     .swlb-resize {
@@ -345,24 +346,24 @@
     }
     .swst-resize,
     .swlb-resize {
-      left: -#{$SpaceSize}px;
+      left: -$SpaceSize;
     }
     .sest-resize,
     .selb-resize {
-      right: -#{$SpaceSize}px;
+      right: -$SpaceSize;
     }
     .st-resize,
     .sb-resize {
       width: 100%;
-      height: #{$SpaceSize}px;
+      height: $SpaceSize;
       left: 0;
       cursor: s-resize;
     }
     .st-resize {
-      top: -#{$SpaceSize * 0.5 + 1}px;
+      top: -$SpaceWidth;
     }
     .sb-resize {
-      bottom: -#{$SpaceSize * 0.5 + 1}px;
+      bottom: -$SpaceWidth;
     }
   }
 }

package/styles/table.scss

@@ -474,7 +474,7 @@
     line-height: $vxe-table-row-line-height;
     text-align: left;
     &:not(.col--ellipsis) {
-      padding: #{floor(($vxe-table-row-height-default - $vxe-table-row-line-height) * 0.5)} 0;
+      padding: $vxe-table-column-padding-default;
     }
     &.col--current {
       background-color: $vxe-table-column-current-background-color;
@@ -612,7 +612,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-medium - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-medium;
       }
     }
     .vxe-cell {
@@ -638,7 +638,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-small - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-small;
       }
     }
     .vxe-cell {
@@ -664,7 +664,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-mini - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-mini;
       }
     }
     .vxe-cell {

package/styles/variable.scss

@@ -62,6 +62,10 @@ $vxe-table-row-hover-checkbox-checked-background-color: #ffebbc !default;
 $vxe-table-row-current-background-color: #e6f7ff !default;
 $vxe-table-row-hover-current-background-color: #d7effb !default;
 
+$vxe-table-column-padding-default: 13px 0 !default;
+$vxe-table-column-padding-medium: 11px 0 !default;
+$vxe-table-column-padding-small: 9px 0 !default;
+$vxe-table-column-padding-mini: 7px 0 !default;
 $vxe-table-column-hover-background-color: #d7effb !default;
 $vxe-table-column-current-background-color: #e6f7ff !default;
 $vxe-table-column-icon-border-color: #c0c4cc !default;
@@ -175,6 +179,10 @@ $vxe-button-height-default: 34px !default;
 $vxe-button-height-medium: 32px !default;
 $vxe-button-height-small: 30px !default;
 $vxe-button-height-mini: 28px !default;
+$vxe-button-round-border-radius-default: 17px !default;
+$vxe-button-round-border-radius-medium: 16px !default;
+$vxe-button-round-border-radius-small: 15px !default;
+$vxe-button-round-border-radius-mini: 14px !default;
 
 /*input*/
 $vxe-input-background-color: #fff !default;

package/types/all.d.ts

@@ -73,6 +73,7 @@ export * from './modal'
 export * from './tooltip'
 export * from './form'
 export * from './form-item'
+export * from './form-gather'
 export * from './switch'
 export * from './list'
 export * from './pulldown'

package/types/column.d.ts

@@ -306,6 +306,13 @@ export interface ColumnOptions {
  * 列对象
  */
 export class ColumnInfo {
+  /**
+   * 该属性已废弃，该属性被 field 替换
+   * @deprecated
+   */
+  property: string;
+
+  field: string;
   title: string;
   width: number | string;
   minWidth: number | string;
@@ -314,7 +321,6 @@ export class ColumnInfo {
   align: ColumnAlign;
   headerAlign: ColumnAlign;
   footerAlign: ColumnAlign;
-  property: string;
   type: string;
   sortable: boolean;
   treeNode: boolean;