vxe-table 4.1.0-beta.0 → 4.1.2

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 指定行
+   */
+  reloadRowExpand(row: any): Promise<any>;
+  /**
+   * @deprecated 已废弃，请使用 reloadRowExpand
    */
-  reloadExpandContent(rows: any | any[]): Promise<any>;
+  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>;
+  reloadTreeExpand(row: any): Promise<any>;
+  /**
+   * @deprecated 已废弃，请使用 reloadTreeExpand
+   */
+  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;

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;