vxe-table 3.6.12-beta.2 → 3.6.12-beta.4

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

@@ -22,6 +22,7 @@ export default {
       notSlot: '插槽 "{0}" 不存在',
       noTree: '樹狀結構不支援 {0}',
       notProp: '不支持的參數 "{0}"',
+      checkProp: '當數據量過大時可能會導致複選框卡頓，建議設置參數 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的參數 "{1}" 被覆蓋，這可能會出現錯誤',
       delFunc: '方法 "{0}" 已停用，請使用 "{1}"',
       delProp: '參數 "{0}" 已停用，請使用 "{1}"',

package/packages/pager/src/pager.js

@@ -402,7 +402,9 @@ export default {
     triggerJumpEvent (evnt) {
       const value = XEUtils.toInteger(evnt.target.value)
       const current = value <= 0 ? 1 : value >= this.pageCount ? this.pageCount : value
-      evnt.target.value = current
+      const currPage = XEUtils.toValueString(current)
+      evnt.target.value = currPage
+      this.inpCurrPage = currPage
       this.jumpPage(current)
     }
   }

package/packages/table/src/body.js

@@ -113,7 +113,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, 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, 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/table.js

@@ -625,6 +625,10 @@ export default {
         if (!inited) {
           this.handleInitDefaults()
         }
+        const checkboxColumn = this.tableFullColumn.find(column => column.type === 'checkbox')
+        if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
+          warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
+        }
         if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
           warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
         }

package/packages/toolbar/src/toolbar.js

