@vue-start/pro 0.5.67 → 0.5.69

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="lodash" />
 import * as vue from 'vue';
-import { VNode, ExtractPropTypes, PropType, DefineComponent, ComputedRef, App, UnwrapNestedRefs as UnwrapNestedRefs$1, Ref as Ref$1 } from 'vue';
-import * as _vue_reactivity from '@vue/reactivity';
-import { UnwrapNestedRefs, Ref, UnwrapRef, ComputedRef as ComputedRef$1 } from '@vue/reactivity';
-import { Subject } from 'rxjs';
+import { VNode, ExtractPropTypes, ComputedRef, UnwrapNestedRefs, PropType, App, Ref as Ref$1, UnwrapRef, DefineComponent } from 'vue';
 import { IRequestActor } from '@vue-start/request';
+import * as _vue_reactivity from '@vue/reactivity';
+import { Ref, UnwrapNestedRefs as UnwrapNestedRefs$1, UnwrapRef as UnwrapRef$1, ComputedRef as ComputedRef$1 } from '@vue/reactivity';
 import * as _vue_start_store from '@vue-start/store';
 import { TUpdater } from '@vue-start/store';
 import * as vue_router from 'vue-router';
 import { Router, RouteLocationNormalizedLoaded } from 'vue-router';
+import { Subject } from 'rxjs';
 import * as lodash from 'lodash';
 import { TTableMergeOpts, TConvert } from '@vue-start/hooks';
 
@@ -32,6 +32,19 @@ declare type TRender = (opts: {
     record: any;
     column?: TColumn;
 }) => VNode | string | number;
