vxe-table 4.0.30 → 4.1.1

package/styles/header.scss

@@ -14,7 +14,7 @@
   /*排序*/
   .vxe-cell--sort {
     width: 1.5em;
-    height: 1.5em;
+    height: 1.35em;
     vertical-align: middle;
     text-align: center;
     display: inline-block;
@@ -36,10 +36,10 @@
     }
   }
   .vxe-sort--asc-btn {
-    top: -0.04em;
+    top: -0.15em;
   }
   .vxe-sort--desc-btn {
-    bottom: -0.04em;
+    bottom: -0.15em;
   }
 }
 
@@ -80,12 +80,12 @@
       top: 0.2em;
     }
   }
-  .vxe-cell--required-icon,
-  .vxe-cell--edit-icon,
-  .vxe-cell-help-icon,
-  .vxe-cell--title {
-    vertical-align: middle;
-  }
+  // .vxe-cell--required-icon,
+  // .vxe-cell--edit-icon,
+  // .vxe-cell-help-icon,
+  // .vxe-cell--title {
+  //   vertical-align: middle;
+  // }
   .vxe-cell--required-icon {
     margin-right: 0.1em;
   }
@@ -96,9 +96,6 @@
   .vxe-cell-help-icon {
     cursor: help;
   }
-  .vxe-cell--title {
-    line-height: 1.5;
-  }
   .vxe-resizable {
     position: absolute;
     right: -7px;

package/styles/table.scss

@@ -959,7 +959,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-medium;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-medium;
     }
@@ -975,7 +977,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-small;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-small;
     }
@@ -991,7 +995,9 @@
         }
       }
     }
-    .vxe-cell--checkbox .vxe-checkbox--icon,
+    .vxe-cell--checkbox .vxe-checkbox--icon {
+      font-size: $vxe-checkbox-font-size-mini;
+    }
     .vxe-cell--radio .vxe-radio--icon {
       font-size: $vxe-radio-font-size-mini;
     }

package/styles/variable.scss

@@ -19,7 +19,7 @@ $vxe-success-color: #67c23a !default;
 $vxe-info-color: #909399 !default;
 $vxe-warning-color: #e6a23c !default;
 $vxe-danger-color: #f56c6c !default;
-$vxe-disabled-color: #9e7d7d !default;
+$vxe-disabled-color: #BFBFBF !default;
 $vxe-primary-disabled-color: #c0c4cc !default;
 
 /*input/radio/checkbox*/
@@ -51,7 +51,7 @@ $vxe-table-row-height-default: 48px !default;
 $vxe-table-row-height-medium: 44px !default;
 $vxe-table-row-height-small: 40px !default;
 $vxe-table-row-height-mini: 36px !default;
-$vxe-table-row-line-height: 24px !default;
+$vxe-table-row-line-height: 22px !default;
 $vxe-table-row-hover-background-color: #f5f7fa !default;
 $vxe-table-row-striped-background-color: #fafafa !default;
 $vxe-table-row-hover-striped-background-color: #f5f7fa !default;

package/types/column.d.ts

