From 12f67dcdeb577622eb7e2ebaa6c484db133b88b2 Mon Sep 17 00:00:00 2001 From: JackLian Date: Tue, 5 Jul 2022 15:38:28 +0800 Subject: [PATCH] refactor: change __setLifeCycleMethods to its actual meaning __excuteLifeCycleMethod --- packages/renderer-core/src/renderer/addon.tsx | 2 +- packages/renderer-core/src/renderer/base.tsx | 14 +++++++------- packages/renderer-core/src/renderer/block.tsx | 2 +- packages/renderer-core/src/renderer/component.tsx | 2 +- packages/renderer-core/src/renderer/page.tsx | 4 ++-- packages/renderer-core/src/types/index.ts | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/renderer-core/src/renderer/addon.tsx b/packages/renderer-core/src/renderer/addon.tsx index 1341fbb35..964de1858 100644 --- a/packages/renderer-core/src/renderer/addon.tsx +++ b/packages/renderer-core/src/renderer/addon.tsx @@ -45,7 +45,7 @@ export default function addonRendererFactory(): IBaseRenderComponent { this.__initDataSource(props); this.open = this.open || (() => { }); this.close = this.close || (() => { }); - this.__setLifeCycleMethods('constructor', [...arguments]); + this.__excuteLifeCycleMethod('constructor', [...arguments]); } async componentWillUnmount() { diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx index 372f368d9..32bc0c5a8 100644 --- a/packages/renderer-core/src/renderer/base.tsx +++ b/packages/renderer-core/src/renderer/base.tsx @@ -131,28 +131,28 @@ export default function baseRendererFactory(): IBaseRenderComponent { } async getSnapshotBeforeUpdate(...args: any[]) { - this.__setLifeCycleMethods('getSnapshotBeforeUpdate', args); + this.__excuteLifeCycleMethod('getSnapshotBeforeUpdate', args); this.__debug(`getSnapshotBeforeUpdate - ${this.props?.__schema?.fileName}`); } async componentDidMount(...args: any[]) { this.reloadDataSource(); - this.__setLifeCycleMethods('componentDidMount', args); + this.__excuteLifeCycleMethod('componentDidMount', args); this.__debug(`componentDidMount - ${this.props?.__schema?.fileName}`); } async componentDidUpdate(...args: any[]) { - this.__setLifeCycleMethods('componentDidUpdate', args); + this.__excuteLifeCycleMethod('componentDidUpdate', args); this.__debug(`componentDidUpdate - ${this.props.__schema.fileName}`); } async componentWillUnmount(...args: any[]) { - this.__setLifeCycleMethods('componentWillUnmount', args); + this.__excuteLifeCycleMethod('componentWillUnmount', args); this.__debug(`componentWillUnmount - ${this.props?.__schema?.fileName}`); } async componentDidCatch(...args: any[]) { - this.__setLifeCycleMethods('componentDidCatch', args); + this.__excuteLifeCycleMethod('componentDidCatch', args); console.warn(args); } @@ -194,7 +194,7 @@ export default function baseRendererFactory(): IBaseRenderComponent { } } - __setLifeCycleMethods = (method: string, args?: any) => { + __excuteLifeCycleMethod = (method: string, args?: any) => { const lifeCycleMethods = getValue(this.props.__schema, 'lifeCycles', {}); let fn = lifeCycleMethods[method]; if (fn) { @@ -360,7 +360,7 @@ export default function baseRendererFactory(): IBaseRenderComponent { __render = () => { const schema = this.props.__schema; - this.__setLifeCycleMethods('render'); + this.__excuteLifeCycleMethod('render'); this.__writeCss(); const { engine } = this.context; diff --git a/packages/renderer-core/src/renderer/block.tsx b/packages/renderer-core/src/renderer/block.tsx index 17daccaa3..f87997864 100644 --- a/packages/renderer-core/src/renderer/block.tsx +++ b/packages/renderer-core/src/renderer/block.tsx @@ -13,7 +13,7 @@ export default function blockRendererFactory(): IBaseRenderComponent { const schema = props.__schema || {}; this.state = this.__parseData(schema.state || {}); this.__initDataSource(props); - this.__setLifeCycleMethods('constructor', [...arguments]); + this.__excuteLifeCycleMethod('constructor', [...arguments]); } render() { diff --git a/packages/renderer-core/src/renderer/component.tsx b/packages/renderer-core/src/renderer/component.tsx index 3b73fd0fd..85b1fd4d3 100644 --- a/packages/renderer-core/src/renderer/component.tsx +++ b/packages/renderer-core/src/renderer/component.tsx @@ -15,7 +15,7 @@ export default function componentRendererFactory(): IBaseRenderComponent { const schema = props.__schema || {}; this.state = this.__parseData(schema.state || {}); this.__initDataSource(props); - this.__setLifeCycleMethods('constructor', arguments as any); + this.__excuteLifeCycleMethod('constructor', arguments as any); } render() { diff --git a/packages/renderer-core/src/renderer/page.tsx b/packages/renderer-core/src/renderer/page.tsx index 380e0fb36..41c1a713f 100644 --- a/packages/renderer-core/src/renderer/page.tsx +++ b/packages/renderer-core/src/renderer/page.tsx @@ -15,7 +15,7 @@ export default function pageRendererFactory(): IBaseRenderComponent { const schema = props.__schema || {}; this.state = this.__parseData(schema.state || {}); this.__initDataSource(props); - this.__setLifeCycleMethods('constructor', [props, ...rest]); + this.__excuteLifeCycleMethod('constructor', [props, ...rest]); } async componentDidUpdate(prevProps: IBaseRendererProps, _prevState: {}, snapshot: unknown) { @@ -40,7 +40,7 @@ export default function pageRendererFactory(): IBaseRenderComponent { this.__bindCustomMethods(this.props); this.__initDataSource(this.props); - // this.__setLifeCycleMethods('constructor', arguments); + // this.__excuteLifeCycleMethod('constructor', arguments); this.__generateCtx({ page: this, diff --git a/packages/renderer-core/src/types/index.ts b/packages/renderer-core/src/types/index.ts index a3e7f0c36..34e69b164 100644 --- a/packages/renderer-core/src/types/index.ts +++ b/packages/renderer-core/src/types/index.ts @@ -240,7 +240,7 @@ export type IBaseRendererInstance = IGeneralComponent< __beforeInit(props: IBaseRendererProps): void; __init(props: IBaseRendererProps): void; __afterInit(props: IBaseRendererProps): void; - __setLifeCycleMethods(method: string, args?: any[]): void; + __excuteLifeCycleMethod(method: string, args?: any[]): void; __bindCustomMethods(props: IBaseRendererProps): void; __generateCtx(ctx: Record): void; __parseData(data: any, ctx?: any): any;