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

Merge branch 'dev' into release

This commit is contained in:
Xu Chang 2024-05-15 11:32:43 +08:00
parent 924303a673 1bdd3a01b1
commit 196bd3df56
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
es/page.common.js
View File

@ -24,14 +24,10 @@ export function onPathSet(option) {
});
if (oakFilters) {
if (filters2) {
filters2.push(oakFilters.map(ele => ({
filter: ele
})));
filters2 = filters2.concat(oakFilters);
}
else {
filters2 = oakFilters.map(ele => ({
filter: ele
}));
filters2 = oakFilters;
}
}
const sorters2 = sorters?.map((ele) => {

8
lib/page.common.js
View File

@ -27,14 +27,10 @@ function onPathSet(option) {
});
if (oakFilters) {
if (filters2) {
filters2.push(oakFilters.map(ele => ({
filter: ele
})));
filters2 = filters2.concat(oakFilters);
}
else {
filters2 = oakFilters.map(ele => ({
filter: ele
}));
filters2 = oakFilters;
}
}
const sorters2 = sorters?.map((ele) => {

8
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-frontend-base",
"version": "5.0.5",
"version": "5.0.6",
"description": "oak框架中前端与业务逻辑无关的平台部分",
"author": {
"name": "XuChang"
@ -21,9 +21,9 @@
"history": "^5.3.0",
"i18n-js": "^4.3.0",
"node-schedule": "^2.1.1",
"oak-common-aspect": "~3.0.0",
"oak-domain": "~5.0.5",
"oak-memory-tree-store": "~3.3.0",
"oak-common-aspect": "^3.0.0",
"oak-domain": "^5.0.6",
"oak-memory-tree-store": "^3.3.0",
"ol": "^7.3.0",
"react-native-device-info": "^10.12.0",
"react-native-localize": "^3.0.4",

12
src/page.common.ts
View File

@ -55,18 +55,10 @@ export function onPathSet<
);
if (oakFilters) {
if (filters2) {
filters2.push(oakFilters.map(
ele => ({
filter: ele
})
));
filters2 = filters2.concat(oakFilters);
}
else {
filters2 = oakFilters.map(
ele => ({
filter: ele
})
);
filters2 = oakFilters as NamedFilterItem<ED, T>[];
}
}
const sorters2 = sorters?.map(