@@ -104,8 +104,12 @@ export namespace VxeColumnPropTypes {
   export type FooterExportMethod = (params: FooterExportParams) => string | number;
 
   export interface TitleHelp {
-    message?: string | number;
+    content?: string | number;
     icon?: string;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
 
   export type CellType = 'auto' | 'number' | 'string';

package/types/form-item.d.ts

@@ -92,10 +92,14 @@ export namespace VxeFormItemPropTypes {
   export type ClassName = string | ((params: ClassNameParams) => string);
 
   interface PrefixOption {
-    message?: string;
+    content?: string;
     enterable?: boolean;
     theme?: string;
     icon?: string;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
   export type TitlePrefix = PrefixOption
   export type TitleSuffix = PrefixOption

package/types/form.d.ts

@@ -235,9 +235,13 @@ export namespace VxeFormDefines {
     /**
      * 提示消息
      */
-    message?: string;
+    content?: string;
     trigger?: 'change';
     maxWidth?: number;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
 
   interface ValidateErrorParams {

package/types/grid.d.ts

@@ -288,6 +288,7 @@ export namespace VxeGridDefines {
   export interface FooterCellMenuEventParams extends GridEventParams, VxeTableDefines.FooterCellMenuEventParams { }
   export interface SortChangeEventParams extends GridEventParams, VxeTableDefines.SortChangeEventParams { }
   export interface FilterChangeEventParams extends GridEventParams, VxeTableDefines.FilterChangeEventParams { }
+  export interface FilterVisibleEventParams extends GridEventParams, VxeTableDefines.FilterVisibleEventParams { }
   export interface ResizableChangeEventParams extends GridEventParams, VxeTableDefines.ResizableChangeEventParams { }
   export interface ToggleRowExpandEventParams extends GridEventParams, VxeTableDefines.ToggleRowExpandEventParams { }
   export interface ToggleTreeExpandEventParams extends GridEventParams, VxeTableDefines.ToggleTreeExpandEventParams { }
@@ -349,6 +350,7 @@ export interface VxeGridEventProps {
   onFooterCellMenu?: VxeGridEvents.FooterCellMenu;
   onSortChange?: VxeGridEvents.SortChange;
   onFilterChange?: VxeGridEvents.FilterChange;
+  onFilterVisible?: VxeGridEvents.FilterVisible;
   onResizableChange?: VxeGridEvents.ResizableChange;
   onToggleRowExpand?: VxeGridEvents.ToggleRowExpand;
   onToggleTreeExpand?: VxeGridEvents.ToggleTreeExpand;
@@ -396,6 +398,7 @@ export interface VxeGridListeners {
   footerCellMenu?: VxeGridEvents.FooterCellMenu;
   sortChange?: VxeGridEvents.SortChange;
   filterChange?: VxeGridEvents.FilterChange;
+  filterVisible?: VxeGridEvents.FilterVisible;
   resizableChange?: VxeGridEvents.ResizableChange;
   toggleRowExpand?: VxeGridEvents.ToggleRowExpand;
   toggleTreeExpand?: VxeGridEvents.ToggleTreeExpand;
@@ -443,6 +446,7 @@ export namespace VxeGridEvents {
   export type FooterCellMenu = (params: VxeGridDefines.FooterCellMenuEventParams) => void;
   export type SortChange = (params: VxeGridDefines.SortChangeEventParams) => void;
   export type FilterChange = (params: VxeGridDefines.FilterChangeEventParams) => void;
+  export type FilterVisible = (params: VxeGridDefines.FilterVisibleEventParams) => void;
   export type ResizableChange = (params: VxeGridDefines.ResizableChangeEventParams) => void;
   export type ToggleRowExpand = (params: VxeGridDefines.ToggleRowExpandEventParams) => void;
   export type ToggleTreeExpand = (params: VxeGridDefines.ToggleTreeExpandEventParams) => void;

package/types/modal.d.ts

@@ -167,11 +167,6 @@ export type VxeModalProps = {
   position?: VxeModalPropTypes.Position;
   title?: VxeModalPropTypes.Title;
   duration?: VxeModalPropTypes.Duration;
-  /**
-   * 请使用 content
-   * @deprecated
-   */
-  message?: VxeModalPropTypes.Content;
   content?: VxeModalPropTypes.Content;
   cancelButtonText?: VxeModalPropTypes.CancelButtonText;
   confirmButtonText?: VxeModalPropTypes.ConfirmButtonText;
@@ -203,6 +198,10 @@ export type VxeModalProps = {
   animat?: VxeModalPropTypes.Animat;
   beforeHideMethod?: VxeModalPropTypes.BeforeHideMethod;
   slots?: VxeModalPropTypes.Slots;
+  /**
+   * @deprecated 已废弃，请使用 content
+   */
+  message?: VxeModalPropTypes.Content;
 }
 
 export type ModalSlots = {

package/types/table.d.ts

@@ -55,6 +55,8 @@ export interface TablePrivateComputed {
   computeValidOpts: ComputedRef<VxeTablePropTypes.ValidOpts>;
   computeSXOpts: ComputedRef<VxeTablePropTypes.SXOpts>;
   computeSYOpts: ComputedRef<VxeTablePropTypes.SYOpts>;
+  computeColumnOpts: ComputedRef<VxeTablePropTypes.ColumnOpts>;
+  computeRowOpts: ComputedRef<VxeTablePropTypes.RowOpts>;
   computeResizableOpts: ComputedRef<VxeTablePropTypes.ResizableOpts>;
   computeSeqOpts: ComputedRef<VxeTablePropTypes.SeqOpts>;
   computeRadioOpts: ComputedRef<VxeTablePropTypes.RadioOpts>;
@@ -127,7 +129,7 @@ export interface TablePublicMethods {
    * @param row 行对象
    * @param children 子节点
    */
-  loadChildren(row: any, children: any[]): Promise<any[]>;
+  loadTreeChildren(row: any, children: any[]): Promise<any[]>;
   /**
    * 加载列配置
    * @param columns 列对象
@@ -488,10 +490,14 @@ export interface TablePublicMethods {
    */
   clearRowExpandLoaded(row: any): Promise<any>;
   /**
-   * 用于懒加载展开行，重新加载展开行的内容
-   * @param rows 指定行
+   * 重新懒加载展开行，并展开内容
+   * @param row 指定行
    */
-  reloadExpandContent(rows: any | any[]): Promise<any>;
+  lazyExpandContent(row: any): Promise<any>;
+  /**
+   * @deprecated 已废弃，请使用 lazyExpandContent
+   */
+  reloadExpandContent(row: any): Promise<any>;
   /**
    * 用于 type=expand，切换展开行的状态
    * @param row 指定行
@@ -540,10 +546,14 @@ export interface TablePublicMethods {
    */
   clearTreeExpandLoaded(row: any): Promise<any>;
   /**
-   * 用于懒加载树表格，重新加载子节点
+   * 重新懒加载树节点，并展开该节点
    * @param rows 指定行
    */
-  reloadTreeChilds(rows: any | any[]): Promise<any>;
+  lazyTreeChildren(row: any): Promise<any>;
+  /**
+   * @deprecated 已废弃，请使用 lazyTreeChildren
+   */
+  reloadTreeChilds(row: any): Promise<any>;
   /**
    * 用于 tree-config，切换展开树形节点的状态
    * @param row 指定行
@@ -660,7 +670,7 @@ export interface TablePrivateMethods {
   getExcludeHeight(): number;
   defineField(record: any): any;
   handleTableData(force?: boolean): Promise<any>;
-  updateCache(isSource?: boolean): void;
+  cacheRowMap(isSource?: boolean): void;
   saveCustomResizable(isReset?: boolean): void;
   saveCustomVisible(): void;
   analyColumnWidth(): void;
@@ -946,6 +956,7 @@ export interface TableInternalData {
   afterFullData: any[];
   tableSynchData: any[];
   tableSourceData: any[];
+  treeFullData: any[];
   // 收集的列配置（带分组）
   collectColumn: VxeTableDefines.ColumnInfo[],
   // 完整所有列（不带分组）
@@ -962,6 +973,7 @@ export interface TableInternalData {
       _index: number;
       items: any[];
       parent: any;
+      level: number;
       treeLoaded?: boolean;
       expandLoaded?: boolean;
       formatData?: {
@@ -981,6 +993,7 @@ export interface TableInternalData {
       _index: number;
       items: any[];
       parent: any;
+      level: number;
     }
   };
   fullColumnIdData: {
@@ -1192,14 +1205,23 @@ export namespace VxeTablePropTypes {
   export type SyncResize = boolean | string | number;
 
   /**
-   * 列的默认配置
+   * 列配置信息
    */
   export interface ColumnConfig {
-    width?: number;
-    minWidth?: number;
+    resizable?: VxeColumnPropTypes.Resizable;
+    width?: VxeColumnPropTypes.Width;
+    minWidth?: VxeColumnPropTypes.MinWidth;
   }
   export interface ColumnOpts extends ColumnConfig { }
 
+  /**
+   * 行配置信息
+   */
+  export interface RowConfig {
+    height?: number;
+  }
+  export interface RowOpts extends RowConfig { }
+
   /**
    * 自定义列配置项
    */
@@ -1212,6 +1234,9 @@ export namespace VxeTablePropTypes {
   }
   export interface CustomOpts extends CustomConfig { }
 
+  /**
+   * 列调整配置项
+   */
   export interface ResizableConfig {
     minWidth?: number | string | ((params: {
       $table: VxeTableConstructor & VxeTablePrivateMethods;
@@ -1389,6 +1414,9 @@ export namespace VxeTablePropTypes {
    * 树形结构配置项
    */
   export interface TreeConfig {
+    transform?: boolean;
+    rowtKey?: string;
+    parentKey?: string;
     children?: string;
     indent?: number;
     line?: boolean;
@@ -1417,6 +1445,8 @@ export namespace VxeTablePropTypes {
     iconLoaded?: string;
   }
   export interface TreeOpts extends TreeConfig {
+    rowtKey: string;
+    parentKey: string;
     children: string;
     indent: number;
     hasChild: string;
@@ -1906,6 +1936,7 @@ export type VxeTableProps<D = any> = {
   autoResize?: VxeTablePropTypes.AutoResize;
   syncResize?: VxeTablePropTypes.SyncResize;
   columnConfig?: VxeTablePropTypes.ColumnConfig;
+  rowConfig?: VxeTablePropTypes.RowConfig;
   customConfig?: VxeTablePropTypes.CustomConfig;
   resizableConfig?: VxeTablePropTypes.ResizableConfig;
   seqConfig?: VxeTablePropTypes.SeqConfig;
@@ -1966,6 +1997,7 @@ export type VxeTableEmits = [
   'sort-change',
   'clear-sort',
   'filter-change',
+  'filter-visible',
   'clear-filter',
   'resizable-change',
   'toggle-row-expand',
@@ -2269,10 +2301,18 @@ export namespace VxeTableDefines {
     datas: any[];
   }
   export interface FilterChangeParams extends FilterCheckedParams {
-    filterList: FilterCheckedParams[]
+    filterList: FilterCheckedParams[];
   }
   export interface FilterChangeEventParams extends TableEventParams, FilterChangeParams { }
 
+  export interface FilterVisibleParams {
+    column: VxeTableDefines.ColumnInfo;
+    property: VxeColumnPropTypes.Field;
+    filterList: FilterCheckedParams[];
+    visible: boolean;
+  }
+  export interface FilterVisibleEventParams extends TableEventParams, FilterVisibleParams { }
+
   export interface ResizableChangeParams extends TableBaseHeaderCellParams { }
   export interface ResizableChangeEventParams extends TableEventParams, ResizableChangeParams { }
 
@@ -2344,6 +2384,7 @@ export interface VxeTableEventProps {
   onFooterCellMenu?: VxeTableEvents.FooterCellMenu;
   onSortChange?: VxeTableEvents.SortChange;
   onFilterChange?: VxeTableEvents.FilterChange;
+  onFilterVisible?: VxeTableEvents.FilterVisible;
   onResizableChange?: VxeTableEvents.ResizableChange;
   onToggleRowExpand?: VxeTableEvents.ToggleRowExpand;
   onToggleTreeExpand?: VxeTableEvents.ToggleTreeExpand;
@@ -2418,6 +2459,7 @@ export namespace VxeTableEvents {
   export type FooterCellMenu = (params: VxeTableDefines.FooterCellMenuEventParams) => void;
   export type SortChange = (params: VxeTableDefines.SortChangeEventParams) => void;
   export type FilterChange = (params: VxeTableDefines.FilterChangeEventParams) => void;
+  export type FilterVisible = (params: VxeTableDefines.FilterVisibleEventParams) => void;
   export type ResizableChange = (params: VxeTableDefines.ResizableChangeEventParams) => void;
   export type ToggleRowExpand = (params: VxeTableDefines.ToggleRowExpandEventParams) => void;
   export type ToggleTreeExpand = (params: VxeTableDefines.ToggleTreeExpandEventParams) => void;

package/types/validator.d.ts

@@ -70,9 +70,13 @@ declare module './table' {
       /**
        * 提示消息
        */
-      message?: string;
+      content?: string;
       trigger?: 'blur' | 'change' | 'manual';
       maxWidth?: number;
+      /**
+       * @deprecated 已废弃，请使用 content
+       */
+      message?: string;
     }
     export interface ValidatorErrorParams {
       $table: VxeTableConstructor;