Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

mp环境下的一些初始化例程调试，watcher中的generateNewId换成异步

This commit is contained in:
Xu Chang 2022-12-05 20:32:31 +08:00
parent d570226f77
commit 2938e847fa
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/debugStore/index.ts
View File

@ -6,7 +6,7 @@ import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { analyzeActionDefDict } from 'oak-domain/lib/store/actionDef';
import { assert } from 'oak-domain/lib/utils/assert';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import { generateNewId } from 'oak-domain/lib/utils/uuid';
import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid';
async function initDataInStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>>(
store: DebugStore<ED, Cxt>,
@ -149,7 +149,7 @@ function initializeWatchers<ED extends EntityDict & BaseEntityDict, Cxt extends
const filter2 = typeof filter === 'function' ? await filter() : filter;
const data = typeof actionData === 'function' ? await (actionData as any)() : actionData; // 这里有个奇怪的编译错误，不理解 by Xc
const result = await store.operate(entity, {
id: generateNewId(),
id: await generateNewIdAsync(),
action,
data,
filter: filter2

89
src/page.mp.ts
View File

@ -79,7 +79,7 @@ const oakBehavior = Behavior<
> &
FDD;
subscribed: Array<() => void>;
option: OakComponentOption<
oakOption: OakComponentOption<
EDD,
keyof EDD,
Cxt,
@ -148,7 +148,7 @@ const oakBehavior = Behavior<
},
reRender() {
return reRender.call(this as any, this.option as any);
return reRender.call(this as any, this.oakOption as any);
},
async onLoad(query: Record<string, any>) {
@ -156,7 +156,7 @@ const oakBehavior = Behavior<
* 小程序以props传递数据，和以页面间参数传递数据的处理不一样，都在这里处理
* 目前处理的还不是很完善，在实际处理中再做
*/
const { properties, path } = this.option;
const { properties, path } = this.oakOption;
const assignProps = (
data: Record<string, any>,
property: string,
@ -213,7 +213,7 @@ const oakBehavior = Behavior<
}
}
if (this.props.oakPath || (this.iAmThePage() && path)) {
await onPathSet.call(this as any, this.option as any);
await onPathSet.call(this as any, this.oakOption as any);
} else {
this.reRender();
}
@ -235,7 +235,7 @@ const oakBehavior = Behavior<
if (
!this.state.oakLoadingMore &&
this.iAmThePage() &&
this.option.isList
this.oakOption.isList
) {
await this.loadMore();
}
@ -558,7 +558,7 @@ const oakBehavior = Behavior<
observers: {
oakPath(data) {
if (data) {
onPathSet.call(this as any, this.option as any);
onPathSet.call(this as any, this.oakOption as any);
}
},
oakId(data) {
@ -567,12 +567,12 @@ const oakBehavior = Behavior<
},
pageLifetimes: {
show() {
const { show } = this.option.lifetimes || {};
const { show } = this.oakOption.lifetimes || {};
this.reRender();
show && show.call(this);
},
hide() {
const { hide } = this.option.lifetimes || {};
const { hide } = this.oakOption.lifetimes || {};
hide && hide.call(this);
},
},
@ -589,36 +589,6 @@ const oakBehavior = Behavior<
});
};
},
attached() {
const { attached } = this.option.lifetimes || {};
const i18nInstance = getI18nInstanceWechatMp();
if (i18nInstance) {
(this as any).setState({
[CURRENT_LOCALE_KEY]: i18nInstance.currentLocale,
[CURRENT_LOCALE_DATA]: i18nInstance.translations,
});
}
attached && attached.call(this);
},
detached() {
this.state.oakFullpath &&
(this.iAmThePage() || this.props.oakAutoUnmount) &&
destroyNode.call(this as any);
const { detached } = this.option.lifetimes || {};
detached && detached.call(this);
},
ready() {
const { ready } = this.option.lifetimes || {};
ready && ready.call(this);
},
moved() {
const { moved } = this.option.lifetimes || {};
moved && moved.call(this);
},
error(err: Error) {
const { error } = this.option.lifetimes || {};
error && error.call(this, err);
},
},
});
@ -658,7 +628,7 @@ export function createComponent<
lifetimes,
observers,
} = option;
const { attached, show, hide, created, detached, ...restLifetimes } = lifetimes || {};
const { attached, show, hide, created, detached, ready, moved, error } = lifetimes || {};
const { options, externalClasses } = wechatMp || {};
return Component<
@ -686,7 +656,7 @@ export function createComponent<
AD & CommonAspectDict<ED, Cxt>
> &
FD;
subscribed: (() => void) | undefined;
subscribed: Array<() => void>;
oakOption: OakComponentOption<
ED,
T,
@ -703,7 +673,7 @@ export function createComponent<
}
>({
externalClasses,
options,
// options,
behaviors: [oakBehavior],
data: Object.assign({}, data, {
oakFullpath: '',
@ -721,7 +691,7 @@ export function createComponent<
},
pageLifetimes: {
show() {
this.reRender();
// this.reRender();
show && show.call(this);
},
hide() {
@ -732,8 +702,43 @@ export function createComponent<
created() {
this.oakOption = option;
this.features = features;
this.subscribed = [];
created && created.call(this);
},
attached() {
const i18nInstance = getI18nInstanceWechatMp();
if (i18nInstance) {
(this as any).setState({
[CURRENT_LOCALE_KEY]: i18nInstance.currentLocale,
[CURRENT_LOCALE_DATA]: i18nInstance.translations,
});
}
if (option.entity) {
this.subscribed.push(
features.cache.subscribe(() => this.reRender())
);
}
attached && attached.call(this);
},
detached() {
this.subscribed.forEach(
ele => ele()
);
this.state.oakFullpath &&
(this.iAmThePage() || this.props.oakAutoUnmount) &&
destroyNode.call(this as any);
detached && detached.call(this);
},
ready() {
ready && ready.call(this);
},
moved() {
moved && moved.call(this);
},
error(err: Error) {
error && error.call(this, err);
},
},
});
}