vxe-table 3.6.16 → 3.7.0-beta.0

package/styles/toolbar.scss

@@ -118,8 +118,8 @@
     .vxe-custom--header,
     .vxe-custom--body {
       & > li {
-        max-width: 16em;
-        min-width: 12.5em;
+        max-width: 18em;
+        min-width: 14em;
         padding: 0.2em 1em 0.2em 1em;
         @for $i from 2 through 8 {
           $interval: $i - 1 + 0.2;
@@ -154,6 +154,11 @@
   }
 }
 
+.vxe-custom--option {
+  display: flex;
+  flex-direction: row;
+}
+
 .vxe-custom--option-wrapper .vxe-custom--header,
 .vxe-custom--option-wrapper .vxe-custom--body {
   list-style-type: none;
@@ -162,15 +167,37 @@
   margin: 0;
   padding: 0;
   user-select: none;
-  & > li {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
 }
 
-.vxe-custom--option {
+.vxe-custom--checkbox-option {
   @extend %XECheckboxIcon;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex-grow: 1;
+}
+
+.vxe-custom--fixed-option {
+  flex-shrink: 0;
+  padding-left: 0.5em;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  .vxe-custom--fixed-left-option,
+  .vxe-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-toolbar {

package/types/column.d.ts

@@ -5,7 +5,7 @@ import { ColumnCellRenderParams, ColumnDefaultSlotParams, ColumnIconSlotParams,
 import { ColumnHeaderSlotParams, ColumnHeaderRenderParams } from './header'
 import { ColumnFooterSlotParams, ColumnFooterRenderParams } from './footer'
 import { ColumnEditRenderOptions, ColumnEditSlotParams } from './edit'
-import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from './export'
+import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams, ColumnExportHeaderRenderParams } from './export'
 import { TableOverflow } from './table'
 
 /**
@@ -121,6 +121,7 @@ export declare class Column extends VXETableComponent {
    * 是否可视
    */
   visible?: boolean;
+  headerExportMethod?(params: ColumnExportHeaderRenderParams): string | number;
   /**
    * 自定义单元格数据导出方法
    */
@@ -346,6 +347,8 @@ export class ColumnInfo {
   halfChecked: boolean;
   disabled: boolean;
   order: string;
+  sortTime: number
+  customOrder: number
   renderWidth: number;
   renderHeight: number;
   resizeWidth: number;

package/types/export.d.ts

@@ -81,6 +81,7 @@ export interface TableExportConfig {
    * 是否服务端导出
    */
   remote?: boolean;
+
   /**
    * 只对 remote=true 有效，用于自定义导出逻辑
    */
@@ -228,6 +229,10 @@ export interface ColumnExportCellRenderParams extends GridRenderParams {
   options: ExportParams;
 }
 
+export interface ColumnExportHeaderRenderParams extends GridRenderParams {
+  column: ColumnInfo;
+}
+
 export interface ColumnExportFooterRenderParams extends GridRenderParams {
   items: any[];
   _columnIndex: number;

package/types/form.d.ts

@@ -33,12 +33,12 @@ export declare class Form extends VXETableComponent {
    * 对表单执行项进行校验，参数为一个回调函数。该回调函数会在校验结束后被调用 callback(errMap)。若不传入回调函数，则会返回一个 promise
    * @param callback 回调函数
    */
-  validateField(callback?: (errMap?: FormValidErrMapParams) => void): Promise<any>;
+  validateField(field?: string | string[], callback?: (errMap?: FormValidErrMapParams) => void): Promise<any>;
   /**
    * 手动清除校验状态，如果指定 field 则清除指定的项，否则清除整个表单
    * @param field 字段名
    */
-  clearValidate(field?: string): Promise<any>;
+  clearValidate(field?: string | string[]): Promise<any>;
   /**
    * 更新项状态
    * 当使用自定义渲染时可能会用到
@@ -56,10 +56,6 @@ export declare class Form extends VXETableComponent {
   [key: string]: any;
 }
 
-export function FormValidatorMethod(params: FormValidErrParams): void;
-export function FormValidatorMethod(params: FormValidErrParams): Error;
-export function FormValidatorMethod(params: FormValidErrParams): Promise<any>;
-
 export interface FormRule {
   /**
    * 是否必填
@@ -85,7 +81,18 @@ export interface FormRule {
    * 使用自定义校验函数，接收一个 Promise
    * @param params 参数
    */
-  validator?: typeof FormValidatorMethod;
+  validator?(params: {
+    $form: Form,
+    itemValue: any,
+    rule: FormRule;
+    rules: FormRule[];
+    data: any;
+    field: string
+    /**
+     * @deprecated
+     */
+    property: string
+  }): void | Error | Promise<any>
   /**
    * 提示消息
    */
@@ -105,7 +112,6 @@ export interface FormValidErrParams {
   $form: Form,
   itemValue: any,
   rule: FormRule;
-  rules: FormRule[];
   data: any;
   field: string
   /**

package/types/toolbar.d.ts

@@ -21,6 +21,7 @@ export declare class Toolbar extends VXETableComponent {
   resizable?: boolean | {
     storage?: boolean;
   };
+
   /**
    * 刷新按钮配置
    */
@@ -29,6 +30,7 @@ export declare class Toolbar extends VXETableComponent {
     icon?: string;
     iconLoading?: string;
   };
+
   /**
    * 导入按钮配置
    */
@@ -36,6 +38,7 @@ export declare class Toolbar extends VXETableComponent {
     icon?: string;
     [key: string]: any;
   };
+
   /**
    * 导出按钮配置
    */
@@ -43,6 +46,7 @@ export declare class Toolbar extends VXETableComponent {
     icon?: string;
     [key: string]: any;
   };
+
   /**
    * 自定义列配置
    */
@@ -51,10 +55,17 @@ export declare class Toolbar extends VXETableComponent {
     immediate?: boolean;
     storage?: boolean;
     checkMethod?(params: { column: ColumnInfo }): boolean;
-    isFooter?: Boolean;
+    showFooter?: boolean;
     icon?: string;
+    /**
+     * 已废弃，请使用 showFooter
+     * @deprecated
+     */
+    isFooter?: boolean
+
     [key: string]: any;
   };
+
   /**
    * 按钮列表
    */
@@ -110,7 +121,7 @@ export interface ToolbarOptions {
     immediate?: boolean;
     storage?: boolean;
     checkMethod?(params: { column: ColumnInfo }): boolean;
-    isFooter?: Boolean;
+    isFooter?: boolean;
     icon?: string;
     [key: string]: any;
   };
@@ -130,14 +141,14 @@ export interface ToolbarOptions {
   [key: string]: any;
 }
 
-export interface ToolbarButtonsSlotParams extends GridRenderParams {}
-export interface ToolbarToolsSlotParams extends ToolbarButtonsSlotParams {}
+export type ToolbarButtonsSlotParams = GridRenderParams
+export type ToolbarToolsSlotParams = ToolbarButtonsSlotParams
 
 /**
  * 按钮渲染配置项
  */
-export interface ToolbarButtonRenderOptions extends RenderOptions {}
-export interface ToolbarToolRenderOptions extends RenderOptions {}
+export type ToolbarButtonRenderOptions = RenderOptions
+export type ToolbarToolRenderOptions = RenderOptions
 
 /**
  * 按钮渲染渲染参数