@fairys/taro-tools-react 1.0.7 → 1.0.9

package/esm/context/page.data.instance.d.ts

@@ -75,7 +75,7 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     /**默认值*/
     defaultInital: T;
     store: T;
-    ctor: (options?: PageDataOptions<T>) => void;
+    ctor: (options?: PageDataOptions<T>) => this;
     /**初始化状态值*/
     main_page_store: (initalValues?: Partial<T>, file?: string[]) => this;
     /**格式化请求参数*/
@@ -112,40 +112,40 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
     defaultPageSize?: number;
 }
 /**初始化实例*/
-export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(instance?: PageDataInstance<T>): PageDataInstance<T>;
+export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(instance?: M): M;
 /**页面级数据状态管理上下文*/
 export declare const PageDataInstanceContext: import("react").Context<PageDataInstance<PageDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState>() => PageDataInstance<T>;
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState> extends PageDataOptions<T> {
-    instance?: PageDataInstance<T>;
+export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => M;
+export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>> extends PageDataOptions<T> {
+    instance?: M;
     children: React.ReactNode;
     /**请求之前处理参数*/
-    onBefore?: PageDataInstance<T>['onBefore'];
+    onBefore?: M['onBefore'];
     /**请求接口*/
-    getList?: PageDataInstance<T>['getList'];
+    getList?: M['getList'];
     /**请求之后处理返回值进行存储*/
-    onAfter?: PageDataInstance<T>['onAfter'];
+    onAfter?: M['onAfter'];
     /** 额外数据处理*/
-    onExtraData?: PageDataInstance<T>['onExtraData'];
+    onExtraData?: M['onExtraData'];
     /** code!== 200 时 触发*/
-    onError?: PageDataInstance<T>['onError'];
+    onError?: M['onError'];
     /**获取弹框内重置参数*/
-    getResetValues?: PageDataInstance<T>['getResetValues'];
+    getResetValues?: M['getResetValues'];
     /**默认查询参数*/
-    defaultQuery?: PageDataInstance<T>['defaultQuery'];
+    defaultQuery?: M['defaultQuery'];
     /**那些字段取值对象 code值*/
-    codeFields?: PageDataInstance<T>['codeFields'];
+    codeFields?: M['codeFields'];
     /**那些字段取值对象的 value 值 */
-    valueFields?: PageDataInstance<T>['valueFields'];
+    valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(props: PageDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState>() => [T, PageDataInstance<T>, string | undefined];
+export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => [T, M, string | undefined];

package/esm/context/page.data.instance.js

@@ -44,6 +44,7 @@ class page_data_instance_PageDataInstance extends ProxyInstanceObjectBase {
             this.store.tabItems = external_valtio_ref(options.tabItems);
             this.store.isTabs = Array.isArray(options.tabItems) && options.tabItems.length > 0;
         }
+        return this;
     };
     main_page_store = (initalValues = {}, file)=>{
         const newStore = {

package/esm/context/page.info.data.instance.d.ts

@@ -48,7 +48,7 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
         /**是否显示成功提示*/
         isShowSuccessMessage?: boolean;
     };
-    ctor(options?: PageInfoDataOptions<T>): void;
+    ctor(options?: PageInfoDataOptions<T>): this;
     store: T;
     /**初始化状态值*/
     main_page_store: (initalValues?: Partial<T>, file?: string[]) => this;
@@ -59,35 +59,35 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
     /**保存数据*/
     main_saveInfo: () => Promise<void>;
 }
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> {
     /**详情查询请求配置*/
-    requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+    requestInfoConfig?: M['requestInfoConfig'];
     /**详情保存请求配置*/
-    requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+    requestSaveInfoConfig?: M['requestSaveInfoConfig'];
     /**初始值*/
     initialValues?: Partial<T>;
     /**editFormData是否使用valtio proxy 存储*/
     isProxy?: boolean;
 }
 /**初始化实例*/
-export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(instance?: PageInfoDataInstance<T>) => PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(instance?: M) => M;
 /**页面级数据状态管理上下文*/
 export declare const PageInfoDataInstanceContext: import("react").Context<PageInfoDataInstance<PageInfoDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => PageInfoDataInstance<T>;
-export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends PageInfoDataOptions<T> {
-    instance?: PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => M;
+export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> extends PageInfoDataOptions<T, M> {
+    instance?: M;
     children: React.ReactNode;
     /**页面标题*/
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
-    useHooks?: (instance: PageInfoDataInstance<T>) => void;
+    useHooks?: (instance: M) => void;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(props: PageInfoDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(props: PageInfoDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => [T, PageInfoDataInstance<T>, string | undefined];
+export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => [T, M, string | undefined];

package/esm/context/page.info.data.instance.js

@@ -30,6 +30,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
             this.store.editFormData = {};
         }
         if (options?.initialValues) this.main_page_store(options.initialValues);
+        return this;
     }
     store = proxy({
         ...this.defaultInital

package/lib/context/index.js

@@ -6,7 +6,7 @@ var __webpack_modules__ = {
     "./global.data.instance": function(module) {
         module.exports = require("./global.data.instance.js");
     },
-    "context/global.setting.data.instance": function(module) {
+    "./global.setting.data.instance": function(module) {
         module.exports = require("./global.setting.data.instance.js");
     },
     "./page.data.instance": function(module) {
@@ -83,7 +83,7 @@ var __webpack_exports__ = {};
         return _auth_data_instance__WEBPACK_IMPORTED_MODULE_3__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("context/global.setting.data.instance");
+    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./global.setting.data.instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];

package/lib/context/page.data.instance.d.ts

@@ -75,7 +75,7 @@ export declare class PageDataInstance<T extends PageDataInstanceState = PageData
     /**默认值*/
     defaultInital: T;
     store: T;
-    ctor: (options?: PageDataOptions<T>) => void;
+    ctor: (options?: PageDataOptions<T>) => this;
     /**初始化状态值*/
     main_page_store: (initalValues?: Partial<T>, file?: string[]) => this;
     /**格式化请求参数*/
@@ -112,40 +112,40 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
     defaultPageSize?: number;
 }
 /**初始化实例*/
-export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(instance?: PageDataInstance<T>): PageDataInstance<T>;
+export declare function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(instance?: M): M;
 /**页面级数据状态管理上下文*/
 export declare const PageDataInstanceContext: import("react").Context<PageDataInstance<PageDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState>() => PageDataInstance<T>;
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState> extends PageDataOptions<T> {
-    instance?: PageDataInstance<T>;
+export declare const usePageDataInstanceContext: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => M;
+export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>> extends PageDataOptions<T> {
+    instance?: M;
     children: React.ReactNode;
     /**请求之前处理参数*/
-    onBefore?: PageDataInstance<T>['onBefore'];
+    onBefore?: M['onBefore'];
     /**请求接口*/
-    getList?: PageDataInstance<T>['getList'];
+    getList?: M['getList'];
     /**请求之后处理返回值进行存储*/
-    onAfter?: PageDataInstance<T>['onAfter'];
+    onAfter?: M['onAfter'];
     /** 额外数据处理*/
-    onExtraData?: PageDataInstance<T>['onExtraData'];
+    onExtraData?: M['onExtraData'];
     /** code!== 200 时 触发*/
-    onError?: PageDataInstance<T>['onError'];
+    onError?: M['onError'];
     /**获取弹框内重置参数*/
-    getResetValues?: PageDataInstance<T>['getResetValues'];
+    getResetValues?: M['getResetValues'];
     /**默认查询参数*/
-    defaultQuery?: PageDataInstance<T>['defaultQuery'];
+    defaultQuery?: M['defaultQuery'];
     /**那些字段取值对象 code值*/
-    codeFields?: PageDataInstance<T>['codeFields'];
+    codeFields?: M['codeFields'];
     /**那些字段取值对象的 value 值 */
-    valueFields?: PageDataInstance<T>['valueFields'];
+    valueFields?: M['valueFields'];
     /**是否是第一次加载*/
     isMountLoad?: boolean;
     /**页面标题*/
     title?: string;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(props: PageDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>(props: PageDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState>() => [T, PageDataInstance<T>, string | undefined];
+export declare const usePageDataInstanceState: <T extends PageDataInstanceState = PageDataInstanceState, M extends PageDataInstance<T> = PageDataInstance<T>>() => [T, M, string | undefined];

package/lib/context/page.data.instance.js

@@ -87,6 +87,7 @@ class page_data_instance_PageDataInstance extends instance_js_namespaceObject.Pr
             this.store.tabItems = (0, external_valtio_namespaceObject.ref)(options.tabItems);
             this.store.isTabs = Array.isArray(options.tabItems) && options.tabItems.length > 0;
         }
+        return this;
     };
     main_page_store = (initalValues = {}, file)=>{
         const newStore = {

package/lib/context/page.info.data.instance.d.ts

@@ -48,7 +48,7 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
         /**是否显示成功提示*/
         isShowSuccessMessage?: boolean;
     };
-    ctor(options?: PageInfoDataOptions<T>): void;
+    ctor(options?: PageInfoDataOptions<T>): this;
     store: T;
     /**初始化状态值*/
     main_page_store: (initalValues?: Partial<T>, file?: string[]) => this;
@@ -59,35 +59,35 @@ export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState =
     /**保存数据*/
     main_saveInfo: () => Promise<void>;
 }
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> {
     /**详情查询请求配置*/
-    requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+    requestInfoConfig?: M['requestInfoConfig'];
     /**详情保存请求配置*/
-    requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+    requestSaveInfoConfig?: M['requestSaveInfoConfig'];
     /**初始值*/
     initialValues?: Partial<T>;
     /**editFormData是否使用valtio proxy 存储*/
     isProxy?: boolean;
 }
 /**初始化实例*/
-export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(instance?: PageInfoDataInstance<T>) => PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstance: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(instance?: M) => M;
 /**页面级数据状态管理上下文*/
 export declare const PageInfoDataInstanceContext: import("react").Context<PageInfoDataInstance<PageInfoDataInstanceState>>;
 /**获取上下文实例*/
-export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => PageInfoDataInstance<T>;
-export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends PageInfoDataOptions<T> {
-    instance?: PageInfoDataInstance<T>;
+export declare const usePageInfoDataInstanceContext: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => M;
+export interface PageInfoDataInstanceContextProviderProps<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>> extends PageInfoDataOptions<T, M> {
+    instance?: M;
     children: React.ReactNode;
     /**页面标题*/
     title?: string;
     /**页面一加载是否请求详情接口*/
     isMountRequestInfo?: boolean;
     /**自定义hooks,挂载参数和设置完初始值后执行*/
-    useHooks?: (instance: PageInfoDataInstance<T>) => void;
+    useHooks?: (instance: M) => void;
 }
 /**页面级数据状态管理上下文提供者*/
-export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(props: PageInfoDataInstanceContextProviderProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>(props: PageInfoDataInstanceContextProviderProps<T, M>): import("react/jsx-runtime").JSX.Element;
 /**
  * 页面级数据状态管理
  */
-export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => [T, PageInfoDataInstance<T>, string | undefined];
+export declare const usePageInfoDataInstanceState: <T extends PageInfoDataInstanceState = PageInfoDataInstanceState, M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>>() => [T, M, string | undefined];

package/lib/context/page.info.data.instance.js

@@ -74,6 +74,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
             this.store.editFormData = {};
         }
         if (options?.initialValues) this.main_page_store(options.initialValues);
+        return this;
     }
     store = (0, external_valtio_namespaceObject.proxy)({
         ...this.defaultInital

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/context/page.data.instance.tsx

@@ -117,6 +117,7 @@ export class PageDataInstance<
       this.store.tabItems = ref(options.tabItems);
       this.store.isTabs = Array.isArray(options.tabItems) && options.tabItems.length > 0;
     }
+    return this;
   };
   /**初始化状态值*/
   main_page_store = (initalValues: Partial<T> = {}, file?: string[]) => {
@@ -372,12 +373,13 @@ export interface PageDataOptions<T extends PageDataInstanceState = PageDataInsta
 }
 
 /**初始化实例*/
-export function usePageDataInstance<T extends PageDataInstanceState = PageDataInstanceState>(
-  instance?: PageDataInstance<T>,
-) {
-  const ref = useRef<PageDataInstance<T>>();
+export function usePageDataInstance<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>(instance?: M) {
+  const ref = useRef<M>();
   if (!ref.current) {
-    ref.current = instance || new PageDataInstance<T>();
+    ref.current = instance || (new PageDataInstance<T>() as M);
   }
   return ref.current;
 }
@@ -386,33 +388,38 @@ export function usePageDataInstance<T extends PageDataInstanceState = PageDataIn
 export const PageDataInstanceContext = createContext<PageDataInstance>(new PageDataInstance());
 
 /**获取上下文实例*/
-export const usePageDataInstanceContext = <T extends PageDataInstanceState = PageDataInstanceState>() => {
-  const PageDataInstance = useContext(PageDataInstanceContext) as PageDataInstance<T>;
+export const usePageDataInstanceContext = <
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>() => {
+  const PageDataInstance = useContext(PageDataInstanceContext) as M;
   return PageDataInstance;
 };
 
-export interface PageDataInstanceContextProviderProps<T extends PageDataInstanceState = PageDataInstanceState>
-  extends PageDataOptions<T> {
-  instance?: PageDataInstance<T>;
+export interface PageDataInstanceContextProviderProps<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+> extends PageDataOptions<T> {
+  instance?: M;
   children: React.ReactNode;
   /**请求之前处理参数*/
-  onBefore?: PageDataInstance<T>['onBefore'];
+  onBefore?: M['onBefore'];
   /**请求接口*/
-  getList?: PageDataInstance<T>['getList'];
+  getList?: M['getList'];
   /**请求之后处理返回值进行存储*/
-  onAfter?: PageDataInstance<T>['onAfter'];
+  onAfter?: M['onAfter'];
   /** 额外数据处理*/
-  onExtraData?: PageDataInstance<T>['onExtraData'];
+  onExtraData?: M['onExtraData'];
   /** code!== 200 时 触发*/
-  onError?: PageDataInstance<T>['onError'];
+  onError?: M['onError'];
   /**获取弹框内重置参数*/
-  getResetValues?: PageDataInstance<T>['getResetValues'];
+  getResetValues?: M['getResetValues'];
   /**默认查询参数*/
-  defaultQuery?: PageDataInstance<T>['defaultQuery'];
+  defaultQuery?: M['defaultQuery'];
   /**那些字段取值对象 code值*/
-  codeFields?: PageDataInstance<T>['codeFields'];
+  codeFields?: M['codeFields'];
   /**那些字段取值对象的 value 值 */
-  valueFields?: PageDataInstance<T>['valueFields'];
+  valueFields?: M['valueFields'];
   /**是否是第一次加载*/
   isMountLoad?: boolean;
   /**页面标题*/
@@ -420,9 +427,10 @@ export interface PageDataInstanceContextProviderProps<T extends PageDataInstance
 }
 
 /**页面级数据状态管理上下文提供者*/
-export function PageDataInstanceContextProvider<T extends PageDataInstanceState = PageDataInstanceState>(
-  props: PageDataInstanceContextProviderProps<T>,
-) {
+export function PageDataInstanceContextProvider<
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>(props: PageDataInstanceContextProviderProps<T, M>) {
   const {
     instance,
     children,
@@ -480,8 +488,11 @@ export function PageDataInstanceContextProvider<T extends PageDataInstanceState
 /**
  * 页面级数据状态管理
  */
-export const usePageDataInstanceState = <T extends PageDataInstanceState = PageDataInstanceState>() => {
-  const PageMainDataInstance = usePageDataInstanceContext<T>();
+export const usePageDataInstanceState = <
+  T extends PageDataInstanceState = PageDataInstanceState,
+  M extends PageDataInstance<T> = PageDataInstance<T>,
+>() => {
+  const PageMainDataInstance = usePageDataInstanceContext<T, M>();
   const store = useSnapshot(PageMainDataInstance.store, { sync: true }) as T;
-  return [store, PageMainDataInstance, store.__defaultValue] as [T, PageDataInstance<T>, string | undefined];
+  return [store, PageMainDataInstance, store.__defaultValue] as [T, M, string | undefined];
 };

package/src/context/page.info.data.instance.tsx

@@ -78,6 +78,7 @@ export class PageInfoDataInstance<
     if (options?.initialValues) {
       this.main_page_store(options.initialValues);
     }
+    return this;
   }
 
   store = proxy<T>({ ...this.defaultInital } as T);
@@ -175,11 +176,14 @@ export class PageInfoDataInstance<
   };
 }
 
-export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> {
+export interface PageInfoDataOptions<
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+> {
   /**详情查询请求配置*/
-  requestInfoConfig?: PageInfoDataInstance<T>['requestInfoConfig'];
+  requestInfoConfig?: M['requestInfoConfig'];
   /**详情保存请求配置*/
-  requestSaveInfoConfig?: PageInfoDataInstance<T>['requestSaveInfoConfig'];
+  requestSaveInfoConfig?: M['requestSaveInfoConfig'];
   /**初始值*/
   initialValues?: Partial<T>;
   /**editFormData是否使用valtio proxy 存储*/
@@ -187,15 +191,18 @@ export interface PageInfoDataOptions<T extends PageInfoDataInstanceState = PageI
 }
 
 /**初始化实例*/
-export const usePageInfoDataInstance = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(
-  instance?: PageInfoDataInstance<T>,
+export const usePageInfoDataInstance = <
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>(
+  instance?: M,
 ) => {
-  const ref = useRef<PageInfoDataInstance<T>>();
+  const ref = useRef<M>();
   if (!ref.current) {
     if (instance) {
       ref.current = instance;
     } else {
-      ref.current = new PageInfoDataInstance<T>();
+      ref.current = new PageInfoDataInstance<T>() as M;
     }
   }
   return ref.current;
@@ -205,28 +212,33 @@ export const usePageInfoDataInstance = <T extends PageInfoDataInstanceState = Pa
 export const PageInfoDataInstanceContext = createContext<PageInfoDataInstance>(new PageInfoDataInstance());
 
 /**获取上下文实例*/
-export const usePageInfoDataInstanceContext = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => {
-  const PageInfoDataInstance = useContext(PageInfoDataInstanceContext) as PageInfoDataInstance<T>;
+export const usePageInfoDataInstanceContext = <
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>() => {
+  const PageInfoDataInstance = useContext(PageInfoDataInstanceContext) as M;
   return PageInfoDataInstance;
 };
 
 export interface PageInfoDataInstanceContextProviderProps<
   T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
-> extends PageInfoDataOptions<T> {
-  instance?: PageInfoDataInstance<T>;
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+> extends PageInfoDataOptions<T, M> {
+  instance?: M;
   children: React.ReactNode;
   /**页面标题*/
   title?: string;
   /**页面一加载是否请求详情接口*/
   isMountRequestInfo?: boolean;
   /**自定义hooks,挂载参数和设置完初始值后执行*/
-  useHooks?: (instance: PageInfoDataInstance<T>) => void;
+  useHooks?: (instance: M) => void;
 }
 
 /**页面级数据状态管理上下文提供者*/
-export function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstanceState = PageInfoDataInstanceState>(
-  props: PageInfoDataInstanceContextProviderProps<T>,
-) {
+export function PageInfoDataInstanceContextProvider<
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>(props: PageInfoDataInstanceContextProviderProps<T, M>) {
   const {
     instance,
     children,
@@ -267,8 +279,11 @@ export function PageInfoDataInstanceContextProvider<T extends PageInfoDataInstan
 /**
  * 页面级数据状态管理
  */
-export const usePageInfoDataInstanceState = <T extends PageInfoDataInstanceState = PageInfoDataInstanceState>() => {
-  const PageInfoDataInstance = usePageInfoDataInstanceContext<T>();
+export const usePageInfoDataInstanceState = <
+  T extends PageInfoDataInstanceState = PageInfoDataInstanceState,
+  M extends PageInfoDataInstance<T> = PageInfoDataInstance<T>,
+>() => {
+  const PageInfoDataInstance = usePageInfoDataInstanceContext<T, M>();
   const store = useSnapshot(PageInfoDataInstance.store, { sync: true }) as T;
-  return [store, PageInfoDataInstance, store.__defaultValue] as [T, PageInfoDataInstance<T>, string | undefined];
+  return [store, PageInfoDataInstance, store.__defaultValue] as [T, M, string | undefined];
 };