Oak-Team
/
oak-memory-tree-store
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

select的operation时处理sort和indexfrom

This commit is contained in:
Xu Chang 2022-04-07 19:10:05 +08:00
parent 890f3778df
commit 65872fb637
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/store.js
View File

@ -698,12 +698,13 @@ class TreeStore extends CascadeStore_1.CascadeStore {
async doOperation(entity, operation, context, params) {
const { action } = operation;
if (action === 'select') {
const result = await this.cascadeSelect(entity, operation, context, params);
const rows = await this.cascadeSelect(entity, operation, context, params);
const result = await this.formResult(entity, rows, operation, context);
const ids = result.map((ele) => ele.id);
return { ids };
}
else {
this.cascadeUpdate(entity, operation, context, params);
await this.cascadeUpdate(entity, operation, context, params);
return {};
}
}
@ -815,7 +816,18 @@ class TreeStore extends CascadeStore_1.CascadeStore {
await this.formProjection(entity, row, data, result, nodeDict2, context);
return result;
}));
return rows2;
// 再计算sorter
if (sorter) {
const sorterFn = this.translateSorter(entity, sorter, context);
rows2.sort(sorterFn);
}
// 最后用indexFrom和count来截断
if (typeof indexFrom === 'number') {
return rows2.slice(indexFrom, indexFrom + count);
}
else {
return rows2;
}
}
async select(entity, selection, context, params) {
let autoCommit = false;

20
src/store.ts
View File

@ -851,14 +851,16 @@ export default class TreeStore<ED extends {
private async doOperation<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Context<ED>, params?: OperateParams): Promise<OperationResult> {
const { action } = operation;
if (action === 'select') {
const result = await this.cascadeSelect(entity, operation as any, context, params);
const rows = await this.cascadeSelect(entity, operation as any, context, params);
const result = await this.formResult(entity, rows, operation as any, context);
const ids = result.map(
(ele) => ele.id!
);
return { ids };
}
else {
this.cascadeUpdate(entity, operation as any, context, params);
await this.cascadeUpdate(entity, operation as any, context, params);
return {};
}
}
@ -994,7 +996,19 @@ export default class TreeStore<ED extends {
)
);
return rows2;
// 再计算sorter
if (sorter) {
const sorterFn = this.translateSorter(entity, sorter, context);
rows2.sort(sorterFn);
}
// 最后用indexFrom和count来截断
if (typeof indexFrom === 'number') {
return rows2.slice(indexFrom, indexFrom! + count!);
}
else {
return rows2;
}
}
async select<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Context<ED>, params?: Object): Promise<SelectionResult<ED, T>> {