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
Download Patch File Download Diff File Expand all files Collapse all files
projects/poweredsoft/data/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@poweredsoft/data",
"version": "0.0.26",
"version": "0.0.27",
"peerDependencies": {
"rxjs": "^6.5.3"
}
projects/poweredsoft/data/src/lib/DataSource.ts
+7 -3
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 => {}