vxe-table 3.4.12-beta.0 → 3.4.13

package/packages/export/src/mixin.js

@@ -40,11 +40,18 @@ function hasTreeChildren ($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0
 }
 
-function getSeq ($xetable, row, rowIndex, column, columnIndex) {
+function getSeq ($xetable, row, $rowIndex, column, $columnIndex) {
   const seqOpts = $xetable.seqOpts
   const seqMethod = seqOpts.seqMethod || column.seqMethod
   if (seqMethod) {
-    return seqMethod({ row, rowIndex, column, columnIndex })
+    return seqMethod({
+      row,
+      rowIndex: $xetable.getRowIndex(row),
+      $rowIndex,
+      column,
+      columnIndex: $xetable.getColumnIndex(column),
+      $columnIndex
+    })
   }
   return $xetable.getRowSeq(row)
 }
@@ -68,7 +75,7 @@ function toBooleanValue (cellValue) {
 }
 
 function getLabelData ($xetable, opts, columns, datas) {
-  const { isAllExpand } = opts
+  const { isAllExpand, mode } = opts
   const { treeConfig, treeOpts, radioOpts, checkboxOpts } = $xetable
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div')
@@ -77,7 +84,7 @@ function getLabelData ($xetable, opts, columns, datas) {
     // 如果是树表格只允许导出数据源
     const rest = []
     const expandMaps = new Map()
-    XEUtils.eachTree(datas, (item, rowIndex, items, path, parent, nodes) => {
+    XEUtils.eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
       const row = item._row || item
       const parentRow = parent && parent._row ? parent._row : parent
       if ((isAllExpand || !parentRow || (expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
@@ -88,7 +95,7 @@ function getLabelData ($xetable, opts, columns, datas) {
           _hasChild: hasRowChild,
           _expand: hasRowChild && $xetable.isTreeExpandByRow(row)
         }
-        columns.forEach((column, columnIndex) => {
+        columns.forEach((column, $columnIndex) => {
           let cellValue = ''
           const renderOpts = column.editRender || column.cellRender
           let exportLabelMethod = column.exportMethod
@@ -103,7 +110,7 @@ function getLabelData ($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
+                cellValue = mode === 'all' ? path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('') : getSeq($xetable, row, $rowIndex, column, $columnIndex)
                 break
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
@@ -140,11 +147,11 @@ function getLabelData ($xetable, opts, columns, datas) {
     }, treeOpts)
     return rest
   }
-  return datas.map((row, rowIndex) => {
+  return datas.map((row, $rowIndex) => {
     const item = {
       _row: row
     }
-    columns.forEach((column, columnIndex) => {
+    columns.forEach((column, $columnIndex) => {
       let cellValue = ''
       const renderOpts = column.editRender || column.cellRender
       let exportLabelMethod = column.exportMethod
@@ -159,7 +166,7 @@ function getLabelData ($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
+            cellValue = mode === 'all' ? $rowIndex + 1 : getSeq($xetable, row, $rowIndex, column, $columnIndex)
             break
           case 'checkbox':
             cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))

package/packages/footer/src/footer.js

@@ -36,6 +36,16 @@ export default {
     elemStore[`${prefix}list`] = $refs.tfoot
     elemStore[`${prefix}xSpace`] = $refs.xSpace
   },
+  destroyed () {
+    const { $parent: $xetable, fixedType } = this
+    const { elemStore } = $xetable
+    const prefix = `${fixedType || 'main'}-footer-`
+    elemStore[`${prefix}wrapper`] = null
+    elemStore[`${prefix}table`] = null
+    elemStore[`${prefix}colgroup`] = null
+    elemStore[`${prefix}list`] = null
+    elemStore[`${prefix}xSpace`] = null
+  },
   render (h) {
     let { _e, $parent: $xetable, fixedType, fixedColumn, tableColumn, footerTableData } = this
     const {

package/packages/form/src/form.js

@@ -340,6 +340,7 @@ export default {
     submitEvent (evnt) {
       evnt.preventDefault()
       if (!this.preventSubmit) {
+        this.clearValidate()
         this.beginValidate(this.getItems()).then(() => {
           this.$emit('submit', { data: this.data, $form: this, $event: evnt })
         }).catch(errMap => {
@@ -442,6 +443,7 @@ export default {
       return this.$nextTick()
     },
     validate (callback) {
+      this.clearValidate()
       return this.beginValidate(this.getItems(), '', callback)
     },
     validateField (field, callback) {
@@ -452,7 +454,6 @@ export default {
       const validRest = {}
       const validFields = []
       const itemValids = []
-      this.clearValidate()
       clearTimeout(this.showErrTime)
       if (data && formRules) {
         itemList.forEach(item => {

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
         }
@@ -812,11 +807,14 @@ export default {
       }
       return ''
     },
+    firstDayOfWeek () {
+      const { startDay, startWeek } = this
+      return XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek)
+    },
     weekDatas () {
       const weeks = []
       if (this.isDatePickerType) {
-        const { startDay, startWeek } = this
-        let sWeek = XEUtils.toNumber(XEUtils.isNumber(startDay) || XEUtils.isString(startDay) ? startDay : startWeek)
+        let { firstDayOfWeek: sWeek } = this
         weeks.push(sWeek)
         for (let index = 0; index < 6; index++) {
           if (sWeek >= 6) {
@@ -957,7 +955,8 @@ export default {
       return XEUtils.chunk(this.dayList, 7)
     },
     weekDates () {
-      return this.dayDatas.map(list => {
+      const { dayDatas, firstDayOfWeek } = this
+      return dayDatas.map(list => {
         const firstItem = list[0]
         const item = {
           date: firstItem.date,
@@ -966,7 +965,7 @@ export default {
           isCurrent: false,
           isNow: false,
           isNext: false,
-          label: XEUtils.getYearWeek(firstItem.date)
+          label: XEUtils.getYearWeek(firstItem.date, firstDayOfWeek)
         }
         return [item].concat(list)
       })
@@ -1045,8 +1044,10 @@ export default {
       this.initValue()
     },
     dateLabelFormat () {
-      this.dateParseValue(this.datePanelValue)
-      this.inputValue = this.datePanelLabel
+      if (this.isDatePickerType) {
+        this.dateParseValue(this.datePanelValue)
+        this.inputValue = this.datePanelLabel
+      }
     }
   },
   created () {
@@ -1266,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)
+    },
     /**
      * 检查初始值
      */
@@ -1292,7 +1300,7 @@ export default {
       }
     },
     afterCheckValue () {
-      const { type, exponential, inpReadonly, inputValue, isDatePickerType, isNumType, datetimePanelValue, dateLabelFormat, min, max } = this
+      const { type, exponential, inpReadonly, inputValue, isDatePickerType, isNumType, datetimePanelValue, dateLabelFormat, min, max, firstDayOfWeek } = this
       if (!inpReadonly) {
         if (isNumType) {
           if (inputValue) {
@@ -1315,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)
@@ -1340,7 +1343,7 @@ export default {
                   } else {
                     isChange = true
                   }
-                  this.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat)
+                  this.inputValue = XEUtils.toDateString(inpDateVal, dateLabelFormat, { firstDay: firstDayOfWeek })
                   if (isChange) {
                     this.dateChange(inpDateVal)
                   }
@@ -1650,18 +1653,27 @@ export default {
       }
     },
     dateParseValue (date) {
-      const { type, dateLabelFormat, valueFormat } = this
+      const { type, dateLabelFormat, valueFormat, firstDayOfWeek } = this
       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)
+        dLabel = XEUtils.toDateString(dValue, dateLabelFormat, { firstDay: firstDayOfWeek })
+        // 由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年
+        if (dateLabelFormat && type === 'week') {
+          const firstWeekDate = XEUtils.getWhatWeek(dValue, 0, firstDayOfWeek, firstDayOfWeek)
+          if (firstWeekDate.getFullYear() < dValue.getFullYear()) {
+            const yyIndex = dateLabelFormat.indexOf('yyyy')
+            if (yyIndex > -1) {
+              const yyNum = Number(dLabel.substring(yyIndex, yyIndex + 4))
+              if (yyNum && !isNaN(yyNum)) {
+                dLabel = dLabel.replace(`${yyNum}`, `${yyNum - 1}`)
+              }
+            }
+          }
+        }
       } else {
         dValue = null
       }
@@ -1669,7 +1681,7 @@ export default {
       this.datePanelLabel = dLabel
     },
     dateOffsetEvent (evnt) {
-      const { isActivated, datePanelValue, datePanelType } = this
+      const { isActivated, datePanelValue, datePanelType, firstDayOfWeek } = this
       if (isActivated) {
         evnt.preventDefault()
         const keyCode = evnt.keyCode
@@ -1718,11 +1730,11 @@ export default {
           if (isLeftArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, -1)
           } else if (isUpArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, -1)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek)
           } else if (isRightArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, 1)
           } else if (isDwArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, 1)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek)
           }
           this.dateMoveDay(offsetDay)
         }
@@ -1741,16 +1753,16 @@ export default {
       }
     },
     dateChange (date) {
-      const { value, datetimePanelValue, dateValueFormat } = this
+      const { value, datetimePanelValue, dateValueFormat, firstDayOfWeek } = this
       if (this.type === 'week') {
         const sWeek = XEUtils.toNumber(this.selectDay)
-        date = XEUtils.getWhatWeek(date, 0, sWeek)
+        date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek)
       } else if (this.hasTime) {
         date.setHours(datetimePanelValue.getHours())
         date.setMinutes(datetimePanelValue.getMinutes())
         date.setSeconds(datetimePanelValue.getSeconds())
       }
-      const inpVal = XEUtils.toDateString(date, dateValueFormat)
+      const inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek })
       this.dateCheckMonth(date)
       if (!XEUtils.isEqual(value, inpVal)) {
         this.emitModel(inpVal, { type: 'update' })

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/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) {
@@ -1268,6 +1269,24 @@ const Methods = {
       })
     }
   },
+  /**
+   * 只对 tree-config 有效，获取行的父级
+   */
+  getParentRow (rowOrRowid) {
+    const { treeConfig, fullDataRowIdData } = this
+    if (rowOrRowid && treeConfig) {
+      let rowid
+      if (XEUtils.isString(rowOrRowid)) {
+        rowid = rowOrRowid
+      } else {
+        rowid = getRowid(this, rowOrRowid)
+      }
+      if (rowid) {
+        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null
+      }
+    }
+    return null
+  },
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
@@ -2443,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,
@@ -3567,9 +3586,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

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/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,