+declare type TSetData = {
+    type: string;
+    path: string | string[];
+};
+declare type TSetDataMeta = Omit<TSetData, "type"> & {
+    type: "meta";
+    actorName: string;
+    params?: Record<string, any>;
+};
+declare type TSetDataStore = Omit<TSetData, "type"> & {
+    type: "store";
+    storeName: string;
+};
 declare type TColumn = {
     title?: string | VNode;
     dataIndex?: string | number;
@@ -52,13 +65,28 @@ declare type TColumn = {
     descRender?: string | TRender;
     formReadRender?: string | TRender;
     tableRender?: string | TRender;
+    /************ 标记 ************ */
     search?: boolean;
+    /************ 表格列宽度 ************ */
     width?: number;
     minWidth?: number;
+    /************ column 数据补充 ************ */
+    setData?: (TSetDataMeta | TSetDataStore)[];
+    paths?: string | string[];
+    /************ form extra 数据补充 ************ */
+    formExtra?: {
+        label?: {
+            name: string;
+            opts?: {
+                showAllPath?: boolean;
+            };
+        };
+    };
     extra?: {
         desc?: Record<string, any>;
         col?: Record<string, any>;
     } & Record<string, any>;
+    children?: TColumns;
 };
 declare type TColumns = TColumn[];
 /**
@@ -192,6 +220,11 @@ declare const getColumnValueType: (column: TColumn) => TValueType;
  * @param column
  */
 declare const getColumnFormItemName: (column: TColumn) => string | number | undefined;
+/**
+ * 获取Column的FormItem props
+ * @param column
+ */
+declare const getColumnFormInputProps: (column: TColumn) => Record<string, any>;
 /**
  * 获取column 中对应的render方法
  * case1：render为方法的时候，直接返回render；
@@ -285,192 +318,6 @@ declare const Wrapper: vue.DefineComponent<{
     elementConfig: IElementConfig;
 }>, {}>;
 
-interface IProModuleProvide {
-    elementMap: TElementMap;
-    subject$: Subject<TActionEvent>;
-    sendEvent: (action: TActionEvent) => void;
-    state: UnwrapNestedRefs<Record<string, any>>;
-    dispatch: (action: TActionState) => void;
-    data: Record<string, any>;
-    requests: IRequestOpts[];
-    sendRequest: (requestNameOrAction: string, ...params: any[]) => void;
-    executeExp: (param: TExpression, args: any) => any;
-    execute: (executeList: TExecuteItem[], args: any[]) => void;
-}
-declare const useProModule: () => IProModuleProvide;
-declare const provideProModule: (ctx: IProModuleProvide) => void;
-declare const useModuleEvent: (cb: (action: TActionEvent) => void) => void;
-interface IRequestOpts {
-    actor: IRequestActor;
-    /**
-     * 如果设置action，可以使用该值发起请求 住：要保证唯一性
-     * 设置该字段原因：因为actor中的name不友好，可以理解为一个备选方案
-     */
-    action?: string;
-    stateName?: string;
-    loadingName?: string;
-    convertParams?: (...params: any[]) => Record<string, any>;
-    convertParamsEx?: TExpression;
-    convertData?: (actor: IRequestActor) => Record<string, any>;
-    convertDataEx?: TExpression;
-    onSuccess?: (actor?: IRequestActor) => void;
-    onSuccessEx?: TExecuteItem[];
-    onFailed?: (actor?: IRequestActor) => void;
-    onFailedEx?: TExecuteItem[];
-}
-declare const RequestAction: {
-    Success: string;
-    Fail: string;
-};
-declare const proModuleProps: () => {
-    /**
-     * module状态
-     */
-    state: {
-        type: PropType<Record<string, any>>;
-    };
-    initState: {
-        type: PropType<object>;
-    };
-    /**
-     * store names
-     */
-    storeKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * meta names
-     */
-    metasKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * 组件集
-     */
-    elementMap: {
-        type: PropType<TElementMap>;
-    };
-    /**
-     * 组件描述（树）
-     */
-    elementConfigs: {
-        type: PropType<IElementConfig | IElementConfig[]>;
-    };
-    /**
-     * requests
-     */
-    actors: {
-        type: PropType<IRequestActor<any, any, any>[]>;
-    };
-    requests: {
-        type: PropType<IRequestOpts[]>;
-    };
-};
-declare type ProModuleProps = Partial<ExtractPropTypes<ReturnType<typeof proModuleProps>>>;
-declare const ProModule: vue.DefineComponent<Partial<ExtractPropTypes<{
-    /**
-     * module状态
-     */
-    state: {
-        type: PropType<Record<string, any>>;
-    };
-    initState: {
-        type: PropType<object>;
-    };
-    /**
-     * store names
-     */
-    storeKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * meta names
-     */
-    metasKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * 组件集
-     */
-    elementMap: {
-        type: PropType<TElementMap>;
-    };
-    /**
-     * 组件描述（树）
-     */
-    elementConfigs: {
-        type: PropType<IElementConfig | IElementConfig[]>;
-    };
-    /**
-     * requests
-     */
-    actors: {
-        type: PropType<IRequestActor<any, any, any>[]>;
-    };
-    requests: {
-        type: PropType<IRequestOpts[]>;
-    };
-}>>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<Partial<ExtractPropTypes<{
-    /**
-     * module状态
-     */
-    state: {
-        type: PropType<Record<string, any>>;
-    };
-    initState: {
-        type: PropType<object>;
-    };
-    /**
-     * store names
-     */
-    storeKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * meta names
-     */
-    metasKeys: {
-        type: PropType<string[]>;
-    };
-    /**
-     * 组件集
-     */
-    elementMap: {
-        type: PropType<TElementMap>;
-    };
-    /**
-     * 组件描述（树）
-     */
-    elementConfigs: {
-        type: PropType<IElementConfig | IElementConfig[]>;
-    };
-    /**
-     * requests
-     */
-    actors: {
-        type: PropType<IRequestActor<any, any, any>[]>;
-    };
-    requests: {
-        type: PropType<IRequestOpts[]>;
-    };
-}>>>, {}>;
-
-declare type TConfigData = {
-    initState?: Record<string, any>;
-    initExecuteList?: TExecuteItem[];
-    storeKeys?: string[];
-    requests?: Omit<IRequestOpts, "actor"> & {
-        actor: string;
-    }[];
-    elementConfigs?: IElementConfig | IElementConfig[];
-};
-declare const createModule: ({ actors, configData, configDataExtra, Logic, }: {
-    actors?: IRequestActor<any, any, any>[] | undefined;
-    configData?: TConfigData | undefined;
-    configDataExtra?: Record<string, any> | undefined;
-    Logic?: DefineComponent<{}, {}, {}, vue.ComputedOptions, vue.MethodOptions, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{}>>, {}> | undefined;
-}) => DefineComponent<unknown, () => JSX.Element | null, {}, vue.ComputedOptions, vue.MethodOptions, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<unknown>, {}>;
-
 declare type TInitialState<T> = T | (() => T);
 declare type TRegisterStore = {
     key: string;
@@ -487,36 +334,12 @@ declare const useDispatchStore: <T>() => (key: string, stateOrUpdater: T | TUpda
  * 返回ref对象
  */
 declare const useReadStore: (key: string) => _vue_reactivity.Ref<any>;
-
-declare const useDoneRequestActor: (actors: (IRequestActor | string)[], callback: (actor: IRequestActor) => void) => void;
-declare const useFailedRequestActor: (actors: (IRequestActor | string)[], callback: (actor: IRequestActor) => void) => void;
-declare const useComposeRequestActor: (actors: (IRequestActor | string)[], options: {
-    onSuccess?: ((actor: IRequestActor) => void) | undefined;
-    onFailed?: ((actor: IRequestActor) => void) | undefined;
-    onFinish?: ((actor: IRequestActor) => void) | undefined;
-}, cancelWhileUnmount?: boolean) => void;
-/******************************* meta *********************************/
-/**
- * 转换请求数据
- * @param actor
- * @param convertData
- * @param convertPath
- */
-declare const convertResData: (actor: IRequestActor, convertData?: ((res: IRequestActor["res"], actor: IRequestActor) => any) | undefined, convertPath?: (string | number)[]) => any;
-declare type TMeta = {
-    actorName: string;
-    storeName?: string | ((params?: Record<string, any>) => string);
-    initParams?: Record<string, any>;
-    convertPath?: (string | number)[];
-    convertData?: (data: any, actor: IRequestActor) => any;
-};
 /**
- * 读取meta状态
- * @param actorName
- * @param params
+ * 批量读取全局状态
+ * @param storeKeys
+ * @returns
  */
-declare const useMeta: <T>(actorName: string, params?: Record<string, any>) => Ref<T | undefined>;
-declare const useMetaRegister: (registerMetaMap: IProConfigProvide["registerMetaMap"], registerActorMap: IProConfigProvide["registerActorMap"]) => void;
+declare const useRegisterStores: (storeKeys: string[]) => {};
 
 declare type TOpenMenu = (menu: any) => void;
 declare const RouterMethods: {
@@ -739,6 +562,23 @@ declare const AppConfig: {
 };
 declare type TAppConfig = typeof AppConfig;
 
+declare const DEVICE_MODES: {
+    MOBILE: string;
+    TABLET: string;
+    PC: string;
+    LARGE_PC: string;
+};
+declare type TDeviceMode = typeof DEVICE_MODES[keyof typeof DEVICE_MODES];
+declare const getDeviceMode: (width: number) => string;
+declare const useResponsive: () => {
+    width: vue.Ref<number>;
+    device: vue.ComputedRef<string>;
+    isMobile: vue.ComputedRef<boolean>;
+    isTablet: vue.ComputedRef<boolean>;
+    isPC: vue.ComputedRef<boolean>;
+    isLargePC: vue.ComputedRef<boolean>;
+};
+
 declare const proBasePropsFn: () => {
     /**
      * 组件集
@@ -759,6 +599,9 @@ declare const proBasePropsFn: () => {
     columns: {
         type: PropType<TColumns>;
     };
+    convertColumnPre: {
+        type: PropType<(t: TColumn) => TColumn>;
+    };
     convertColumn: {
         type: PropType<(t: TColumn) => TColumn>;
     };
@@ -778,7 +621,6 @@ declare const proBasePropsFn: () => {
 };
 declare type ProBaseProps = Partial<ExtractPropTypes<ReturnType<typeof proBasePropsFn>>>;
 declare const proBaseProps: ProBaseProps;
-declare const mergeState: (columns: TColumns, columnState?: Record<string, any>, columnState2?: Record<string, any>) => TColumns;
 declare type ProDispatchRequestType = (actorName: string, params?: IRequestActor["req"], extra?: IRequestActor["extra"]) => IRequestActor | undefined;
 declare type TFormExtraMap = {
     rulePrefixMap?: Record<string, string>;
@@ -807,6 +649,9 @@ interface IProConfigProvide {
      * 注册的全局Meta
      */
     registerMetaMap: Record<string, TMeta>;
+    metaState: UnwrapNestedRefs<{
+        [key: string]: boolean;
+    }>;
     /**
      * 发送请求
      * @param actorName
@@ -824,6 +669,7 @@ interface IProConfigProvide {
     appConfig: TAppConfig;
     localeConfig: ComputedRef<Record<string, string>>;
     t: ComputedRef<(k: string) => string>;
+    device: ComputedRef<TDeviceMode>;
 }
 declare const proConfigProps: () => {
     elementMap: {
@@ -1084,10 +930,293 @@ declare const ProConfig: vue.DefineComponent<Partial<ExtractPropTypes<{
  */
 declare const createProConfig: (config?: ProConfigProps) => (app: App) => void;
 
+declare const useDoneRequestActor: (actors: (IRequestActor | string)[], callback: (actor: IRequestActor) => void) => void;
+declare const useFailedRequestActor: (actors: (IRequestActor | string)[], callback: (actor: IRequestActor) => void) => void;
+declare const useComposeRequestActor: (actors: (IRequestActor | string)[], options: {
+    onSuccess?: ((actor: IRequestActor) => void) | undefined;
+    onFailed?: ((actor: IRequestActor) => void) | undefined;
+    onFinish?: ((actor: IRequestActor) => void) | undefined;
+}, cancelWhileUnmount?: boolean) => void;
+/******************************* meta *********************************/
+/**
+ * 转换请求数据
+ * @param actor
+ * @param convertData
+ * @param convertPath
+ */
+declare const convertResData: (actor: IRequestActor, convertData?: ((res: IRequestActor["res"], actor: IRequestActor) => any) | undefined, convertPath?: (string | number)[]) => any;
+declare type TMeta = {
+    actorName: string;
+    storeName: string | ((params?: Record<string, any>) => string);
+    initParams?: Record<string, any>;
+    convertPath?: (string | number)[];
+    convertData?: (data: any, actor: IRequestActor) => any;
+};
+declare const useGetMetaStoreName: () => (actorName: string, params?: Record<string, any>) => string | undefined;
+/**
+ * 读取meta加载状态
+ */
+declare const useMetaLoading: (actorName: string, params?: Record<string, any>) => ComputedRef<boolean>;
+/**
+ * 读取meta状态
+ * @param actorName
+ * @param params
+ */
+declare const useMeta: <T>(actorName: string, params?: Record<string, any>) => Ref<T | undefined>;
+declare type TMetaKey = {
+    actorName: string;
+    params?: Record<string, any>;
+};
+declare const useRegisterMetas: (metaKeys: TMetaKey[]) => {};
+declare const useMetaRegister: (registerMetaMap: IProConfigProvide["registerMetaMap"], registerActorMap: IProConfigProvide["registerActorMap"], metaState: {
+    [key: string]: boolean;
+}) => void;
+
+declare const getColumnsOpts: (columns: TColumns) => {
+    storeKeys: string[];
+    metaKeys: TMetaKey[];
+};
+declare type TSetDataOpts = {
+    stores?: Record<string, Ref$1<UnwrapRef<any>>>;
+    metas?: Record<string, Ref$1<UnwrapRef<any>>>;
+    getMetaStoreName?: (actorName: string, params?: Record<string, any>) => string | undefined;
+};
+declare const setColumnsData: (columns: TColumns, opts: TSetDataOpts) => {
+    title?: string | vue.VNode<vue.RendererNode, vue.RendererElement, {
+        [key: string]: any;
+    }> | undefined;
+    dataIndex?: string | number | undefined;
+    valueType?: string | undefined;
+    formValueType?: string | undefined;
+    showProps?: Record<string, any> | undefined;
+    formItemProps?: {
+        name?: string | undefined;
+        label?: string | undefined;
+    } | undefined;
+    formFieldProps?: Record<string, any> | undefined;
+    props?: Record<string, any> | undefined;
+    inputProps?: Record<string, any> | undefined;
+    render?: TRender | undefined;
+    inputRender?: TRender | undefined;
+    descRender?: string | TRender | undefined;
+    formReadRender?: string | TRender | undefined;
+    tableRender?: string | TRender | undefined;
+    search?: boolean | undefined;
+    width?: number | undefined;
+    minWidth?: number | undefined;
+    setData?: (TSetDataMeta | TSetDataStore)[] | undefined;
+    paths?: string | string[] | undefined;
+    formExtra?: {
+        label?: {
+            name: string;
+            opts?: {
+                showAllPath?: boolean | undefined;
+            } | undefined;
+        } | undefined;
+    } | undefined;
+    extra?: ({
+        desc?: Record<string, any> | undefined;
+        col?: Record<string, any> | undefined;
+    } & Record<string, any>) | undefined;
+    children?: TColumns | undefined;
+}[];
+declare const mergeState: (columns: TColumns, columnState?: Record<string, any>, columnState2?: Record<string, any>, opts?: (TSetDataOpts & {
+    convertColumnPre?: ((t: TColumn) => TColumn) | undefined;
+    convertColumn?: ((t: TColumn) => TColumn) | undefined;
+}) | undefined) => TColumns;
+
+interface IProModuleProvide {
+    elementMap: TElementMap;
+    subject$: Subject<TActionEvent>;
+    sendEvent: (action: TActionEvent) => void;
+    state: UnwrapNestedRefs$1<Record<string, any>>;
+    dispatch: (action: TActionState) => void;
+    data: Record<string, any>;
+    requests: IRequestOpts[];
+    sendRequest: (requestNameOrAction: string, ...params: any[]) => void;
+    executeExp: (param: TExpression, args: any) => any;
+    execute: (executeList: TExecuteItem[], args: any[]) => void;
+    stores: Record<string, Ref$1<UnwrapRef<any>>>;
+    metas: Record<string, Ref$1<UnwrapRef<any>>>;
+}
+declare const useProModule: () => IProModuleProvide;
+declare const provideProModule: (ctx: IProModuleProvide) => void;
+declare const useModuleEvent: (cb: (action: TActionEvent) => void) => void;
+interface IRequestOpts {
+    actor: IRequestActor;
+    /**
+     * 如果设置action，可以使用该值发起请求 住：要保证唯一性
+     * 设置该字段原因：因为actor中的name不友好，可以理解为一个备选方案
+     */
+    action?: string;
+    stateName?: string;
+    loadingName?: string;
+    convertParams?: (...params: any[]) => Record<string, any>;
+    convertParamsEx?: TExpression;
+    convertData?: (actor: IRequestActor) => Record<string, any>;
+    convertDataEx?: TExpression;
+    onSuccess?: (actor?: IRequestActor) => void;
+    onSuccessEx?: TExecuteItem[];
+    onFailed?: (actor?: IRequestActor) => void;
+    onFailedEx?: TExecuteItem[];
+}
+declare const RequestAction: {
+    Success: string;
+    Fail: string;
+};
+declare const proModuleProps: () => {
+    /**
+     * module状态
+     */
+    state: {
+        type: PropType<Record<string, any>>;
+    };
+    initState: {
+        type: PropType<object>;
+    };
+    /**
+     * store names
+     */
+    storeKeys: {
+        type: PropType<string[]>;
+    };
+    /**
+     * meta names (actorName)
+     */
+    metaKeys: {
+        type: PropType<TMetaKey[]>;
+    };
+    /**
+     * 组件集
+     */
+    elementMap: {
+        type: PropType<TElementMap>;
+    };
+    /**
+     * 组件描述（树）
+     */
+    elementConfigs: {
+        type: PropType<IElementConfig | IElementConfig[]>;
+    };
+    /**
+     * requests
+     */
+    actors: {
+        type: PropType<IRequestActor<any, any, any>[]>;
+    };
+    requests: {
+        type: PropType<IRequestOpts[]>;
+    };
+};
+declare type ProModuleProps = Partial<ExtractPropTypes<ReturnType<typeof proModuleProps>>>;
+declare const ProModule: vue.DefineComponent<Partial<ExtractPropTypes<{
+    /**
+     * module状态
+     */
+    state: {
+        type: PropType<Record<string, any>>;
+    };
+    initState: {
+        type: PropType<object>;
+    };
+    /**
+     * store names
+     */
+    storeKeys: {
+        type: PropType<string[]>;
+    };
+    /**
+     * meta names (actorName)
+     */
+    metaKeys: {
+        type: PropType<TMetaKey[]>;
+    };
+    /**
+     * 组件集
+     */
+    elementMap: {
+        type: PropType<TElementMap>;
+    };
+    /**
+     * 组件描述（树）
+     */
+    elementConfigs: {
+        type: PropType<IElementConfig | IElementConfig[]>;
+    };
+    /**
+     * requests
+     */
+    actors: {
+        type: PropType<IRequestActor<any, any, any>[]>;
+    };
+    requests: {
+        type: PropType<IRequestOpts[]>;
+    };
+}>>, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<Partial<ExtractPropTypes<{
+    /**
+     * module状态
+     */
+    state: {
+        type: PropType<Record<string, any>>;
+    };
+    initState: {
+        type: PropType<object>;
+    };
+    /**
+     * store names
+     */
+    storeKeys: {
+        type: PropType<string[]>;
+    };
+    /**
+     * meta names (actorName)
+     */
+    metaKeys: {
+        type: PropType<TMetaKey[]>;
+    };
+    /**
+     * 组件集
+     */
+    elementMap: {
+        type: PropType<TElementMap>;
+    };
+    /**
+     * 组件描述（树）
+     */
+    elementConfigs: {
+        type: PropType<IElementConfig | IElementConfig[]>;
+    };
+    /**
+     * requests
+     */
+    actors: {
+        type: PropType<IRequestActor<any, any, any>[]>;
+    };
+    requests: {
+        type: PropType<IRequestOpts[]>;
+    };
+}>>>, {}>;
+
+declare type TConfigData = {
+    initState?: Record<string, any>;
+    initExecuteList?: TExecuteItem[];
+    storeKeys?: string[];
+    requests?: Omit<IRequestOpts, "actor"> & {
+        actor: string;
+    }[];
+    elementConfigs?: IElementConfig | IElementConfig[];
+};
+declare const createModule: ({ actors, configData, configDataExtra, Logic, }: {
+    actors?: IRequestActor<any, any, any>[] | undefined;
+    configData?: TConfigData | undefined;
+    configDataExtra?: Record<string, any> | undefined;
+    Logic?: DefineComponent<{}, {}, {}, vue.ComputedOptions, vue.MethodOptions, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{}>>, {}> | undefined;
+}) => DefineComponent<unknown, () => JSX.Element | null, {}, vue.ComputedOptions, vue.MethodOptions, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<unknown>, {}>;
+
 interface IAccess extends Record<string, any> {
     token?: string;
 }
-declare type TAccess = UnwrapNestedRefs$1<IAccess>;
+declare type TAccess = UnwrapNestedRefs<IAccess>;
 declare const useAccess: () => {
     access: TAccess;
     setAccess: (access: TAccess) => void;
@@ -1104,9 +1233,9 @@ interface IPer extends Record<string, any> {
     buttonMap?: Record<string, boolean>;
 }
 declare type TLogonUserProvide = {
-    user: UnwrapNestedRefs<IUser>;
+    user: UnwrapNestedRefs$1<IUser>;
     setUser: (u: IUser) => void;
-    per: UnwrapNestedRefs<IPer>;
+    per: UnwrapNestedRefs$1<IPer>;
     setPer: (u: IPer) => void;
     opts: Record<string, any>;
 };
@@ -1214,10 +1343,10 @@ declare const ProGrid: vue.DefineComponent<Partial<ExtractPropTypes<{
 interface IProFormProvideExtra extends Record<string, any> {
 }
 interface IProFormProvide extends IProFormProvideExtra {
-    formState: UnwrapNestedRefs<Record<string, any>>;
-    showState: UnwrapNestedRefs<Record<string, any>>;
-    readonlyState: UnwrapNestedRefs<Record<string, any>>;
-    disableState: UnwrapNestedRefs<Record<string, any>>;
+    formState: UnwrapNestedRefs$1<Record<string, any>>;
+    showState: UnwrapNestedRefs$1<Record<string, any>>;
+    readonlyState: UnwrapNestedRefs$1<Record<string, any>>;
+    disableState: UnwrapNestedRefs$1<Record<string, any>>;
     readonly: Ref<boolean | undefined>;
     elementMap?: TElementMap;
     formElementMap?: TElementMap;
@@ -1333,6 +1462,13 @@ declare const proFormProps: () => {
         type: PropType<(...e: any[]) => boolean | undefined>;
         default: undefined;
     };
+    /**
+     * onFinish 中加入额外的值
+     */
+    onGetExtraValues: {
+        type: PropType<(opts?: any) => Record<string, any> | undefined>;
+        default: undefined;
+    };
 };
 declare type ProFormProps = Partial<ExtractPropTypes<ReturnType<typeof proFormProps>>> & ProBaseProps & Omit<ProGridProps, "items"> & {
     onFinish?: (showValues?: Record<string, any>, values?: Record<string, any>, opts?: Pick<IProFormProvide, "userOpe" | "asyncNum">) => void;
@@ -2499,8 +2635,8 @@ declare const ProShowTree: vue.DefineComponent<{
 }>>, {
     render: Function;
     splitStr: string;
-    splitStr2: string;
     multiple: boolean;
+    splitStr2: string;
 }>;
 declare const ProShowDate: vue.DefineComponent<{
     value: {
@@ -2600,7 +2736,7 @@ declare type TLayoutMenu = {
 declare type TLayoutTabMenu = TLayoutMenu & {
     query?: Record<string, any>;
 };
-declare type TLayoutType = "vertical" | "horizontal" | "horizontal-v" | "compose";
+declare type TLayoutType = "vertical" | "horizontal" | "horizontal-v" | "compose" | "simple";
 interface IProLayoutProvide {
     convertName: (route: RouteLocationNormalizedLoaded) => string;
     convertValue: (menu: TLayoutTabMenu) => string;
@@ -2611,7 +2747,7 @@ interface IProLayoutProvide {
     tabs: Ref<TLayoutTabMenu[]>;
     showTabs: Ref<boolean>;
     closeTab: (value: string) => void;
-    refreshRef: Ref<UnwrapRef<boolean>>;
+    refreshRef: Ref<UnwrapRef$1<boolean>>;
     refresh: (item?: TLayoutMenu) => void;
 }
 declare const useProLayout: () => IProLayoutProvide;
@@ -2751,6 +2887,15 @@ declare const layoutProps: () => {
         }>>>;
         default: undefined;
     };
+    drawerMenuVisible: {
+        type: BooleanConstructor;
+    };
+    drawerProps: {
+        type: ObjectConstructor;
+    };
+    drawerMenuProps: {
+        type: ObjectConstructor;
+    };
     /**************************** menu相关 *******************************/
     menus: {
         type: PropType<TLayoutMenu[]>;
@@ -2892,6 +3037,15 @@ declare const ProLayout: vue.DefineComponent<Partial<ExtractPropTypes<{
         }>>>;
         default: undefined;
     };
+    drawerMenuVisible: {
+        type: BooleanConstructor;
+    };
+    drawerProps: {
+        type: ObjectConstructor;
+    };
+    drawerMenuProps: {
+        type: ObjectConstructor;
+    };
     /**************************** menu相关 *******************************/
     menus: {
         type: PropType<TLayoutMenu[]>;
@@ -3031,6 +3185,15 @@ declare const ProLayout: vue.DefineComponent<Partial<ExtractPropTypes<{
         }>>>;
         default: undefined;
     };
+    drawerMenuVisible: {
+        type: BooleanConstructor;
+    };
+    drawerProps: {
+        type: ObjectConstructor;
+    };
+    drawerMenuProps: {
+        type: ObjectConstructor;
+    };
     /**************************** menu相关 *******************************/
     menus: {
         type: PropType<TLayoutMenu[]>;
@@ -3263,7 +3426,7 @@ declare const proCurdProps: () => {
 declare type CurdProps = Partial<ExtractPropTypes<ReturnType<typeof proCurdProps>>> & ProBaseProps;
 declare const CurdMethods: string[];
 declare type ProCurdProps = CurdProps & Omit<ProModuleProps, "state" | "requests"> & {
-    curdState?: UnwrapNestedRefs<ICurdState>;
+    curdState?: UnwrapNestedRefs$1<ICurdState>;
 };
 declare const ProCurd: vue.DefineComponent<ProCurdProps, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ProCurdProps>, {}>;
 declare const useCurdCommon: () => {
@@ -3278,7 +3441,7 @@ interface IProCurdProvide {
     elementMap: TElementMap;
     formElementMap: TElementMap;
     rowKey: string;
-    curdState: UnwrapNestedRefs<ICurdState>;
+    curdState: UnwrapNestedRefs$1<ICurdState>;
     formColumns: Ref<TColumns>;
     descColumns: Ref<TColumns>;
     tableColumns: Ref<TColumns>;
@@ -3776,4 +3939,4 @@ declare const ProAppConfigDrawer: vue.DefineComponent<ProAppConfigDrawerProps, {
     [x: string]: any;
 }>;
 
-export { AddButton, AppConfig, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, DarkThemeToken, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProLayoutProvide, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, ITheme, IThemeProvide, IThemeToken, IUser, InternalNamePath, LogonUser, LogonUserKey, ModalCurdOpe, MustLogon, NamePath, PageHeader, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProAppConfigDrawer, ProAppConfigDrawerProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormPage, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListPage, ProCurdListPageConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdModule, ProCurdModuleProps, ProCurdPage, ProCurdPageConnect, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProLayoutKey, ProLayoutProps, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProRouterView, ProRouterViewProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTheme, ProTip, ProTipProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, ProValue, ProWatermark, ProWatermarkProps, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TAppConfig, TColor, TColumn, TColumns, TConfigData, TCurdActionEvent, TDark, TDefaultValueType, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLayoutMenu, TLayoutTabMenu, TLayoutType, TLight, TLogonUserProvide, TMeta, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TSubType, TTableColumn, TTableColumns, TValueType, ThemeKey, ThemeToken, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, createTheme, defaultPage, filterSlotsByPrefix, getColumnFormItemName, getColumnValueType, getFirstPropName, getRealRender, getSignValue, getValidValues, isValidConfig, isValidNode, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderColumn, renderElement, renderElements, renderInputColumn, showValue, useAccess, useAccessMgr, useAppConfig, useComposeRequestActor, useCurdCommon, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useHasPer, useHasPer2, useLogonUser, useMeta, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProLayout, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore, useTheme };
+export { AddButton, AppConfig, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, DEVICE_MODES, DarkThemeToken, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProLayoutProvide, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, ITheme, IThemeProvide, IThemeToken, IUser, InternalNamePath, LogonUser, LogonUserKey, ModalCurdOpe, MustLogon, NamePath, PageHeader, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProAppConfigDrawer, ProAppConfigDrawerProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormPage, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListPage, ProCurdListPageConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdModule, ProCurdModuleProps, ProCurdPage, ProCurdPageConnect, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProLayoutKey, ProLayoutProps, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProRouterView, ProRouterViewProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTheme, ProTip, ProTipProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, ProValue, ProWatermark, ProWatermarkProps, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TAppConfig, TColor, TColumn, TColumns, TConfigData, TCurdActionEvent, TDark, TDefaultValueType, TDeviceMode, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLayoutMenu, TLayoutTabMenu, TLayoutType, TLight, TLogonUserProvide, TMeta, TMetaKey, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TSetData, TSetDataMeta, TSetDataOpts, TSetDataStore, TSubType, TTableColumn, TTableColumns, TValueType, ThemeKey, ThemeToken, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, createTheme, defaultPage, filterSlotsByPrefix, getColumnFormInputProps, getColumnFormItemName, getColumnValueType, getColumnsOpts, getDeviceMode, getFirstPropName, getRealRender, getSignValue, getValidValues, isValidConfig, isValidNode, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderColumn, renderElement, renderElements, renderInputColumn, setColumnsData, showValue, useAccess, useAccessMgr, useAppConfig, useComposeRequestActor, useCurdCommon, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useGetMetaStoreName, useHasPer, useHasPer2, useLogonUser, useMeta, useMetaLoading, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProLayout, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore, useRegisterMetas, useRegisterStores, useResponsive, useTheme };