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

修正了前端triggerExecutor的行为

This commit is contained in:
Xu Chang 2023-11-11 20:43:14 +08:00
parent 1711b787d2
commit b921e09369
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
es/cacheStore/SyncTriggerExecutor.js
View File

@ -55,7 +55,7 @@ export default class SyncTriggerExecutor {
action.forEach(a => this.addToCheckerMap(a, entity, priority || CHECKER_PRIORITY_MAP[type], when, fn, type, conditionalFilter));
}
else {
this.addToCheckerMap(action, entity, priority, when, fn, type, conditionalFilter);
this.addToCheckerMap(action, entity, priority || CHECKER_PRIORITY_MAP[type], when, fn, type, conditionalFilter);
}
}
/* registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>) {

4
es/debugStore/DebugStore.js
View File

@ -28,11 +28,11 @@ export class DebugStore extends TreeStore {
}
async cascadeUpdateAsync(entity, operation, context, option) {
// 如果是在modi处理过程中，所有的trigger也可以延时到apply时再处理（这时候因为modi中的数据并不实际存在，处理会有问题）
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.preOperation(entity, operation, context, option);
}
const result = await super.cascadeUpdateAsync(entity, operation, context, option);
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.postOperation(entity, operation, context, option);
}
return result;

2
es/features/cache.js
View File

@ -25,7 +25,7 @@ export class Cache extends Feature {
this.syncEventsCallbacks = [];
this.cacheStore = new CacheStore(storageSchema);
this.contextBuilder = () => frontendContextBuilder()(this.cacheStore);
this.savedEntities = ['actionAuth', 'i18n', ...(savedEntities || [])];
this.savedEntities = ['actionAuth', 'i18n', 'path', ...(savedEntities || [])];
this.keepFreshPeriod = keepFreshPeriod || DEFAULT_KEEP_FRESH_PERIOD;
this.localStorage = localStorage;
checkers.forEach((checker) => this.cacheStore.registerChecker(checker));

2
lib/cacheStore/SyncTriggerExecutor.js
View File

@ -57,7 +57,7 @@ class SyncTriggerExecutor {
action.forEach(a => this.addToCheckerMap(a, entity, priority || types_1.CHECKER_PRIORITY_MAP[type], when, fn, type, conditionalFilter));
}
else {
this.addToCheckerMap(action, entity, priority, when, fn, type, conditionalFilter);
this.addToCheckerMap(action, entity, priority || types_1.CHECKER_PRIORITY_MAP[type], when, fn, type, conditionalFilter);
}
}
/* registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>) {

4
lib/debugStore/DebugStore.js
View File

@ -31,11 +31,11 @@ class DebugStore extends oak_memory_tree_store_1.TreeStore {
}
async cascadeUpdateAsync(entity, operation, context, option) {
// 如果是在modi处理过程中，所有的trigger也可以延时到apply时再处理（这时候因为modi中的数据并不实际存在，处理会有问题）
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.preOperation(entity, operation, context, option);
}
const result = await super.cascadeUpdateAsync(entity, operation, context, option);
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.postOperation(entity, operation, context, option);
}
return result;

2
lib/features/cache.js
View File

@ -28,7 +28,7 @@ class Cache extends Feature_1.Feature {
this.syncEventsCallbacks = [];
this.cacheStore = new CacheStore_1.CacheStore(storageSchema);
this.contextBuilder = () => frontendContextBuilder()(this.cacheStore);
this.savedEntities = ['actionAuth', 'i18n', ...(savedEntities || [])];
this.savedEntities = ['actionAuth', 'i18n', 'path', ...(savedEntities || [])];
this.keepFreshPeriod = keepFreshPeriod || DEFAULT_KEEP_FRESH_PERIOD;
this.localStorage = localStorage;
checkers.forEach((checker) => this.cacheStore.registerChecker(checker));

4
src/cacheStore/SyncTriggerExecutor.ts
View File

@ -30,7 +30,7 @@ export default class SyncTriggerExecutor<ED extends EntityDict & BaseEntityDict,
let iter = 0;
const checkers = this.checkerMap[entity]![action]!;
for (; iter < checkers.length; iter++) {
if (priority! <= checkers[iter].priority!) {
if (priority <= checkers[iter].priority!) {
break;
}
}
@ -78,7 +78,7 @@ export default class SyncTriggerExecutor<ED extends EntityDict & BaseEntityDict,
);
}
else {
this.addToCheckerMap(action as string, entity, priority!, when, fn as any, type, conditionalFilter);
this.addToCheckerMap(action as string, entity, priority || CHECKER_PRIORITY_MAP[type], when, fn as any, type, conditionalFilter);
}
}

4
src/debugStore/DebugStore.ts
View File

@ -52,11 +52,11 @@ export class DebugStore<ED extends EntityDict & BaseEntityDict, Cxt extends Asyn
protected async cascadeUpdateAsync<T extends keyof ED, OP extends DebugStoreOperateOption>(entity: T, operation: ED[T]['Operation'], context: AsyncContext<ED>, option: OP) {
// 如果是在modi处理过程中，所有的trigger也可以延时到apply时再处理（这时候因为modi中的数据并不实际存在，处理会有问题）
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.preOperation(entity, operation, context as Cxt, option);
}
const result = await super.cascadeUpdateAsync(entity, operation, context, option);
if (!option.blockTrigger && !option.modiParentEntity) {
if (!option.blockTrigger) {
await this.executor.postOperation(entity, operation, context as Cxt, option);
}
return result;

2
src/features/cache.ts
View File

@ -66,7 +66,7 @@ export class Cache<
this.cacheStore = new CacheStore(storageSchema);
this.contextBuilder = () => frontendContextBuilder()(this.cacheStore);
this.savedEntities = ['actionAuth', 'i18n', ...(savedEntities || [])];
this.savedEntities = ['actionAuth', 'i18n', 'path', ...(savedEntities || [])];
this.keepFreshPeriod = keepFreshPeriod || DEFAULT_KEEP_FRESH_PERIOD;
this.localStorage = localStorage;