vxe-table 3.8.23 → 3.8.25

package/packages/table/src/body.js

@@ -115,7 +115,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   const bindMouseenter = tableListeners['cell-mouseenter']
   const bindMouseleave = tableListeners['cell-mouseleave']
   const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick')
-  const params = { $table: $xetable, $grid: $xetable.$xegrid, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
+  const params = { $table: $xetable, $grid: $xetable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
   // 虚拟滚动不支持动态高度
   if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
     showEllipsis = hasEllipsis = true

package/packages/table/src/cell.js

@@ -816,26 +816,27 @@ export const Cell = {
     const { slots, editRender, formatter } = column
     const compConf = VXETable.renderer.get(editRender.name)
     const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
+    const cellParams = Object.assign({ $type: '', isEdit }, params)
     if (isEdit) {
       if (slots && slots.edit) {
-        return $table.callSlot(slots.edit, params, h)
+        return $table.callSlot(slots.edit, cellParams, h)
       }
       if (rtEdit) {
-        return getSlotVNs(rtEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)))
+        return getSlotVNs(rtEdit.call($table, h, editRender, cellParams))
       }
       return []
     }
     if (slots && slots.default) {
-      return $table.callSlot(slots.default, params, h)
+      return $table.callSlot(slots.default, cellParams, h)
     }
     if (formatter) {
       return [
         h('span', {
           class: 'vxe-cell--label'
-        }, [getDefaultCellLabel(params)])
+        }, [getDefaultCellLabel(cellParams)])
       ]
     }
-    return Cell.renderDefaultCell.call(_vm, h, params)
+    return Cell.renderDefaultCell.call(_vm, h, cellParams)
   }
 }
 

package/packages/table/src/methods.js

