From 7f7256a2eb82f928876b7eafec2a213d24149e0c Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Fri, 6 May 2022 15:31:51 +0800
Subject: [PATCH] =?UTF-8?q?oakpage=20=E6=94=B9Partial<D=20&=20FormedData>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/wechatMp/index.ts | 39 ++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/platforms/wechatMp/index.ts b/src/platforms/wechatMp/index.ts
index 773e5565..e829c29d 100644
--- a/src/platforms/wechatMp/index.ts
+++ b/src/platforms/wechatMp/index.ts
@@ -804,22 +804,49 @@ export function initialize<ED extends EntityDict, Cxt extends Context<ED>, AD ex
 }
 
 
-export type MakeOakPage<ED extends EntityDict, Cxt extends Context<ED>, AD extends Record<string, Aspect<ED, Cxt>>, FD extends Record<string, Feature<ED, Cxt, AD>>> = <
+export type MakeOakPage<
+    ED extends EntityDict,
+    Cxt extends Context<ED>,
+    AD extends Record<string, Aspect<ED, Cxt>>,
+    FD extends Record<string, Feature<ED, Cxt, AD>>
+> = <
     T extends keyof ED,
     D extends WechatMiniprogram.Component.DataOption,
     P extends WechatMiniprogram.Component.PropertyOption,
     M extends WechatMiniprogram.Component.MethodOption,
     Proj extends ED[T]['Selection']['data'],
     IS extends WechatMiniprogram.IAnyObject = {},
-    FormedData extends WechatMiniprogram.Component.DataOption = {}>(options: OakPageOption<ED, T, Cxt, AD, FD, Proj, FormedData>,
-    componentOptions: WechatMiniprogram.Component.Options<D & FormedData, P, M, IS & OakPageInstanceProperties<ED, T, Cxt, AD, FD>, true>) => string;
+    FormedData extends WechatMiniprogram.Component.DataOption = {}
+>(
+    options: OakPageOption<ED, T, Cxt, AD, FD, Proj, FormedData>,
+    componentOptions: WechatMiniprogram.Component.Options<
+        Partial<D & FormedData>,
+        P,
+        M,
+        IS & OakPageInstanceProperties<ED, T, Cxt, AD, FD>,
+        true
+    >
+) => string;
 
-export type MakeOakComponent<ED extends EntityDict, Cxt extends Context<ED>, AD extends Record<string, Aspect<ED, Cxt>>, FD extends Record<string, Feature<ED, Cxt, AD>>> = <
+export type MakeOakComponent<
+    ED extends EntityDict,
+    Cxt extends Context<ED>,
+    AD extends Record<string, Aspect<ED, Cxt>>,
+    FD extends Record<string, Feature<ED, Cxt, AD>>
+> = <
     T extends keyof ED,
     D extends WechatMiniprogram.Component.DataOption,
     P extends WechatMiniprogram.Component.PropertyOption,
     M extends WechatMiniprogram.Component.MethodOption,
     Proj extends ED[T]['Selection']['data'],
     IS extends WechatMiniprogram.IAnyObject = {},
-    FormedData extends WechatMiniprogram.Component.DataOption = {}>(options: OakComponentOption<ED, T, Cxt, AD, FD, Proj, FormedData>,
-    componentOptions: WechatMiniprogram.Component.Options<D & FormedData, P, M, IS>) => string;
\ No newline at end of file
+    FormedData extends WechatMiniprogram.Component.DataOption = {}
+>(
+    options: OakComponentOption<ED, T, Cxt, AD, FD, Proj, FormedData>,
+    componentOptions: WechatMiniprogram.Component.Options<
+        Partial<D & FormedData>,
+        P,
+        M,
+        IS
+    >
+) => string;
\ No newline at end of file