@etsoo/appscript 1.4.89 → 1.4.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -38,7 +38,11 @@ class EntityApi extends BaseApi_1.BaseApi {
38
38
  * @returns Result
39
39
  */
40
40
  listBase(rq, payload) {
41
- return this.api.post(`${this.flag}/List`, rq, payload);
41
+ let { queryPaging, ...rest } = rq;
42
+ if (typeof queryPaging === 'number') {
43
+ queryPaging = { currentPage: 0, batchSize: queryPaging };
44
+ }
45
+ return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
42
46
  }
43
47
  /**
44
48
  * Merge
@@ -33,7 +33,7 @@ class OrgApi extends EntityApi_1.EntityApi {
33
33
  else {
34
34
  if (typeof serviceId === 'object')
35
35
  return undefined;
36
- return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
36
+ return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
37
37
  }
38
38
  }
39
39
  /**
@@ -1,4 +1,5 @@
1
1
  import { IdType } from '@etsoo/shared';
2
+ import { QueryPagingData } from './QueryPagingData';
2
3
  /**
3
4
  * Tiplist request data
4
5
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
17
18
  */
18
19
  keyword?: string;
19
20
  /**
20
- * Max items to return
21
+ * Query paging data or items to read
21
22
  */
22
- items?: number;
23
+ queryPaging?: QueryPagingData | number;
23
24
  };
@@ -35,7 +35,11 @@ export class EntityApi extends BaseApi {
35
35
  * @returns Result
36
36
  */
37
37
  listBase(rq, payload) {
38
- return this.api.post(`${this.flag}/List`, rq, payload);
38
+ let { queryPaging, ...rest } = rq;
39
+ if (typeof queryPaging === 'number') {
40
+ queryPaging = { currentPage: 0, batchSize: queryPaging };
41
+ }
42
+ return this.api.post(`${this.flag}/List`, { queryPaging, ...rest }, payload);
39
43
  }
40
44
  /**
41
45
  * Merge
@@ -30,7 +30,7 @@ export class OrgApi extends EntityApi {
30
30
  else {
31
31
  if (typeof serviceId === 'object')
32
32
  return undefined;
33
- return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
33
+ return this.listBase({ queryPaging: items, serviceId }, { defaultValue: [], showLoading: false });
34
34
  }
35
35
  }
36
36
  /**
@@ -1,4 +1,5 @@
1
1
  import { IdType } from '@etsoo/shared';
2
+ import { QueryPagingData } from './QueryPagingData';
2
3
  /**
3
4
  * Tiplist request data
4
5
  * com.etsoo.CoreFramework.Models.TiplistRQ
@@ -17,7 +18,7 @@ export type TiplistRQ<T extends IdType = number> = {
17
18
  */
18
19
  keyword?: string;
19
20
  /**
20
- * Max items to return
21
+ * Query paging data or items to read
21
22
  */
22
- items?: number;
23
+ queryPaging?: QueryPagingData | number;
23
24
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.4.89",
3
+ "version": "1.4.90",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -74,7 +74,15 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
74
74
  RQ extends TiplistRQ<T>,
75
75
  R extends object
76
76
  >(rq: RQ, payload?: IApiPayload<R[]>) {
77
- return this.api.post(`${this.flag}/List`, rq, payload);
77
+ let { queryPaging, ...rest } = rq;
78
+ if (typeof queryPaging === 'number') {
79
+ queryPaging = { currentPage: 0, batchSize: queryPaging };
80
+ }
81
+ return this.api.post(
82
+ `${this.flag}/List`,
83
+ { queryPaging, ...rest },
84
+ payload
85
+ );
78
86
  }
79
87
 
80
88
  /**
package/src/erp/OrgApi.ts CHANGED
@@ -58,7 +58,7 @@ export class OrgApi extends EntityApi {
58
58
  } else {
59
59
  if (typeof serviceId === 'object') return undefined;
60
60
  return this.listBase<number, OrgListRQ, ListType>(
61
- { items, serviceId },
61
+ { queryPaging: items, serviceId },
62
62
  { defaultValue: [], showLoading: false }
63
63
  );
64
64
  }
@@ -1,4 +1,5 @@
1
1
  import { IdType } from '@etsoo/shared';
2
+ import { QueryPagingData } from './QueryPagingData';
2
3
 
3
4
  /**
4
5
  * Tiplist request data
@@ -21,7 +22,7 @@ export type TiplistRQ<T extends IdType = number> = {
21
22
  keyword?: string;
22
23
 
23
24
  /**
24
- * Max items to return
25
+ * Query paging data or items to read
25
26
  */
26
- items?: number;
27
+ queryPaging?: QueryPagingData | number;
27
28
  };