vxe-table 3.8.4-beta.0 → 3.8.5-beta.0

package/packages/locale/lang/es-ES.js

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: 'Moving target: {0}',
       setting: {
         colSort: 'Sort',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'Title',
         colVisible: 'Visible',
-        colFixed: 'Freeze column',
+        colFixed: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/ja-JP.js

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移動ターゲット: {0}',
       setting: {
         colSort: 'ソート',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'タイトル',
         colVisible: '表示',
-        colFixed: '列固定',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '指定しない',
         fixedRight: '右側'

package/packages/locale/lang/pt-BR.js

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: 'Moving target: {0}',
       setting: {
         colSort: 'Sort',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'Title',
         colVisible: 'Visible',
-        colFixed: 'Freeze column',
+        colFixed: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/zh-CN.js

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移动目标：{0}',
       setting: {
         colSort: '排序',
+        sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
         colVisible: '是否显示',
-        colFixed: '冻结列',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'

package/packages/locale/lang/zh-TC.js

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移動目標：{0}',
       setting: {
         colSort: '排序',
+        sortHelpTip: '點擊並拖動圖標可以調整列的排序',
         colTitle: '標題',
         colVisible: '是否顯示',
-        colFixed: '冻结列',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '不設定',
         fixedRight: '右側'

package/packages/menu/src/mixin.js

@@ -70,7 +70,7 @@ export default {
             if (activeArea && activeArea.row && activeArea.column) {
               params.row = activeArea.row
               params.column = activeArea.column
-              this.openContextMenu(evnt, type, params)
+              this.handleOpenMenuEvent(evnt, type, params)
               return
             }
           } else if (mouseConfig && mouseOpts.selected) {
@@ -78,7 +78,7 @@ export default {
             if (selected.row && selected.column) {
               params.row = selected.row
               params.column = selected.column
-              this.openContextMenu(evnt, type, params)
+              this.handleOpenMenuEvent(evnt, type, params)
               return
             }
           }
@@ -102,7 +102,7 @@ export default {
               params.row = row
               params.rowIndex = this.getRowIndex(row)
             }
-            this.openContextMenu(evnt, layout, params)
+            this.handleOpenMenuEvent(evnt, layout, params)
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -117,7 +117,7 @@ export default {
             if (ctxMenuOpts.trigger === 'cell') {
               evnt.preventDefault()
             } else {
-              this.openContextMenu(evnt, layout, params)
+              this.handleOpenMenuEvent(evnt, layout, params)
             }
             return
           }
@@ -131,7 +131,7 @@ export default {
     /**
      * 显示快捷菜单
      */
-    openContextMenu (evnt, type, params) {
+    handleOpenMenuEvent (evnt, type, params) {
       const { isCtxMenu, ctxMenuStore, ctxMenuOpts } = this
       const config = ctxMenuOpts[type]
       const visibleMethod = ctxMenuOpts.visibleMethod

package/packages/table/src/methods.js

@@ -2415,7 +2415,19 @@ const Methods = {
     }
   },
   preventEvent (evnt, type, args, next, end) {
-    const evntList = VXETable.interceptor.get(type)
+    let evntList = VXETable.interceptor.get(type)
+
+    // 兼容老版本
+    if (!evntList.length && type === 'event.clearEdit') {
+      evntList = VXETable.interceptor.get('event.clearActived')
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (evntList.length) {
+          warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
+        }
+      }
+    }
+    // 兼容老版本
+
     let rest
     if (!evntList.some(func => func(Object.assign({ $grid: this.$xegrid, $table: this, $event: evnt }, args)) === false)) {
       if (next) {
@@ -2470,33 +2482,33 @@ const Methods = {
           } else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
             if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
               // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-              this.preventEvent(evnt, 'event.clearActived', actived.args, () => {
-                let isClearActived
+              this.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
+                let isClear
                 if (editOpts.mode === 'row') {
                   const rowNode = getEventTargetNode(evnt, $el, 'vxe-body--row')
                   // row 方式，如果点击了不同行
-                  isClearActived = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false
+                  isClear = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false
                 } else {
                   // cell 方式，如果是非编辑列
-                  isClearActived = !getEventTargetNode(evnt, $el, 'col--edit').flag
+                  isClear = !getEventTargetNode(evnt, $el, 'col--edit').flag
                 }
                 // 如果点击表头行，则清除激活状态
-                if (!isClearActived) {
-                  isClearActived = getEventTargetNode(evnt, $el, 'vxe-header--row').flag
+                if (!isClear) {
+                  isClear = getEventTargetNode(evnt, $el, 'vxe-header--row').flag
                 }
                 // 如果点击表尾行，则清除激活状态
-                if (!isClearActived) {
-                  isClearActived = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag
+                if (!isClear) {
+                  isClear = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag
                 }
                 // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                if (!isClearActived && this.height && !this.overflowY) {
+                if (!isClear && this.height && !this.overflowY) {
                   const bodyWrapperElem = evnt.target
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
-                    isClearActived = evnt.offsetY < bodyWrapperElem.clientHeight
+                    isClear = evnt.offsetY < bodyWrapperElem.clientHeight
                   }
                 }
                 if (
-                  isClearActived ||
+                  isClear ||
                     // 如果点击了当前表格之外
                     !getEventTargetNode(evnt, $el).flag
                 ) {
@@ -3890,8 +3902,8 @@ const Methods = {
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent (evnt, params) {
-    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
-    const { actived } = editStore
+    const { highlightCurrentRow, editStore, radioOpts, expandOpts, treeOpts, keyboardOpts, editConfig, editOpts, checkboxOpts, rowOpts } = this
+    const { actived, focused } = editStore
     const { row, column } = params
     const { type, treeNode } = column
     const isRadioType = type === 'radio'
@@ -3933,6 +3945,11 @@ const Methods = {
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
       if (isEnableConf(editConfig)) {
+        // 记录点击输入框聚焦状态
+        if (keyboardOpts.arrowCursorLock && evnt && editOpts.mode === 'cell' && evnt.target && /^input|textarea$/i.test(evnt.target.tagName)) {
+          focused.column = column
+          focused.row = row
+        }
         if (editOpts.trigger === 'manual') {
           if (actived.args && actived.row === row && column !== actived.column) {
             this.handleChangeCell(evnt, params)
@@ -5330,7 +5347,7 @@ funcs.forEach(name => {
           errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
         } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
           errLog('vxe.error.reqModule', ['VxeTableFilterModule'])
-        } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+        } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
           errLog('vxe.error.reqModule', ['VxeTableEditModule'])
         } else if ('openCustom'.split(',').includes(name)) {
           errLog('vxe.error.reqModule', ['VxeTableCustomModule'])

package/packages/table/src/table.js

@@ -415,6 +415,11 @@ export default {
           row: null,
           column: null
         },
+        // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+        focused: {
+          row: null,
+          column: null
+        },
         insertList: [],
         insertMaps: {},
         removeList: [],
@@ -773,15 +778,15 @@ export default {
     })
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      // if (this.rowId) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
-      // }
-      // if (this.rowKey) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
-      // }
-      // if (this.columnKey) {
-      //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
-      // }
+      if (this.rowId) {
+        warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
+      }
+      if (this.rowKey) {
+        warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey'])
+      }
+      if (this.columnKey) {
+        warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey'])
+      }
       if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
         warnLog('vxe.error.reqProp', ['row-config.keyField'])
       }

package/packages/table/src/util.js

@@ -271,8 +271,8 @@ export function clearTableDefaultStatus (_vm) {
   _vm.clearRowExpand()
   _vm.clearTreeExpand()
   _vm.clearTreeExpandReserve()
-  if (_vm.clearActived && VXETable._edit) {
-    _vm.clearActived()
+  if (_vm.clearEdit && VXETable._edit) {
+    _vm.clearEdit()
   }
   if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
     _vm.clearSelected()

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

@@ -5,7 +5,7 @@ function toType (type) {
   return XEUtils.toValueString(type).replace('_', '').toLowerCase()
 }
 
-const eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType)
+const eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearEdit,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType)
 const storeMap = {}
 
 export const interceptor = {

package/styles/custom.scss

@@ -125,6 +125,8 @@
   table {
     width: 100%;
     border: 0;
+    table-layout: fixed;
+    word-break: break-all;
     border-spacing: 0;
     border-collapse: separate;
     th {
@@ -147,6 +149,9 @@
           border-top: 0;
         }
       }
+      &:hover {
+        background-color: $vxe-table-row-hover-background-color;
+      }
     }
     th,
     td {
@@ -176,7 +181,6 @@
 }
 
 .vxe-table-custom-popup--name {
-  max-width: 360px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -188,7 +192,6 @@
     &.level--#{$index} {
       .vxe-table-custom-popup--name {
         padding-left: $paddingLeft;
-        max-width: 260px - $paddingLeft;
       }
     }
   }
@@ -272,3 +275,12 @@
     cursor: grabbing;
   }
 }
+
+.vxe-table-custom-popup--table-sort-help-title,
+.vxe-table-custom-popup--table-sort-help-icon {
+  vertical-align: middle;
+}
+.vxe-table-custom-popup--table-sort-help-icon {
+  margin-left: 5px;
+  cursor: help;
+}

package/styles/table.scss

@@ -937,20 +937,20 @@
   }
 
   /*树形节点*/
-  &.is--tree-line {
-    .vxe-body--row {
-      &:first-child {
-        .vxe-tree--line {
-          border-width: 0 0 1px 0;
-        }
-      }
-    }
-    .vxe-body--row {
-      .vxe-body--column {
-        background-image: none;
-      }
-    }
-  }
+  // &.is--tree-line {
+  //   .vxe-body--row {
+  //     &:first-child {
+  //       .vxe-tree--line {
+  //         border-width: 0 0 1px 0;
+  //       }
+  //     }
+  //   }
+  //   .vxe-body--row {
+  //     .vxe-body--column {
+  //       background-image: none;
+  //     }
+  //   }
+  // }
   .vxe-tree--line-wrapper {
     position: relative;
     display: block;

package/types/checkbox-group.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 组件 - 复选框组
  */
-export interface VxeCheckboxGroup extends VXETableComponent {
+export declare class VxeCheckboxGroup extends VXETableComponent {
   /**
    * 绑定值
    */

package/types/colgroup.d.ts

@@ -1,8 +1,6 @@
 import { ColumnFixed, ColumnAlign, ColumnFormatterMethodParams, ColumnCellRenderOptions, ColumnContentRenderOptions, Column } from './column'
 import { ColumnFilterOption, ColumnFilterRenderOptions, ColumnFilterMethodParams } from './module/filter'
 import { ColumnCellRenderParams } from './v-x-e-table/renderer'
-import { ColumnHeaderRenderParams } from './header'
-import { ColumnFooterRenderParams } from './footer'
 import { ColumnEditRenderOptions } from './module/edit'
 import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from './module/export'
 import { TableOverflow } from './table'
@@ -77,11 +75,11 @@ export interface ColgroupProps {
   /**
    * 给表头单元格附加 className
    */
-  headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
+  headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 给表尾单元格附加 className
    */
-  footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
+  footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 格式化显示内容
    */

package/types/column.d.ts

@@ -1,9 +1,7 @@
-import { CreateElement, VNode } from 'vue'
+import { CreateElement } from 'vue'
 import { VXETableComponent, SlotVNodeType } from './component'
 import { ColumnFilterOption, ColumnFilterParams, ColumnFilterRenderOptions, ColumnFilterSlotParams, ColumnFilterMethodParams } from './module/filter'
 import { ColumnCellRenderParams, ColumnDefaultSlotParams, ColumnIconSlotParams, ColumnContentSlotParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
-import { ColumnHeaderSlotParams, ColumnHeaderRenderParams } from './header'
-import { ColumnFooterSlotParams, ColumnFooterRenderParams } from './footer'
 import { ColumnEditRenderOptions, ColumnEditSlotParams } from './module/edit'
 import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams, ColumnExportHeaderRenderParams } from './module/export'
 import { TableOverflow } from './table'
@@ -74,11 +72,11 @@ export declare class VxeColumn extends VXETableComponent {
   /**
    * 给表头单元格附加 className
    */
-  headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
+  headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 给表尾单元格附加 className
    */
-  footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
+  footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 格式化显示内容
    */
@@ -219,11 +217,11 @@ export interface ColumnOptions {
   /**
    * 给表头单元格附加 className
    */
-  headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
+  headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 给表尾单元格附加 className
    */
-  footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
+  footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
   /**
    * 格式化显示内容
    */
@@ -299,8 +297,8 @@ export interface ColumnOptions {
 
   slots?: {
     default?(params: ColumnDefaultSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
-    header?(params: ColumnHeaderSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
-    footer?(params: ColumnFooterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    header?(params: any, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    footer?(params: any, h: CreateElement): SlotVNodeType | SlotVNodeType[]
     content?(params: ColumnContentSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
     filter?(params: ColumnFilterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
     edit?(params: ColumnEditSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]

package/types/table.d.ts

@@ -4,7 +4,6 @@ import { ColumnCellRenderParams, TableEmptyRender } from './v-x-e-table'
 import { TableExportConfig, TableImportConfig, TablePrintConfig, SaveFileOptions, ReadFileOptions, ReadFileParams } from './module/export'
 import { ColumnFilterOption } from './module/filter'
 import { ColumnEditRule, ColumnEditValidErrMapParams } from './module/validator'
-import { ColumnFooterRenderParams } from './footer'
 import { MenuOptions, MenuFirstOption } from './module/menu'
 
 /* eslint-disable no-use-before-define */
@@ -733,7 +732,7 @@ export declare class VxeTable extends VXETableComponent {
    * 已废弃，请使用 isRowExpandByRow
    * @deprecated
    */
-  isExpandByRow(row: RowInfo): boolean;
+  isRowExpandByRow(row: RowInfo): boolean;
   /**
    * 用于 type=expand，手动清空展开行状态，数据会恢复成未展开的状态
    */
@@ -952,7 +951,7 @@ export declare class VxeTable extends VXETableComponent {
    * 请使用 clearEdit
    * @deprecated
    */
-  clearActived(evnt?: Event): Promise<any>
+  clearEdit(evnt?: Event): Promise<any>
   /**
     * 手动清除单元格激活状态
     */
@@ -1161,7 +1160,7 @@ export function TableFooterMethod(params: TableFooterMethodParams): Array<string
 export type TableSpanMethodParams = ColumnCellRenderParams
 export function TableSpanMethod(params: TableSpanMethodParams): { rowspan: number, colspan: number }
 
-export type TableFooterSpanMethodParams = ColumnFooterRenderParams
+export type TableFooterSpanMethodParams = any
 export function TableFooterSpanMethod(params: TableFooterSpanMethodParams): { rowspan: number, colspan: number }
 
 export interface TableOptions {

package/types/v-x-e-table/renderer.d.ts

@@ -5,7 +5,6 @@ import { Grid } from '../grid'
 import { ColumnInfo, ColumnCellRenderOptions, ColumnContentRenderOptions } from '../column'
 import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from '../module/export'
 import { ColumnEditRenderOptions, ColumnEditRenderParams } from '../module/edit'
-import { ColumnFooterRenderParams } from '../footer'
 import { ColumnFilterRenderOptions, ColumnFilterRenderParams, ColumnFilterMethodParams, ColumnFilterResetParams } from '../module/filter'
 import { ToolbarButtonRenderOptions, ToolbarButtonRenderParams, ToolbarToolRenderOptions, ToolbarToolRenderParams } from '../toolbar'
 import { FormItemRenderOptions, FormItemRenderParams, FormItemVisibleParams, FormItemResetParams } from '../form-item'
@@ -48,7 +47,7 @@ export interface RendererMapOptions {
   cellStyle?: VNodeStyle | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => VNodeStyle)
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
   renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
-  renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: any): SlotVNodeType | SlotVNodeType[];
   exportMethod?(params: ColumnExportCellRenderParams): string;
   footerExportMethod?(params: ColumnExportFooterRenderParams): string;