Open-Harbor/ts-data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change query logic tag 0.0.27

Browse Source
This commit is contained in:
Yubing325 2020-07-03 16:23:47 -05:00
parent 686674a94d
commit eff5a4d56a
5 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "data",
"version": "0.0.0",
"version": "0.0.27",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -7102,7 +7102,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@ -7517,7 +7518,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@ -7573,6 +7575,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -7616,12 +7619,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
@ -13211,7 +13216,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@ -13254,7 +13260,8 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
@ -13265,7 +13272,8 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -13382,7 +13390,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -13394,6 +13403,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -13416,12 +13426,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -13440,6 +13452,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -13520,7 +13533,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -13532,6 +13546,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -13617,7 +13632,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@ -13653,6 +13669,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -13672,6 +13689,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -13715,12 +13733,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "data",
"version": "0.0.26",
"version": "0.0.27",
"scripts": {
"ng": "ng",
"start": "ng serve",

2
projects/poweredsoft/data/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@poweredsoft/data",
"version": "0.0.26",
"version": "0.0.27",
"peerDependencies": {
"rxjs": "^6.5.3"
}

10
projects/poweredsoft/data/src/lib/DataSource.ts
View File

@ -167,8 +167,8 @@ export class DataSource<TModel> implements IDataSource<TModel>
}
query<TQuery extends IQueryCriteria>(query: TQuery) {
this._criteria.page = query.page || this._criteria.page;
this._criteria.pageSize = query.pageSize || this._criteria.pageSize;
this._criteria.page = query.page === undefined ? this._criteria.page:query.page;
this._criteria.pageSize = query.pageSize === undefined ? this._criteria.pageSize: query.pageSize;
this._criteria.filters = query.filters || this._criteria.filters;
this._criteria.groups = query.groups || this._criteria.groups;
this._criteria.aggregates = query.aggregates || this._criteria.aggregates;
@ -176,7 +176,11 @@ export class DataSource<TModel> implements IDataSource<TModel>
return this.refresh();
}
refresh() {
excuteQuery<TQuery extends IQueryCriteria>(query: TQuery): Observable<IQueryExecutionGroupResult<TModel> & IQueryExecutionGroupResult<TModel>>{
return this.options.transport.query.adapter.handle(query);
}
refresh() {debugger
return this._query().subscribe(
res => {},
err => {}

9
src/app/app.component.ts
View File

@ -23,7 +23,7 @@ export class AppComponent implements OnInit {
dataSource: IDataSource<any>;
createCommand: IDataSourceCommandAdapterOptions<MyModel>;
test:any;
public constructor(private http: HttpClient) {
}
@ -112,6 +112,11 @@ export class AppComponent implements OnInit {
message: message
});
});
this.test = this.dataSource.query({
page:null,
pageSize: null,
})
}
handleNotification(notification: IDataSourceNotifyMessage) {
@ -126,5 +131,7 @@ export class AppComponent implements OnInit {
});
//this.dataSource.refresh();
console.log(this.test);
}
}