diff --git a/src/index.ts b/src/index.ts index 508453b..ea4956b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,7 +19,7 @@ type ComputedOptions< TWatch extends Record void>, TComputed extends Record< string, - (data: TData & { [K in keyof TProperty]: any }) => any + (data: TData & WechatMiniprogram.Component.PropertyOptionToData) => any >, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, > = (Partial> & @@ -48,7 +48,7 @@ export function ComponentWithComputed< TWatch extends Record void>, TComputed extends Record< string, - (data: TData & { [K in keyof TProperty]: any }) => any + (data: TData & WechatMiniprogram.Component.PropertyOptionToData) => any >, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, >( @@ -75,7 +75,7 @@ export function BehaviorWithComputed< TWatch extends Record void>, TComputed extends Record< string, - (data: TData & { [K in keyof TProperty]: any }) => any + (data: TData & WechatMiniprogram.Component.PropertyOptionToData) => any >, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, >( diff --git a/types/index.d.ts b/types/index.d.ts index 9d9b154..bd04fb4 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -9,19 +9,19 @@ declare type ComputedInstance void>, TComputed extends Record any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}> = (Partial> & Partial> & Partial> & Partial & Partial & { +declare type ComputedOptions void>, TComputed extends Record +) => any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}> = (Partial> & Partial> & Partial> & Partial & Partial & { watch?: TWatch; computed?: TComputed; template?: string; }) & ThisType>; -export declare function ComponentWithComputed void>, TComputed extends Record any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}>(options: ComputedOptions): string; -export declare function BehaviorWithComputed void>, TComputed extends Record any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}>(options: ComputedOptions): string; +export declare function ComponentWithComputed void>, TComputed extends Record +) => any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}>(options: ComputedOptions): string; +export declare function BehaviorWithComputed void>, TComputed extends Record +) => any>, TCustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}>(options: ComputedOptions): string; export declare enum DataTracerMode { Auto = 0, Proxy = 1,