vxe-table 3.8.22 → 3.8.24

package/packages/table/src/methods.js

@@ -1371,7 +1371,7 @@ const Methods = {
             const { filterMethod, filterRender, field } = column
             const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
             const compFilterMethod = compConf && compConf.renderFilter ? (compConf.tableFilterMethod || compConf.filterMethod) : null
-            const defaultFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
+            const defaultFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || 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 }))
@@ -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)
@@ -2773,7 +2773,6 @@ const Methods = {
         const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row
         const childrenField = treeOpts.children || treeOpts.childrenField
         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-        let params
         if (filterStore.visible) {
           if (isEsc) {
             this.closeFilter()
@@ -2804,7 +2803,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) {
@@ -2819,7 +2818,7 @@ const Methods = {
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
-              params = actived.args
+              const params = actived.args
               this.clearEdit(evnt)
               // 如果配置了选中功能，则为选中状态
               if (mouseConfig && mouseOpts.selected) {
@@ -2849,7 +2848,7 @@ const Methods = {
               if (childrens && childrens.length) {
                 evnt.preventDefault()
                 const targetRow = childrens[0]
-                params = { $table: this, row: targetRow }
+                const params = { $table: this, row: targetRow }
                 this.setTreeExpand(currentRow, true)
                   .then(() => this.scrollToRow(targetRow))
                   .then(() => this.triggerCurrentRowEvent(evnt, params))
@@ -2877,23 +2876,24 @@ const Methods = {
           // 如果是删除键
           if (!isEditStatus) {
             const { delMethod } = keyboardOpts
-            const delPaqrams = {
+            const params = {
               row: selected.row,
               rowIndex: this.getRowIndex(selected.row),
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
-              $table: this
+              $table: this,
+              $grid: this.$xegrid
             }
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (delMethod) {
-                delMethod(delPaqrams)
+                delMethod(params)
               } else {
                 setCellValue(selected.row, selected.column, null)
               }
               // 如果按下 del 键，更新表尾数据
               this.updateFooter()
-              this.emitEvent('cell-delete-value', delPaqrams, evnt)
+              this.emitEvent('cell-delete-value', params, evnt)
             }
           }
         } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
@@ -2901,28 +2901,23 @@ const Methods = {
             const { backMethod } = keyboardOpts
             // 如果是删除键
             if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
-              const delPaqrams = {
+              const params = {
                 row: selected.row,
                 rowIndex: this.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: this.getColumnIndex(selected.column),
-                $table: this
+                $table: this,
+                $grid: this.$xegrid
               }
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (backMethod) {
-                  backMethod({
-                    row: selected.row,
-                    rowIndex: this.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: this.getColumnIndex(selected.column),
-                    $table: this
-                  })
+                  backMethod(params)
                 } else {
                   setCellValue(selected.row, selected.column, null)
-                  this.handleActived(selected.args, evnt)
+                  this.handleEdit(selected.args, evnt)
                 }
-                this.emitEvent('cell-backspace-value', delPaqrams, evnt)
+                this.emitEvent('cell-backspace-value', params, evnt)
               }
             }
           }
@@ -2931,11 +2926,12 @@ const Methods = {
           const { parent: parentRow } = XEUtils.findTree(this.afterTreeFullData, item => item === currentRow, { children: childrenField })
           if (parentRow) {
             evnt.preventDefault()
-            params = {
-              $table: this,
+            const params = {
               row: parentRow,
               rowIndex: this.getRowIndex(parentRow),
-              $rowIndex: this.getVMRowIndex(parentRow)
+              $rowIndex: this.getVMRowIndex(parentRow),
+              $table: this,
+              $grid: this.$xegrid
             }
             this.setTreeExpand(parentRow, false)
               .then(() => this.scrollToRow(parentRow))
@@ -2950,31 +2946,25 @@ const Methods = {
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-            if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: this, $grid: this.$xegrid })) {
+            const params = {
+              row: selected.row,
+              rowIndex: this.getRowIndex(selected.row),
+              column: selected.column,
+              columnIndex: this.getColumnIndex(selected.column),
+              $table: this,
+              $grid: this.$xegrid
+            }
+            if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
-                editMethod({
-                  row: selected.row,
-                  rowIndex: this.getRowIndex(selected.row),
-                  column: selected.column,
-                  columnIndex: this.getColumnIndex(selected.column),
-                  $table: this,
-                  $grid: this.$xegrid
-                })
+                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) {
                 this.$nextTick(() => {
-                  afterEditMethod({
-                    row: selected.row,
-                    rowIndex: this.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: this.getColumnIndex(selected.column),
-                    $table: this,
-                    $grid: this.$xegrid
-                  })
+                  afterEditMethod(params)
                 })
               }
             }
@@ -4092,7 +4082,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)
       })
@@ -4183,12 +4173,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/v-x-e-table/src/conf.js

@@ -185,6 +185,7 @@ export default {
     TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
     TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
     TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
+    TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
 
     // button
     BUTTON_DROPDOWN: iconPrefix + 'arrow-down',

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/button.scss

@@ -67,6 +67,15 @@ $btnThemeList: (
   user-select: none;
   appearance: none;
   @include createAnimationTransition(border, .2s);
+  &.align--left {
+    text-align: left;
+  }
+  &.align--center {
+    text-align: center;
+  }
+  &.align--right {
+    text-align: right;
+  }
   &:not(.is--disabled) {
     color: $vxe-font-color;
     cursor: pointer;

package/styles/custom.scss

@@ -146,21 +146,9 @@
   flex-direction: row;
   flex-shrink: 0;
   border-top: 1px solid $vxe-table-popup-border-color;
-  text-align: right;
   button {
-    background-color: transparent;
-    width: 50%;
+    flex-grow: 1;
     height: 2.8em;
-    border: 0;
-    color: $vxe-font-color;
-    text-align: center;
-    cursor: pointer;
-    &:focus {
-      outline: none;
-    }
-    &:hover {
-      color: $vxe-primary-color;
-    }
   }
 }
 
@@ -182,9 +170,15 @@
 .vxe-table-custom--sort-btn {
   padding-left: 0.2em;
   padding-right: 0.4em;
-  cursor: grabbing;
-  &:hover {
-    color: $vxe-primary-color;
+  &:not(.is--disabled) {
+    cursor: grabbing;
+    &:hover {
+      color: $vxe-primary-color;
+    }
+  }
+  &.is--disabled {
+    color: $vxe-input-disabled-color;
+    cursor: not-allowed;
   }
 }
 .vxe-table-custom--checkbox-label  {
@@ -203,22 +197,6 @@
   user-select: none;
 }
 
-.vxe-table-custom--fixed-left-option,
-.vxe-table-custom--fixed-right-option {
-  line-height: 1.34em;
-  font-size: 1.1em;
-  padding: 0 0.2em;
-  cursor: pointer;
-  &.is--checked,
-  &:hover {
-    color: $vxe-primary-color;
-  }
-  &.is--disabled {
-    cursor: no-drop;
-    color: $vxe-input-disabled-color;
-  }
-}
-
 .vxe-table-custom-popup--body {
   overflow: auto;
   height: 100%;
@@ -383,12 +361,18 @@
 .vxe-table-custom-popup--column-sort-btn {
   font-size: 1.2em;
   padding: 0.2em 0.5em;
-  cursor: grab;
-  &:hover {
-    color:  $vxe-primary-color;
+  &:not(.is--disabled) {
+    cursor: grab;
+    &:hover {
+      color:  $vxe-primary-color;
+    }
+    &:active {
+      cursor: grabbing;
+    }
   }
-  &:active {
-    cursor: grabbing;
+  &.is--disabled {
+    color: $vxe-input-disabled-color;
+    cursor: not-allowed;
   }
 }
 

package/styles/menu.scss

@@ -21,46 +21,28 @@
   font-family: $vxe-font-family;
   background-color: $vxe-table-menu-background-color;
 }
-.vxe-context-menu--link {
-  display: block;
-  padding: 0 2.5em;
-  width: $vxe-table-menu-item-width;
-  line-height: 26px;
-  color: $vxe-font-color;
-  cursor: pointer;
-  .vxe-context-menu--link-prefix,
-  .vxe-context-menu--link-suffix {
-    position: absolute;
-    top: 5px;
-    margin-right: 5px;
-    font-size: 16px;
-  }
-  .vxe-context-menu--link-prefix {
-    left: 5px;
-  }
-  .vxe-context-menu--link-suffix {
-    right: 5px;
-    &.suffix--haschild {
-      top: 8px;
-      &:before {
-        position: absolute;
-        content: "";
-        border: 4px solid transparent;
-        border-left-color: #727272;
-      }
-    }
-  }
-  .vxe-context-menu--link-content {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-.vxe-table--context-menu-clild-wrapper {
   .vxe-context-menu--link {
-    padding: 0 2em 0 2.5em;
-  }
+    display: flex;
+    flex-direction: row;
+    width: $vxe-table-menu-item-width;
+    line-height: 26px;
+    padding: 0 0.8em;
+    color: $vxe-font-color;
+    cursor: pointer;
+    .vxe-context-menu--link-prefix,
+    .vxe-context-menu--link-suffix {
+      min-width: 2em;
+      flex-shrink: 0;
+      text-align: center;
+      padding: 0 0.2em;
+    }
+    .vxe-context-menu--link-content {
+      flex-grow: 1;
+      padding: 0 0.2em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
 }
 .vxe-context-menu--option-wrapper,
 .vxe-table--context-menu-clild-wrapper {

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

@@ -130,7 +130,7 @@ $vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.
 $vxe-table-filter-panel-background-color: #fff !default;
 
 /*menu*/
-$vxe-table-menu-item-width: 178px !default;
+$vxe-table-menu-item-width: 198px !default;
 $vxe-table-menu-background-color: #fff !default;
 
 /*loading*/

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;
 }

package/types/module/menu.d.ts

@@ -21,8 +21,26 @@ export interface MenuOptions {
 export interface MenuFirstOption {
   code?: string;
   name?: string;
-  prefixIcon?: string;
-  suffixIcon?: string;
+  prefixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 prefixConfig
+   * @deprecated
+   */
+  prefixIcon?: string
+  suffixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 suffixConfig
+   * @deprecated
+   */
+  suffixIcon?: string
   className?: string;
   visible?: boolean;
   disabled?: boolean;
@@ -34,7 +52,26 @@ export interface MenuFirstOption {
 export interface MenuChildOption {
   code?: string;
   name?: string;
-  prefixIcon?: string;
+  prefixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 prefixConfig
+   * @deprecated
+   */
+  prefixIcon?: string
+  suffixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 suffixConfig
+   * @deprecated
+   */
+  suffixIcon?: string
   className?: string;
   visible?: boolean;
   disabled?: boolean;