vxe-table 3.4.12 → 3.4.13

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

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

@@ -1139,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 = []
@@ -1154,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) {
@@ -2462,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,
@@ -3586,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,

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;