vxe-table 3.5.8 → 3.5.9-beta.10

package/styles/toolbar.scss

@@ -7,6 +7,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  padding: 0.6em 0;
   color: $vxe-font-color;
   font-family: $vxe-font-family;
   background-color: $vxe-toolbar-background-color;
@@ -64,12 +65,19 @@
       justify-content: center;
     }
   }
+  .vxe-buttons--wrapper,
   .vxe-tools--wrapper,
   .vxe-tools--operate {
     display: flex;
-    flex-shrink: 0;
     align-items: center;
   }
+  .vxe-buttons--wrapper,
+  .vxe-tools--wrapper {
+    flex-wrap: wrap;
+  }
+  .vxe-tools--operate {
+    flex-shrink: 0;
+  }
   .vxe-custom--wrapper {
     position: relative;
     margin-left: 0.8em;
@@ -171,7 +179,6 @@
 
 .vxe-toolbar {
   font-size: $vxe-font-size;
-  height: $vxe-toolbar-height-default;
   .vxe-custom--option {
     & > .vxe-checkbox--icon {
       font-size: $vxe-checkbox-font-size-default;
@@ -179,7 +186,6 @@
   }
   &.size--medium {
     font-size: $vxe-font-size-medium;
-    height: $vxe-toolbar-height-medium;
     .vxe-custom--option {
       & > .vxe-checkbox--icon {
         font-size: $vxe-checkbox-font-size-medium;
@@ -188,7 +194,6 @@
   }
   &.size--small {
     font-size: $vxe-font-size-small;
-    height: $vxe-toolbar-height-small;
     .vxe-custom--option {
       & > .vxe-checkbox--icon {
         font-size: $vxe-checkbox-font-size-small;
@@ -197,7 +202,6 @@
   }
   &.size--mini {
     font-size: $vxe-font-size-mini;
-    height: $vxe-toolbar-height-mini;
     .vxe-custom--option {
       & > .vxe-checkbox--icon {
         font-size: $vxe-checkbox-font-size-mini;

package/styles/v-x-e-table.scss

@@ -1 +1,3 @@
 /**Variable**/
+@import './icon.scss';
+@import './loading.scss';

package/styles/variable.scss

@@ -121,10 +121,6 @@ $vxe-grid-maximize-background-color: #fff !default;
 
 /*toolbar*/
 $vxe-toolbar-background-color: #fff !default;
-$vxe-toolbar-height-default: 52px !default;
-$vxe-toolbar-height-medium: 50px !default;
-$vxe-toolbar-height-small: 48px !default;
-$vxe-toolbar-height-mini: 46px !default;
 $vxe-toolbar-custom-active-background-color: #D9DADB !default;
 $vxe-toolbar-panel-background-color: #fff !default;
 

package/types/form-item.d.ts

@@ -45,7 +45,7 @@ export class FormItem extends VXETableComponent {
   /**
    * 该方法的返回值用来决定该项是否显示
    */
-  visibleMethod?(params: { data: any, property: string }): boolean;
+  visibleMethod?(params: { data: any, field: string }): boolean;
   /**
    * 默认收起
    */
@@ -100,7 +100,7 @@ export interface FormItemOptions {
   /**
    * 该方法的返回值用来决定该项是否显示
    */
-  visibleMethod?(params: { data: any, property: string }): boolean;
+  visibleMethod?(params: { data: any, field: string }): boolean;
   /**
    * 默认收起
    */
@@ -164,10 +164,11 @@ export interface FormItemRenderParams extends RenderParams {
    * 表单数据
    */
   data: any;
+  field: string
   /**
-   * 字段名
+   * @deprecated
    */
-  property: string;
+  property: string
 }
 
 /**
@@ -182,10 +183,11 @@ export interface FormItemVisibleParams extends RenderParams {
    * 表单数据
    */
   data: any;
+  field: string
   /**
-   * 字段名
+   * @deprecated
    */
-  property: string;
+  property: string
 }
 
 /**
@@ -200,8 +202,9 @@ export interface FormItemResetParams extends RenderParams {
    * 表单数据
    */
   data: any;
+  field: string
   /**
-   * 字段名
+   * @deprecated
    */
-  property: string;
+  property: string
 }

package/types/form.d.ts

@@ -107,8 +107,11 @@ export interface FormValidErrParams {
   rule: FormRule;
   rules: FormRule[];
   data: any;
-  property: string;
-  field: string;
+  field: string
+  /**
+   * @deprecated
+   */
+  property: string
 }
 
 export interface FormValidErrMapParams {

package/types/table.d.ts

@@ -1426,6 +1426,11 @@ export interface TableEditConfig {
   /**
    * 该方法的返回值用来决定该单元格是否允许编辑
    */
+  beforeEditMethod?(params: { row: RowInfo, rowIndex: number, column: ColumnInfo, columnIndex: number }): boolean;
+  /**
+   * 请使用 beforeEditMethod
+   * @deprecated
+   */
   activeMethod?(params: { row: RowInfo, rowIndex: number, column: ColumnInfo, columnIndex: number }): boolean;
 }
 export interface EditConfig extends TableEditConfig {}

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

@@ -21,9 +21,20 @@ export interface VxeGlobalRenderer {
 }
 
 export interface RendererMapOptions {
-  // 筛选渲染
+  /**
+   * 请使用 filterClassName
+   * @deprecated
+   */
   className?: string;
+  /**
+   * 请使用 showFilterFooter
+   * @deprecated
+   */
   isFooter?: boolean;
+
+  // 筛选渲染
+  filterClassName?: string | ((params: ColumnFilterRenderParams) => string | { [key: string]: boolean })
+  showFilterFooter?: boolean;
   renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
   filterMethod?(params: ColumnFilterMethodParams): boolean;
   filterResetMethod?(params: ColumnFilterResetParams): void;
@@ -31,6 +42,7 @@ export interface RendererMapOptions {
   defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
 
   // 单元格渲染
+  cellClassName?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => string | { [key: string]: boolean })
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): VNode[] | string[];
@@ -38,7 +50,7 @@ export interface RendererMapOptions {
   footerExportMethod?(params: ColumnExportFooterRenderParams): string;
 
   // 编辑渲染
-  autofocus?: string;
+  autofocus?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => HTMLElement | null);
   renderEdit?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderCell?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
 
@@ -50,6 +62,7 @@ export interface RendererMapOptions {
   renderToolbarTool?(h: CreateElement, renderOpts: ToolbarToolRenderOptions, params: ToolbarToolRenderParams): VNode[] | string[];
 
   // 表单-项渲染
+  itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
   renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
   renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
   itemVisibleMethod?(params: FormItemVisibleParams): boolean;