@@ -1882,8 +1882,8 @@ const Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn (resiveOrder) {
-    if (resiveOrder) {
+  refreshColumn (initOrder) {
+    if (initOrder) {
       const columnList = XEUtils.orderBy(this.collectColumn, 'renderSortNumber')
       this.collectColumn = columnList
       const tableFullColumn = getColumnList(columnList)
@@ -1904,7 +1904,7 @@ const Methods = {
     const leftList = []
     const centerList = []
     const rightList = []
-    const { collectColumn, tableFullColumn, isGroup, columnStore, sXOpts, scrollXStore } = this
+    const { collectColumn, tableFullColumn, isGroup, columnStore, sXOpts, scrollXStore, fullColumnIdData } = this
     // 如果是分组表头，如果子列全部被隐藏，则根列也隐藏
     if (isGroup) {
       const leftGroupList = []
@@ -1989,6 +1989,13 @@ const Methods = {
       this.clearMergeFooterItems()
     }
     this.scrollXLoad = scrollXLoad
+    visibleColumn.forEach((column, index) => {
+      const colid = column.id
+      const rest = fullColumnIdData[colid]
+      if (rest) {
+        rest._index = index
+      }
+    })
     this.visibleColumn = visibleColumn
     this.handleTableColumn()
     return this.updateFooter().then(() => {
@@ -2803,7 +2810,7 @@ const Methods = {
             if (selected.row && selected.column) {
               evnt.stopPropagation()
               evnt.preventDefault()
-              this.handleActived(selected.args, evnt)
+              this.handleEdit(selected.args, evnt)
             }
           }
         } else if (isContextMenu) {
@@ -2915,7 +2922,7 @@ const Methods = {
                   backMethod(params)
                 } else {
                   setCellValue(selected.row, selected.column, null)
-                  this.handleActived(selected.args, evnt)
+                  this.handleEdit(selected.args, evnt)
                 }
                 this.emitEvent('cell-backspace-value', params, evnt)
               }
@@ -2959,7 +2966,7 @@ const Methods = {
                 editMethod(params)
               } else {
                 setCellValue(selected.row, selected.column, null)
-                this.handleActived(selected.args, evnt)
+                this.handleEdit(selected.args, evnt)
               }
               const afterEditMethod = editOpts.afterEditMethod
               if (afterEditMethod) {
@@ -4082,7 +4089,7 @@ const Methods = {
     this.checkValidate('blur')
       .catch(e => e)
       .then(() => {
-        this.handleActived(params, evnt)
+        this.handleEdit(params, evnt)
           .then(() => this.checkValidate('change'))
           .catch(e => e)
       })
@@ -4173,12 +4180,12 @@ const Methods = {
           this.checkValidate('blur')
             .catch(e => e)
             .then(() => {
-              this.handleActived(params, evnt)
+              this.handleEdit(params, evnt)
                 .then(() => this.checkValidate('change'))
                 .catch(e => e)
             })
         } else if (editOpts.mode === 'cell') {
-          this.handleActived(params, evnt)
+          this.handleEdit(params, evnt)
             .then(() => this.checkValidate('change'))
             .catch(e => e)
         }

package/packages/textarea/src/textarea.js

@@ -23,7 +23,7 @@ export default {
       default: () => XEUtils.eqNull(GlobalConfig.textarea.placeholder) ? GlobalConfig.i18n('vxe.base.pleaseInput') : GlobalConfig.textarea.placeholder
     },
     maxlength: [String, Number],
-    rows: { type: [String, Number], default: 2 },
+    rows: { type: [String, Number], default: null },
     cols: { type: [String, Number], default: null },
     showWordCount: Boolean,
     countMethod: Function,
@@ -102,8 +102,8 @@ export default {
         [`size--${vSize}`]: vSize,
         'is--autosize': autosize,
         'is--disabled': disabled,
-        'def--rows': !XEUtils.eqNull(rows),
-        'def--cols': !XEUtils.eqNull(cols)
+        'is--rows': !XEUtils.eqNull(rows),
+        'is--cols': !XEUtils.eqNull(cols)
       }],
       attrs: {
         spellcheck: false

package/packages/tooltip/src/tooltip.js

@@ -43,11 +43,12 @@ function showTip (_vm) {
 
 function renderContent (h, _vm) {
   const { $scopedSlots, useHTML, tipContent } = _vm
-  if ($scopedSlots.content) {
+  const contentSlot = $scopedSlots.content
+  if (contentSlot) {
     return h('div', {
       key: 1,
       class: 'vxe-table--tooltip-content'
-    }, $scopedSlots.content.call(this, {}))
+    }, contentSlot.call(this, {}))
   }
   if (useHTML) {
     return h('div', {
@@ -102,7 +103,11 @@ export default {
     },
     value (value) {
       if (!this.isUpdate) {
-        this[value ? 'open' : 'close']()
+        if (value) {
+          this.handleVisible(this.target, this.content)
+        } else {
+          this.close()
+        }
       }
       this.isUpdate = false
     }
@@ -140,7 +145,7 @@ export default {
         }
       }
       if (value) {
-        this.open()
+        this.handleVisible(target, content)
       }
     }
   },
@@ -190,7 +195,7 @@ export default {
   },
   methods: {
     open (target, content) {
-      return this.toVisible(target || this.target, content)
+      return this.handleVisible(target || this.target, content)
     },
     close () {
       this.tipTarget = null
@@ -218,6 +223,13 @@ export default {
       }
     },
     toVisible (target, content) {
+      return this.handleVisible(target, content)
+    },
+    handleVisible (target, content) {
+      const contentSlot = this.$scopedSlots.default
+      if (!contentSlot && (content === '' || XEUtils.eqNull(content))) {
+        return this.$nextTick()
+      }
       if (target) {
         const { trigger, enterDelay } = this
         this.tipActive = true
@@ -249,10 +261,14 @@ export default {
       this.tipActive = !!actived
     },
     clickEvent () {
-      this[this.visible ? 'close' : 'open']()
+      if (this.visible) {
+        this.close()
+      } else {
+        this.handleVisible(this.target, this.content)
+      }
     },
     targetMouseenterEvent () {
-      this.open()
+      this.handleVisible(this.target, this.content)
     },
     targetMouseleaveEvent () {
       const { trigger, enterable, leaveDelay } = this

package/packages/v-x-e-table/index.js

@@ -64,6 +64,10 @@ export const setConfig = (options) => {
   return VxeUI
 }
 
+export function getConfig (key, defaultValue) {
+  return arguments.length ? XEUtils.get(GlobalConfig, key, defaultValue) : GlobalConfig
+}
+
 class VXETableConfig {
   /**
    * 获取当前的 zIndex
@@ -160,6 +164,7 @@ export const VxeUI = {
   reg,
   use,
   setConfig,
+  getConfig,
   setIcon,
   globalStore,
   interceptor,

package/packages/validator/src/mixin.js

@@ -94,7 +94,7 @@ export default {
           this.emitEvent('valid-error', params)
           resolve()
         } else {
-          this.handleActived(params, { type: 'valid-error', trigger: 'call' }).then(() => {
+          this.handleEdit(params, { type: 'valid-error', trigger: 'call' }).then(() => {
             setTimeout(() => {
               resolve(this.showValidTooltip(params))
             }, 10)

package/styles/table.scss

@@ -1202,6 +1202,7 @@
   /*暂无数据*/
   .vxe-table--empty-placeholder,
   .vxe-table--empty-block {
+    color: $vxe-input-placeholder-color;
     min-height: $vxe-table-row-height-default;
     justify-content: center;
     align-items: center;

package/styles/textarea.scss

@@ -2,8 +2,9 @@
 
 .vxe-textarea {
   position: relative;
-  display: inline-block;
-  &:not(.def--cols) {
+  display: inline-flex;
+  flex-direction: row;
+  &:not(.is--cols) {
     width: 100%;
     .vxe-textarea--inner {
       width: 100%;

package/styles/variable.scss

@@ -23,26 +23,26 @@ $vxe-danger-color: #f56c6c !default;
 /*layout*/
 $vxe-layout-background-color: #fff !default;
 
-$vxe-font-lighten-color: lighten($vxe-font-color, 10%) !default;
-$vxe-primary-lighten-color: lighten($vxe-primary-color, 10%) !default;
-$vxe-success-lighten-color: lighten($vxe-success-color, 10%) !default;
-$vxe-info-lighten-color: lighten($vxe-info-color, 10%) !default;
-$vxe-warning-lighten-color: lighten($vxe-warning-color, 10%) !default;
-$vxe-danger-lighten-color: lighten($vxe-danger-color, 10%) !default;
-
-$vxe-font-darken-color: darken($vxe-font-color, 10%) !default;
-$vxe-primary-darken-color: darken($vxe-primary-color, 10%) !default;
-$vxe-success-darken-color: darken($vxe-success-color, 10%) !default;
-$vxe-info-darken-color: darken($vxe-info-color, 10%) !default;
-$vxe-warning-darken-color: darken($vxe-warning-color, 10%) !default;
-$vxe-danger-darken-color: darken($vxe-danger-color, 10%) !default;
+$vxe-font-lighten-color: #797b80 !default;
+$vxe-primary-lighten-color: #73b8ff !default;
+$vxe-success-lighten-color: #85cf60!default;
+$vxe-info-lighten-color: #abadb1 !default;
+$vxe-warning-lighten-color: #ecb869 !default;
+$vxe-danger-lighten-color: #f89c9c !default;
+
+$vxe-font-darken-color: #47494c !default;
+$vxe-primary-darken-color: #0d84ff !default;
+$vxe-success-darken-color: #529b2e !default;
+$vxe-info-darken-color: #767980 !default;
+$vxe-warning-darken-color: #d48a1b !default;
+$vxe-danger-darken-color: #f56c6c !default;
 
 $vxe-font-disabled-color: #BFBFBF !default;
-$vxe-primary-disabled-color: lighten($vxe-primary-color, 20%) !default;
-$vxe-success-disabled-color: lighten($vxe-success-color, 20%) !default;
-$vxe-info-disabled-color: lighten($vxe-info-color, 20%) !default;
-$vxe-warning-disabled-color: lighten($vxe-warning-color, 20%) !default;
-$vxe-danger-disabled-color: lighten($vxe-danger-color, 20%) !default;
+$vxe-primary-disabled-color: #a6d2ff !default;
+$vxe-success-disabled-color: #a3db87 !default;
+$vxe-info-disabled-color: #c5c7ca !default;
+$vxe-warning-disabled-color: l#d48a1b !default;
+$vxe-danger-disabled-color: #f5a8a8 !default;
 
 /*input/radio/checkbox*/
 $vxe-input-border-color: #dcdfe6 !default;

package/types/column.d.ts

@@ -336,30 +336,86 @@ export class ColumnInfo {
   editRender: ColumnEditRenderOptions;
   contentRender: ColumnContentRenderOptions;
 
+  /**
+   * @private
+   */
   id: string;
+  /**
+   * @private
+   */
   parentId: string;
+  /**
+   * @private
+   */
   level: number;
+  /**
+   * @private
+   */
   rowSpan: number;
+  /**
+   * @private
+   */
   colSpan: number;
+  /**
+   * @private
+   */
   visible: boolean;
+  /**
+   * @private
+   */
   halfVisible: boolean;
+  /**
+   * @private
+   */
   defaultVisible: any;
+  /**
+   * @private
+   */
   checked: boolean;
+  /**
+   * @private
+   */
   halfChecked: boolean;
+  /**
+   * @private
+   */
   disabled: boolean;
+  /**
+   * @private
+   */
   order: string;
+  /**
+   * @private
+   */
   sortTime: number
+  /**
+   * @private
+   */
   customOrder: number
+  /**
+   * @private
+   */
   renderWidth: number;
+  /**
+   * @private
+   */
   renderHeight: number;
+  /**
+   * @private
+   */
   resizeWidth: number;
+  /**
+   * @private
+   */
   model: {
     update: boolean;
     value: any;
   };
 
   children: ColumnInfo[];
-
+  /**
+   * 获取列标题
+   */
   getTitle(): string;
   [key: string]: any;
 }