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

Merge branch 'release'

This commit is contained in:
Xu Chang 2024-06-17 18:23:45 +08:00
parent 8592b379cf 824faf426a
commit 7425ded362
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
es/features/runningTree.js
View File

@ -724,13 +724,13 @@ class ListNode extends Node {
const { sorters, getTotal } = this;
const data = this.getProjection();
// assert(data, '取数据时找不到projection信息');
const sorterArr = sorters.filter(ele => !ignoreUnapplied || ele.applied).map((ele) => {
const sorterArr = sorters.length > 0 ? sorters.filter(ele => !ignoreUnapplied || ele.applied).map((ele) => {
const { sorter } = ele;
if (typeof sorter === 'function') {
return sorter();
}
return sorter;
}).flat().filter((ele) => !!ele);
}).flat().filter((ele) => !!ele) : undefined;
const filters = this.constructFilters(withParent, ignoreNewParent, ignoreUnapplied);
const filters2 = filters?.filter((ele) => !!ele);
const filter = filters2 ? combineFilters(this.entity, this.schema, filters2) : undefined;

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-frontend-base",
"version": "5.2.0",
"version": "5.2.1",
"description": "oak框架中前端与业务逻辑无关的平台部分",
"author": {
"name": "XuChang"

4
src/features/runningTree.ts
View File

@ -887,7 +887,7 @@ class ListNode<
const { sorters, getTotal } = this;
const data = this.getProjection();
// assert(data, '取数据时找不到projection信息');
const sorterArr = sorters.filter(
const sorterArr = sorters.length > 0 ? sorters.filter(
ele => !ignoreUnapplied || ele.applied
).map((ele) => {
const { sorter } = ele;
@ -895,7 +895,7 @@ class ListNode<
return (sorter as Function)();
}
return sorter;
}).flat().filter((ele) => !!ele) as ED[T]['Selection']['sorter'];
}).flat().filter((ele) => !!ele) as ED[T]['Selection']['sorter'] : undefined;
const filters = this.constructFilters(withParent, ignoreNewParent, ignoreUnapplied);