vxe-table 3.7.0-beta.8 → 3.7.0-beta.9

package/styles/table.scss

@@ -1300,6 +1300,13 @@
   }
 }
 
+.vxe-table--tooltip-wrapper {
+  &.vxe-table--valid-error {
+    background-color: #f56c6c;
+    color: #fff;
+  }
+}
+
 /*footer*/
 .vxe-table--footer-wrapper {
   color: $vxe-table-footer-font-color;

package/styles/tooltip.scss

@@ -125,11 +125,3 @@
     }
   }
 }
-
-/*valid error*/
-.vxe-table--tooltip-wrapper {
-  &.vxe-table--valid-error {
-    background-color: #f56c6c;
-    color: #fff;
-  }
-}

package/types/all.d.ts

@@ -1,9 +1,9 @@
 import Vue from 'vue'
 
 import { ModalController } from './modal'
-import { VXETableSetupOptions, VXETableCore, VxeGlobalTranslate, VxeGlobalI18n } from './v-x-e-table'
+import { VXETableConfigOptions, VXETableCore, VxeGlobalTranslate, VxeGlobalI18n } from './v-x-e-table'
 
-export function install(app: typeof Vue, options?: VXETableSetupOptions): void;
+export function install(app: typeof Vue, options?: VXETableConfigOptions): void;
 
 export interface VXETableClipboard {
   text: string;

package/types/table.d.ts

@@ -1390,26 +1390,41 @@ export type ExpandConfig = TableExpandConfig
  * 树形结构配置项
  */
 export interface TableTreeConfig {
-  children?: string;
+  childrenField?: string;
   indent?: number;
-  line?: boolean;
+  showLine?: boolean;
   expandAll?: boolean;
   expandRowKeys?: string[] | number[];
   accordion?: boolean;
   trigger?: 'default' | 'cell' | 'row' | '';
   lazy?: boolean;
-  hasChild?: string;
+  hasChildField?: string;
   loadMethod?(params: { row: RowInfo }): Promise<any[]>;
   toggleMethod?(params: { expanded: boolean, row: RowInfo, column: ColumnInfo, columnIndex: number, $columnIndex: number }): boolean;
   showIcon?: boolean;
   iconOpen?: string;
   iconClose?: string;
   iconLoaded?: string;
+  /**
+   * 已废弃，请使用 showLine
+   * @deprecated
+   */
+  line?: boolean;
+  /**
+   * 已废弃，请使用 hasChildField
+   * @deprecated
+   */
+  hasChild: string;
+  /**
+   * 已废弃，请使用 childrenField
+   * @deprecated
+   */
+  children?: string
 }
 export type TreeConfig = TableTreeConfig
 
 export interface TreeOpts {
-  children: string;
+  childrenField: string;
   indent: number;
   line?: boolean;
   expandAll?: boolean;
@@ -1418,6 +1433,7 @@ export interface TreeOpts {
   trigger?: 'default' | 'cell' | 'row' | '';
   lazy?: boolean;
   hasChild: string;
+  hasChildField: string;
   loadMethod?(params: { row: RowInfo }): Promise<any[]>;
   toggleMethod?(params: { expanded: boolean, row: RowInfo, column: ColumnInfo, columnIndex: number, $columnIndex: number }): boolean;
   showIcon: boolean;

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

@@ -4,7 +4,7 @@ import { ColumnInfo } from '../column'
 
 export namespace VxeGlobalFormatsHandles {
   export interface FormatsOptions {
-    formatMethod?: (params: FormatMethodParams, ...args: any[]) => string | number
+    cellFormatMethod?: (params: FormatMethodParams, ...args: any[]) => string | number
   }
   export interface FormatMethodParams {
     cellValue: any

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

@@ -9,7 +9,7 @@ import { VxeGlobalCommands } from './commands'
 import { VxeGlobalFormats } from './formats'
 import { VxeGlobalMenus } from './menus'
 import { VxeGlobalValidators } from './validators'
-import { VxeGlobalSetup } from './setup'
+import { VxeGlobalConfigMethod } from './setup'
 
 /* eslint-disable no-use-before-define */
 
@@ -17,7 +17,7 @@ export type VxeGlobalI18n = (key: string, args?: any) => number | string;
 export type VxeGlobalTranslate = (key: string, args?: any) => string;
 export type VxeGlobalUse = (plugin: VXETablePluginObject, ...options: any[]) => VXETableCore;
 
-export const setup: VxeGlobalSetup
+export const setup: VxeGlobalConfigMethod
 export const interceptor: VxeGlobalInterceptor
 export const renderer: VxeGlobalRenderer
 export const commands: VxeGlobalCommands
@@ -53,7 +53,7 @@ export interface VXETableCore {
   /**
    * 设置全局参数/获取所有参数
    */
-  setup: VxeGlobalSetup;
+  setup: VxeGlobalConfigMethod;
   /**
    * Table interceptor
    */

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

@@ -5,7 +5,7 @@ interface DefaultOptions {
   [key: string]: any;
 }
 
-export interface VXETableSetupOptions {
+export interface VXETableConfigOptions {
   size?: SizeType;
   zIndex?: number;
   version?: number;
@@ -39,36 +39,13 @@ export interface VXETableSetupOptions {
   [key: string]: any;
 }
 
-export interface VXETableGlobalConfig extends VXETableSetupOptions {
-  size: SizeType;
-  zIndex: number;
-  version: number;
-  emptyCell: string;
-  icon: {
-    [key: string]: string;
-  };
-  table: any;
-  grid: any;
-  export: {
-    types: {
-      [key: string]: 0 | 1 | 2;
-    }
-    [key: string]: any;
-  };
-  tooltip: DefaultOptions;
-  pager: any;
-  form: DefaultOptions;
-  input: DefaultOptions;
-  textarea: DefaultOptions;
-  select: DefaultOptions;
-  toolbar: any;
-  button: DefaultOptions;
-  radio: DefaultOptions;
-  checkbox: DefaultOptions;
-  switch: DefaultOptions;
-  modal: DefaultOptions;
-  list: DefaultOptions;
-  i18n(key: string, args?: any): string;
-}
+export type VxeGlobalConfigMethod = (options?: VXETableConfigOptions) => Required<VXETableConfigOptions>
 
-export type VxeGlobalSetup = (options?: VXETableSetupOptions) => VXETableGlobalConfig;
+/**
+ * @deprecated
+ */
+export type VXETableSetupOptions = VXETableConfigOptions
+/**
+ * @deprecated
+ */
+export type VxeGlobalSetup = VxeGlobalConfigMethod;