vxe-table 3.3.14-beta.0 → 3.3.16

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

@@ -311,7 +311,18 @@ const Methods = {
    * @param {Array} datas 数据
    */
   loadTableData (datas) {
-    const { keepSource, treeConfig, editStore, sYOpts, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad } = this
+    const { keepSource, treeConfig, treeOpts, editStore, sYOpts, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad } = this
+    if (treeConfig && treeOpts.transform) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (!treeOpts.rowtKey) {
+          UtilTools.error('vxe.error.reqProp', ['table.tree-config.rowtKey'])
+        }
+        if (!treeOpts.parentKey) {
+          UtilTools.error('vxe.error.reqProp', ['table.tree-config.parentKey'])
+        }
+      }
+      datas = XEUtils.toArrayTree(datas, { key: treeOpts.rowtKey, parentKey: treeOpts.parentKey, children: treeOpts.children })
+    }
     const tableFullData = datas ? datas.slice(0) : []
     const scrollYLoad = !treeConfig && sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
     scrollYStore.startIndex = 0
@@ -910,6 +921,13 @@ const Methods = {
   isInsertByRow (row) {
     return this.editStore.insertList.indexOf(row) > -1
   },
+  /**
+   * 删除所有新增的临时数据
+   * @returns
+   */
+  removeInsertRow () {
+    return this.remove(this.editStore.insertList)
+  },
   /**
    * 检查行或列数据是否发生改变
    * @param {Row} row 行对象
@@ -1053,6 +1071,7 @@ const Methods = {
             const { filterMethod, filterRender } = column
             const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
             const compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null
+            const defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null
             const cellValue = UtilTools.getCellValue(row, column)
             if (filterMethod) {
               return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
@@ -1060,6 +1079,8 @@ const Methods = {
               return itemList.some((item) => compFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
             } else if (allFilterMethod) {
               return allFilterMethod({ options: itemList, values: valueList, cellValue, row, column })
+            } else if (defaultFilterMethod) {
+              return itemList.some((item) => defaultFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
             }
             return valueList.indexOf(XEUtils.get(row, column.property)) > -1
           }
@@ -3394,12 +3415,17 @@ const Methods = {
    * @param {Event} evnt 事件
    */
   closeFilter () {
-    Object.assign(this.filterStore, {
+    const { filterStore } = this
+    const { column, visible } = filterStore
+    Object.assign(filterStore, {
       isAllSelected: false,
       isIndeterminate: false,
       options: [],
       visible: false
     })
+    if (visible) {
+      this.emitEvent('filter-visible', { column, property: column.property, filterList: this.getCheckedFilters(), visible: false }, null)
+    }
     return this.$nextTick()
   },
   /**

package/packages/textarea/src/textarea.js

@@ -21,6 +21,7 @@ export default {
     placeholder: String,
     maxlength: [String, Number],
     rows: { type: [String, Number], default: 2 },
+    cols: { type: [String, Number], default: null },
     showWordCount: Boolean,
     countMethod: Function,
     autosize: [Boolean, Object],
@@ -71,14 +72,16 @@ export default {
     }
   },
   render (h) {
-    const { className, defaultEvents, inputValue, vSize, name, form, resize, placeholder, readonly, disabled, maxlength, autosize, showWordCount, countMethod } = this
+    const { className, defaultEvents, inputValue, vSize, name, form, resize, placeholder, readonly, disabled, maxlength, autosize, showWordCount, countMethod, rows, cols } = this
     const attrs = {
       name,
       form,
       placeholder,
       maxlength,
       readonly,
-      disabled
+      disabled,
+      rows,
+      cols
     }
     if (placeholder) {
       attrs.placeholder = UtilTools.getFuncText(placeholder)
@@ -87,7 +90,9 @@ export default {
       class: ['vxe-textarea', className, {
         [`size--${vSize}`]: vSize,
         'is--autosize': autosize,
-        'is--disabled': disabled
+        'is--disabled': disabled,
+        'def--rows': !XEUtils.eqNull(rows),
+        'def--cols': !XEUtils.eqNull(cols)
       }]
     }, [
       h('textarea', {

package/packages/v-x-e-table/src/conf.js

@@ -63,6 +63,8 @@ export default {
       showIcon: true
     },
     treeConfig: {
+      rowtKey: 'id',
+      parentKey: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
       indent: 20,

package/packages/v-x-e-table/src/renderer.js

@@ -522,7 +522,7 @@ const renderMap = {
     renderEdit: nativeEditRender,
     renderDefault: nativeEditRender,
     renderFilter: nativeFilterRender,
-    filterMethod: handleFilterMethod,
+    defaultFilterMethod: handleFilterMethod,
     renderItemContent: nativeItemRender
   },
   textarea: {
@@ -548,7 +548,7 @@ const renderMap = {
         renderOpts.optionGroups ? renderNativeOptgroups(h, renderOpts, params, renderNativeOptions) : renderNativeOptions(h, renderOpts.options, renderOpts, params))
       })
     },
-    filterMethod: handleFilterMethod,
+    defaultFilterMethod: handleFilterMethod,
     renderItemContent (h, renderOpts, params) {
       return [
         h('select', {
@@ -586,7 +586,7 @@ const renderMap = {
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    filterMethod: handleFilterMethod,
+    defaultFilterMethod: handleFilterMethod,
     renderItemContent: defaultItemRender
   },
   $textarea: {
@@ -622,7 +622,7 @@ const renderMap = {
         })
       })
     },
-    filterMethod: handleFilterMethod,
+    defaultFilterMethod: handleFilterMethod,
     renderItemContent (h, renderOpts, params) {
       const { data, property } = params
       const { options, optionProps, optionGroups, optionGroupProps } = renderOpts

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 / 2;
+      border-radius: $vxe-button-height-default * 0.5;
     }
     &: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 / 2;
+        border-radius: $vxe-button-height-medium * 0.5;
       }
     }
     .vxe-button--loading-icon,
@@ -239,7 +239,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-small;
       }
       &.is--round {
-        border-radius: $vxe-button-height-small / 2;
+        border-radius: $vxe-button-height-small * 0.5;
       }
     }
     .vxe-button--loading-icon,
@@ -255,7 +255,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-mini;
       }
       &.is--round {
-        border-radius: $vxe-button-height-mini / 2;
+        border-radius: $vxe-button-height-mini * 0.5;
       }
     }
     .vxe-button--loading-icon,

package/styles/header.scss

@@ -14,7 +14,7 @@
   /*排序*/
   .vxe-cell--sort {
     width: 1.5em;
-    height: 1.5em;
+    height: 1.35em;
     vertical-align: middle;
     text-align: center;
     display: inline-block;
@@ -36,10 +36,10 @@
     }
   }
   .vxe-sort--asc-btn {
-    top: -0.04em;
+    top: -0.15em;
   }
   .vxe-sort--desc-btn {
-    bottom: -0.04em;
+    bottom: -0.15em;
   }
 }
 
@@ -80,12 +80,12 @@
       top: 0.2em;
     }
   }