@@ -84,10 +84,10 @@ function renderBtns (h, _vm) {
  * 渲染右侧工具
  */
 function renderRightTools (h, _vm) {
-  const { _e, $scopedSlots, $xegrid, $xetable, tools = [] } = _vm
+  const { _e, $scopedSlots, $xetable, tools = [] } = _vm
   const toolsSlot = $scopedSlots.tools
   if (toolsSlot) {
-    return toolsSlot.call(_vm, { $grid: $xegrid, $table: $xetable }, h)
+    return toolsSlot.call(_vm, { $table: $xetable, $grid: $xetable.xegrid }, h)
   }
   return tools.map(item => {
     const { dropdowns, toolRender } = item
@@ -100,7 +100,7 @@ function renderRightTools (h, _vm) {
       if (renderToolbarTool) {
         return h('span', {
           class: 'vxe-tool--item'
-        }, getSlotVNs(renderToolbarTool.call(_vm, h, toolRender, { $grid: $xegrid, $table: $xetable, tool: item })))
+        }, getSlotVNs(renderToolbarTool.call(_vm, h, toolRender, { $table: $xetable, $grid: $xetable.xegrid, tool: item })))
       }
     }
     return h('vxe-button', {
@@ -601,7 +601,7 @@ export default {
           $xegrid.triggerToolbarBtnEvent(item, evnt)
         } else {
           const commandMethod = VXETable.commands.get(code)
-          const params = { code, button: item, $xegrid, $table: $xetable, $event: evnt }
+          const params = { code, button: item, $table: $xetable, $grid: $xetable.xegrid, $event: evnt }
           if (commandMethod) {
             commandMethod.call(this, params, evnt)
           }

package/packages/tools/utils.js

@@ -85,7 +85,7 @@ export const UtilTools = {
   parseFile (file) {
     const name = file.name
     const tIndex = XEUtils.lastIndexOf(name, '.')
-    const type = name.substring(tIndex + 1, name.length)
+    const type = name.substring(tIndex + 1, name.length).toLowerCase()
     const filename = name.substring(0, tIndex)
     return { filename, type }
   },

package/types/component.d.ts

@@ -23,4 +23,4 @@ export interface RowInfo {
   [key: string]: any;
 }
 
-export type SlotVNodeType = VNode | string | number
+export type SlotVNodeType = VNode | string | number

package/types/table.d.ts

@@ -1066,9 +1066,9 @@ export declare class Table extends VXETableComponent {
   [key: string]: any;
 }
 
-export type TableBorder = boolean | 'default' | 'full' | 'outer' | 'inner' | 'none';
-export type TableAlign = 'left' | 'center' | 'right' | null;
-export type TableOverflow = boolean | 'ellipsis' | 'title' | 'tooltip' | null;
+export type TableBorder = boolean | 'default' | 'full' | 'outer' | 'inner' | 'none' | '';
+export type TableAlign = 'left' | 'center' | 'right' | '' | null;
+export type TableOverflow = boolean | 'ellipsis' | 'title' | 'tooltip' | '' | null;
 
 export interface TableFooterMethodParams {
   $table: Table;
@@ -1206,7 +1206,7 @@ export interface TableSortConfs {
   order?: TableSortOrder;
 }
 
-export type TableSortOrder = 'asc' | 'desc' | null;
+export type TableSortOrder = 'asc' | 'desc' | '' | null;
 
 /**
  * 排序配置项
@@ -1245,7 +1245,7 @@ export interface TableRadioConfig {
   labelField?: string;
   checkRowKey?: string | number;
   checkMethod?(params: { row: RowInfo }): boolean;
-  trigger?: 'default' | 'cell' | 'row';
+  trigger?: 'default' | 'cell' | 'row' | '';
   highlight?: boolean;
 }
 export type RadioConfig = TableRadioConfig
@@ -1264,7 +1264,7 @@ export interface TableCheckboxConfig {
   checkStrictly?: boolean;
   strict?: boolean;
   checkMethod?(params: { row: RowInfo }): boolean;
-  trigger?: 'default' | 'cell' | 'row';
+  trigger?: 'default' | 'cell' | 'row' | '';
   highlight?: boolean;
   range?: boolean;
 }
@@ -1275,7 +1275,7 @@ export type CheckboxConfig = TableCheckboxConfig
  */
 export interface TableTooltipConfig {
   enabled?: boolean;
-  theme?: 'dark' | 'light';
+  theme?: 'dark' | 'light' | '';
   enterable?: boolean;
   leaveDelay?: number;
   contentMethod?(params: { items: any[], row: RowInfo, rowIndex: number, $rowIndex: number, column: ColumnInfo, columnIndex: number, $columnIndex: number, type: 'header' | 'body' | 'footer', cell: HTMLElement, $event: any }): string | null | void;
@@ -1290,7 +1290,7 @@ export interface TableExpandConfig {
   expandAll?: boolean;
   expandRowKeys?: string[] | number[];
   accordion?: boolean;
-  trigger?: 'default' | 'cell' | 'row';
+  trigger?: 'default' | 'cell' | 'row' | '';
   lazy?: boolean;
   height?: number
   loadMethod?(params: { row: RowInfo, rowIndex: number, $rowIndex: number }): Promise<any>;
@@ -1313,7 +1313,7 @@ export interface TableTreeConfig {
   expandAll?: boolean;
   expandRowKeys?: string[] | number[];
   accordion?: boolean;
-  trigger?: 'default' | 'cell' | 'row';
+  trigger?: 'default' | 'cell' | 'row' | '';
   lazy?: boolean;
   hasChild?: string;
   loadMethod?(params: { row: RowInfo }): Promise<any[]>;
@@ -1332,7 +1332,7 @@ export interface TreeOpts {
   expandAll?: boolean;
   expandRowKeys?: string[] | number[];
   accordion?: boolean;
-  trigger?: 'default' | 'cell' | 'row';
+  trigger?: 'default' | 'cell' | 'row' | '';
   lazy?: boolean;
   hasChild: string;
   loadMethod?(params: { row: RowInfo }): Promise<any[]>;
@@ -1350,7 +1350,7 @@ export interface TableMenuConfig {
   header?: MenuOptions;
   body?: MenuOptions;
   footer?: MenuOptions;
-  trigger?: 'default' | 'cell';
+  trigger?: 'default' | 'cell' | '';
   visibleMethod?(params: { type: string, options: MenuFirstOption[], columns: ColumnInfo[], row?: RowInfo, rowIndex?: number, column?: ColumnInfo, columnIndex?: number }): boolean;
   className?: string;
 }

package/types/tooltip.d.ts

@@ -11,11 +11,11 @@ export declare class Tooltip extends VXETableComponent {
   /**
    * 触发方式
    */
-  trigger?: 'manual' | 'hover' | 'click';
+  trigger?: 'manual' | 'hover' | 'click' | '' | null;
   /**
    * 主题样式
    */
-  theme?: 'dark' | 'light';
+  theme?: 'dark' | 'light' | '' | null;
   /**
    * 显示内容
    */

package/types/validator.d.ts

@@ -23,7 +23,7 @@ export interface ColumnEditRule {
   /**
    * 数据类型
    */
-  type?: 'number' | 'string';
+  type?: 'number' | 'string' | '' | null;
   /**
    * 使用正则表达式校验
    */
@@ -37,7 +37,7 @@ export interface ColumnEditRule {
    * 提示消息
    */
   message?: string;
-  trigger?: 'blur' | 'change' | 'manual';
+  trigger?: 'blur' | 'change' | 'manual' | '' | null;
   maxWidth?: number;
 }