diff --git a/es/page.mp.d.ts b/es/page.mp.d.ts index 927e69d8..1bd57ac6 100644 --- a/es/page.mp.d.ts +++ b/es/page.mp.d.ts @@ -5,4 +5,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends DataOption = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): string; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends DataOption = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): string; diff --git a/es/page.native.d.ts b/es/page.native.d.ts index 2f5bea53..2951aacf 100644 --- a/es/page.native.d.ts +++ b/es/page.native.d.ts @@ -6,4 +6,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; diff --git a/es/page.react.d.ts b/es/page.react.d.ts index 98a2b9a4..36fe33ee 100644 --- a/es/page.react.d.ts +++ b/es/page.react.d.ts @@ -9,7 +9,7 @@ import { MessageProps } from './types/Message'; import { NotificationProps } from './types/Notification'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): { +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): { new (props: ComponentProps): { features: BasicFeatures & FD; oakOption: OakComponentOption; diff --git a/es/page.web.d.ts b/es/page.web.d.ts index 2f5bea53..2951aacf 100644 --- a/es/page.web.d.ts +++ b/es/page.web.d.ts @@ -6,4 +6,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; diff --git a/es/types/Page.d.ts b/es/types/Page.d.ts index df4dec33..3c1b1ec2 100644 --- a/es/types/Page.d.ts +++ b/es/types/Page.d.ts @@ -146,7 +146,7 @@ export type ComponentFullThisType(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void; oakLifetime: OakLifetime; } & OakCommonComponentMethods & OakListComponentMethods & OakSingleComponentMethods; -export type OakComponentOption, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record, TProperty extends DataOption, TMethod extends Record, EMethod extends Record = {}> = ComponentOption & Partial<{ +export type OakComponentOption, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record, TProperty extends DataOption, TMethod extends Record, EMethod extends Record = {}> = ComponentOption & Partial<{ /** * 生命周期回调 */ @@ -351,7 +351,7 @@ export type OakComponentData = { oakPagination?: Pagination; }; -export type MakeOakComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record> = (options: OakComponentOption) => (props: ReactComponentProps) => React.ReactElement; +export type MakeOakComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record> = (options: OakComponentOption) => (props: ReactComponentProps) => React.ReactElement; export type WebComponentCommonMethodNames = 'setNotification' | 'setMessage' | 'navigateTo' | 'navigateBack' | 'redirectTo' | 'clean' | 't' | 'execute' | 'refresh' | 'aggregate' | 'checkOperation' | 'isDirty'; export type WebComponentListMethodNames = 'loadMore' | 'setFilters' | 'addNamedFilter' | 'removeNamedFilter' | 'removeNamedFilterByName' | 'setNamedSorters' | 'addNamedSorter' | 'removeNamedSorter' | 'removeNamedSorterByName' | 'setPageSize' | 'setCurrentPage' | 'addItem' | 'addItems' | 'removeItem' | 'removeItems' | 'updateItem' | 'updateItems' | 'resetItem' | 'recoverItem' | 'recoverItems'; export type WebComponentSingleMethodNames = 'update' | 'remove' | 'create' | 'isCreation' | 'getId' | 'setId'; diff --git a/lib/page.mp.d.ts b/lib/page.mp.d.ts index 927e69d8..1bd57ac6 100644 --- a/lib/page.mp.d.ts +++ b/lib/page.mp.d.ts @@ -5,4 +5,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends DataOption = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): string; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends DataOption = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): string; diff --git a/lib/page.native.d.ts b/lib/page.native.d.ts index 2f5bea53..2951aacf 100644 --- a/lib/page.native.d.ts +++ b/lib/page.native.d.ts @@ -6,4 +6,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; diff --git a/lib/page.react.d.ts b/lib/page.react.d.ts index 98a2b9a4..36fe33ee 100644 --- a/lib/page.react.d.ts +++ b/lib/page.react.d.ts @@ -9,7 +9,7 @@ import { MessageProps } from './types/Message'; import { NotificationProps } from './types/Notification'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): { +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): { new (props: ComponentProps): { features: BasicFeatures & FD; oakOption: OakComponentOption; diff --git a/lib/page.web.d.ts b/lib/page.web.d.ts index 2f5bea53..2951aacf 100644 --- a/lib/page.web.d.ts +++ b/lib/page.web.d.ts @@ -6,4 +6,4 @@ import { Feature } from './types/Feature'; import { DataOption, OakComponentOption } from './types/Page'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; -export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; +export declare function createComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, TProperty extends DataOption = {}, TMethod extends Record = {}>(option: OakComponentOption, features: BasicFeatures & FD): React.ForwardRefExoticComponent>; diff --git a/lib/types/Page.d.ts b/lib/types/Page.d.ts index df4dec33..3c1b1ec2 100644 --- a/lib/types/Page.d.ts +++ b/lib/types/Page.d.ts @@ -146,7 +146,7 @@ export type ComponentFullThisType(name: string, detail?: DetailType, options?: WechatMiniprogram.Component.TriggerEventOption) => void; oakLifetime: OakLifetime; } & OakCommonComponentMethods & OakListComponentMethods & OakSingleComponentMethods; -export type OakComponentOption, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record, FormedData extends Record, TData extends Record, TProperty extends DataOption, TMethod extends Record, EMethod extends Record = {}> = ComponentOption & Partial<{ +export type OakComponentOption, FrontCxt extends SyncContext, AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record, TProperty extends DataOption, TMethod extends Record, EMethod extends Record = {}> = ComponentOption & Partial<{ /** * 生命周期回调 */ @@ -351,7 +351,7 @@ export type OakComponentData = { oakPagination?: Pagination; }; -export type MakeOakComponent, FrontCxt extends SyncContext, AD extends Record>>, FD extends Record> = (options: OakComponentOption) => (props: ReactComponentProps) => React.ReactElement; +export type MakeOakComponent, FrontCxt extends SyncContext, AD extends Record>, FD extends Record> = (options: OakComponentOption) => (props: ReactComponentProps) => React.ReactElement; export type WebComponentCommonMethodNames = 'setNotification' | 'setMessage' | 'navigateTo' | 'navigateBack' | 'redirectTo' | 'clean' | 't' | 'execute' | 'refresh' | 'aggregate' | 'checkOperation' | 'isDirty'; export type WebComponentListMethodNames = 'loadMore' | 'setFilters' | 'addNamedFilter' | 'removeNamedFilter' | 'removeNamedFilterByName' | 'setNamedSorters' | 'addNamedSorter' | 'removeNamedSorter' | 'removeNamedSorterByName' | 'setPageSize' | 'setCurrentPage' | 'addItem' | 'addItems' | 'removeItem' | 'removeItems' | 'updateItem' | 'updateItems' | 'resetItem' | 'recoverItem' | 'recoverItems'; export type WebComponentSingleMethodNames = 'update' | 'remove' | 'create' | 'isCreation' | 'getId' | 'setId'; diff --git a/src/page.mp.ts b/src/page.mp.ts index 7db5249b..0e18ab01 100644 --- a/src/page.mp.ts +++ b/src/page.mp.ts @@ -858,7 +858,7 @@ export function createComponent< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, TData extends DataOption = {}, diff --git a/src/page.native.tsx b/src/page.native.tsx index d205ed35..42a35dad 100644 --- a/src/page.native.tsx +++ b/src/page.native.tsx @@ -22,7 +22,7 @@ export function createComponent< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, diff --git a/src/page.react.tsx b/src/page.react.tsx index d603f60a..8189b51f 100644 --- a/src/page.react.tsx +++ b/src/page.react.tsx @@ -34,7 +34,7 @@ abstract class OakComponentBase< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, IsList extends boolean, @@ -650,7 +650,7 @@ export function createComponent< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, diff --git a/src/page.web.tsx b/src/page.web.tsx index b1a6381a..36d407df 100644 --- a/src/page.web.tsx +++ b/src/page.web.tsx @@ -22,7 +22,7 @@ export function createComponent< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record = {}, diff --git a/src/types/Page.ts b/src/types/Page.ts index ba6e5d29..03e1b524 100644 --- a/src/types/Page.ts +++ b/src/types/Page.ts @@ -317,7 +317,7 @@ export type OakComponentOption< T extends keyof ED, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record, FormedData extends Record, TData extends Record, @@ -599,7 +599,7 @@ export type MakeOakComponent< ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext, FrontCxt extends SyncContext, - AD extends Record>>, + AD extends Record>, FD extends Record > = < IsList extends boolean,