-  .vxe-cell--required-icon,
-  .vxe-cell--edit-icon,
-  .vxe-cell-help-icon,
-  .vxe-cell--title {
-    vertical-align: middle;
-  }
+  // .vxe-cell--required-icon,
+  // .vxe-cell--edit-icon,
+  // .vxe-cell-help-icon,
+  // .vxe-cell--title {
+  //   vertical-align: middle;
+  // }
   .vxe-cell--required-icon {
     margin-right: 0.1em;
   }
@@ -96,9 +96,6 @@
   .vxe-cell-help-icon {
     cursor: help;
   }
-  .vxe-cell--title {
-    line-height: 1.5;
-  }
   .vxe-resizable {
     position: absolute;
     right: -7px;

package/styles/modal.scss

@@ -314,10 +314,10 @@
       cursor: w-resize;
     }
     .wl-resize {
-      left: -#{$SpaceSize / 2 + 1}px;
+      left: -#{$SpaceSize * 0.5 + 1}px;
     }
     .wr-resize {
-      right: -#{$SpaceSize / 2 + 1}px;
+      right: -#{$SpaceSize * 0.5 + 1}px;
     }
     .swst-resize,
     .sest-resize,
@@ -359,10 +359,10 @@
       cursor: s-resize;
     }
     .st-resize {
-      top: -#{$SpaceSize / 2 + 1}px;
+      top: -#{$SpaceSize * 0.5 + 1}px;
     }
     .sb-resize {
-      bottom: -#{$SpaceSize / 2 + 1}px;
+      bottom: -#{$SpaceSize * 0.5 + 1}px;
     }
   }
 }

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) / 2)} 0;
+      padding: #{floor(($vxe-table-row-height-default - $vxe-table-row-line-height) * 0.5)} 0;
     }
     &.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) / 2)} 0;
+        padding: #{floor(($vxe-table-row-height-medium - $vxe-table-row-line-height) * 0.5)} 0;
       }
     }
     .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) / 2)} 0;
+        padding: #{floor(($vxe-table-row-height-small - $vxe-table-row-line-height) * 0.5)} 0;
       }
     }
     .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) / 2)} 0;
+        padding: #{floor(($vxe-table-row-height-mini - $vxe-table-row-line-height) * 0.5)} 0;
       }
     }
     .vxe-cell {
@@ -962,7 +962,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-medium;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-medium;
     }
@@ -978,7 +980,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-small;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-small;
     }
@@ -994,7 +998,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-mini;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-mini;
     }

package/styles/textarea.scss

@@ -3,7 +3,12 @@
 .vxe-textarea {
   position: relative;
   display: inline-block;
-  width: 100%;
+  &:not(.def--cols) {
+    width: 100%;
+    .vxe-textarea--inner {
+      width: 100%;
+    }
+  }
 }
 
 .vxe-textarea--inner {
@@ -15,6 +20,11 @@
   line-height: inherit;
   border: 1px solid $vxe-input-border-color;
   background-color: $vxe-textarea-background-color;
+  display: block;
+  padding: 0.3em 0.6em;
+  &::placeholder {
+    color: $vxe-input-placeholder-color;
+  }
   &:focus {
     border: 1px solid $vxe-primary-color;
   }
@@ -24,16 +34,6 @@
   }
 }
 
-.vxe-textarea--inner {
-  width: 100%;
-  height: 100%;
-  display: block;
-  padding: 0.3em 0.6em;
-  &::placeholder {
-    color: $vxe-input-placeholder-color;
-  }
-}
-
 .vxe-textarea--inner,
 .vxe-textarea--autosize {
   line-height: $vxe-textarea-line-height;