Oak-Team
/
oak-domain
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 33 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-domain into dev

This commit is contained in:
Xu Chang 2023-11-26 22:38:22 +08:00
parent 922e9ed25d 4765fe9eda
commit 9c3e5e6fc3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/store/CascadeStore.js
View File

@ -1658,7 +1658,10 @@ class CascadeStore extends RowStore_1.RowStore {
}
}
if (total) {
const total2 = await this.countAsync(entity, selection, context, option);
const total2 = await this.countAsync(entity, {
filter: selection.filter,
count: total,
}, context, option);
Object.assign(rows, {
'#total': total2,
});

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-domain",
"version": "3.0.4",
"version": "3.1.0",
"author": {
"name": "XuChang"
},

5
src/store/CascadeStore.ts
View File

@ -2044,7 +2044,10 @@ export abstract class CascadeStore<ED extends EntityDict & BaseEntityDict> exten
}
if (total) {
const total2 = await this.countAsync(entity, selection, context, option);
const total2 = await this.countAsync(entity, {
filter: selection.filter,
count: total,
}, context, option);
Object.assign(rows, {
'#total': total2,
});