@etsoo/appscript 1.3.21 → 1.3.23

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.
Files changed (17) hide show
  1. package/lib/cjs/erp/EntityApi.d.ts +2 -2
  2. package/lib/cjs/erp/PublicApi.d.ts +1 -1
  3. package/lib/cjs/erp/rq/MemberListRQ.d.ts +1 -1
  4. package/lib/cjs/erp/rq/QueryRQ.d.ts +4 -3
  5. package/lib/cjs/erp/rq/TiplistRQ.d.ts +3 -3
  6. package/lib/mjs/erp/EntityApi.d.ts +2 -2
  7. package/lib/mjs/erp/PublicApi.d.ts +1 -1
  8. package/lib/mjs/erp/rq/MemberListRQ.d.ts +1 -1
  9. package/lib/mjs/erp/rq/QueryRQ.d.ts +4 -3
  10. package/lib/mjs/erp/rq/TiplistRQ.d.ts +3 -3
  11. package/package.json +2 -2
  12. package/src/erp/EntityApi.ts +10 -8
  13. package/src/erp/OrgApi.ts +1 -1
  14. package/src/erp/PublicApi.ts +1 -1
  15. package/src/erp/rq/MemberListRQ.ts +1 -1
  16. package/src/erp/rq/QueryRQ.ts +5 -3
  17. package/src/erp/rq/TiplistRQ.ts +3 -3
package/lib/cjs/erp/EntityApi.d.ts CHANGED
@@ -37,14 +37,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
37
37
  * @param payload Payload
38
38
  * @returns Result
39
39
  */
40
- protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
40
+ protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
41
41
  /**
42
42
  * Query
43
43
  * @param rq Request data
44
44
  * @param payload Payload
45
45
  * @returns Result
46
46
  */
47
- protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
47
+ protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
48
48
  /**
49
49
  * Read
50
50
  * @param id Id
package/lib/cjs/erp/PublicApi.d.ts CHANGED
@@ -40,7 +40,7 @@ export declare class PublicApi extends BaseApi {
40
40
  * @param isJoined Add the join label like 'per Kg' for Kg
41
41
  * @returns Label
42
42
  */
43
- getUnitLabel(unit: ProductUnit, isJoined?: boolean | string): string;
43
+ getUnitLabel(unit: ProductUnit | number, isJoined?: boolean | string): string;
44
44
  private getUnitJoin;
45
45
  /**
46
46
  * Get mobile base64 QRCode
package/lib/cjs/erp/rq/MemberListRQ.d.ts CHANGED
@@ -2,4 +2,4 @@ import { TiplistRQ } from './TiplistRQ';
2
2
  /**
3
3
  * Member list request data
4
4
  */
5
- export declare type MemberListRQ = TiplistRQ & {};
5
+ export declare type MemberListRQ = TiplistRQ<string> & {};
package/lib/cjs/erp/rq/QueryRQ.d.ts CHANGED
@@ -1,16 +1,17 @@
1
+ import { DataTypes } from '@etsoo/shared';
1
2
  /**
2
3
  * Query request data
3
4
  * com.etsoo.CoreFramework.Models.QueryRQ
4
5
  */
5
- export declare type QueryRQ = {
6
+ export declare type QueryRQ<T extends DataTypes.IdType = number> = {
6
7
  /**
7
8
  * Number id
8
9
  */
9
- id?: number;
10
+ id?: T;
10
11
  /**
11
12
  * String id
12
13
  */
13
- sid?: number;
14
+ sid?: string;
14
15
  /**
15
16
  * Current page
16
17
  */
package/lib/cjs/erp/rq/TiplistRQ.d.ts CHANGED
@@ -3,11 +3,11 @@ import { DataTypes } from '@etsoo/shared';
3
3
  * Tiplist request data
4
4
  * com.etsoo.CoreFramework.Models.TiplistRQ
5
5
  */
6
- export declare type TiplistRQ = {
6
+ export declare type TiplistRQ<T extends DataTypes.IdType = number> = {
7
7
  /**
8
8
  * number id
9
9
  */
10
- id?: number;
10
+ id?: T;
11
11
  /**
12
12
  * String id
13
13
  */
@@ -15,7 +15,7 @@ export declare type TiplistRQ = {
15
15
  /**
16
16
  * Excluded ids
17
17
  */
18
- excludedIds?: DataTypes.IdType[];
18
+ excludedIds?: T[];
19
19
  /**
20
20
  * Filter keyword
21
21
  */
package/lib/mjs/erp/EntityApi.d.ts CHANGED
@@ -37,14 +37,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
37
37
  * @param payload Payload
38
38
  * @returns Result
39
39
  */
40
- protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
40
+ protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
41
41
  /**
42
42
  * Query
43
43
  * @param rq Request data
44
44
  * @param payload Payload
45
45
  * @returns Result
46
46
  */
47
- protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
47
+ protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
48
48
  /**
49
49
  * Read
50
50
  * @param id Id
package/lib/mjs/erp/PublicApi.d.ts CHANGED
@@ -40,7 +40,7 @@ export declare class PublicApi extends BaseApi {
40
40
  * @param isJoined Add the join label like 'per Kg' for Kg
41
41
  * @returns Label
42
42
  */
43
- getUnitLabel(unit: ProductUnit, isJoined?: boolean | string): string;
43
+ getUnitLabel(unit: ProductUnit | number, isJoined?: boolean | string): string;
44
44
  private getUnitJoin;
45
45
  /**
46
46
  * Get mobile base64 QRCode
package/lib/mjs/erp/rq/MemberListRQ.d.ts CHANGED
@@ -2,4 +2,4 @@ import { TiplistRQ } from './TiplistRQ';
2
2
  /**
3
3
  * Member list request data
4
4
  */
5
- export declare type MemberListRQ = TiplistRQ & {};
5
+ export declare type MemberListRQ = TiplistRQ<string> & {};
package/lib/mjs/erp/rq/QueryRQ.d.ts CHANGED
@@ -1,16 +1,17 @@
1
+ import { DataTypes } from '@etsoo/shared';
1
2
  /**
2
3
  * Query request data
3
4
  * com.etsoo.CoreFramework.Models.QueryRQ
4
5
  */
5
- export declare type QueryRQ = {
6
+ export declare type QueryRQ<T extends DataTypes.IdType = number> = {
6
7
  /**
7
8
  * Number id
8
9
  */
9
- id?: number;
10
+ id?: T;
10
11
  /**
11
12
  * String id
12
13
  */
13
- sid?: number;
14
+ sid?: string;
14
15
  /**
15
16
  * Current page
16
17
  */
package/lib/mjs/erp/rq/TiplistRQ.d.ts CHANGED
@@ -3,11 +3,11 @@ import { DataTypes } from '@etsoo/shared';
3
3
  * Tiplist request data
4
4
  * com.etsoo.CoreFramework.Models.TiplistRQ
5
5
  */
6
- export declare type TiplistRQ = {
6
+ export declare type TiplistRQ<T extends DataTypes.IdType = number> = {
7
7
  /**
8
8
  * number id
9
9
  */
10
- id?: number;
10
+ id?: T;
11
11
  /**
12
12
  * String id
13
13
  */
@@ -15,7 +15,7 @@ export declare type TiplistRQ = {
15
15
  /**
16
16
  * Excluded ids
17
17
  */
18
- excludedIds?: DataTypes.IdType[];
18
+ excludedIds?: T[];
19
19
  /**
20
20
  * Filter keyword
21
21
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.3.21",
3
+ "version": "1.3.23",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
54
54
  "dependencies": {
55
55
  "@etsoo/notificationbase": "^1.1.13",
56
56
  "@etsoo/restclient": "^1.0.75",
57
- "@etsoo/shared": "^1.1.66",
57
+ "@etsoo/shared": "^1.1.67",
58
58
  "@types/crypto-js": "^4.1.1",
59
59
  "crypto-js": "^4.1.1"
60
60
  },
package/src/erp/EntityApi.ts CHANGED
@@ -66,10 +66,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
66
66
  * @param payload Payload
67
67
  * @returns Result
68
68
  */
69
- protected listBase<RQ extends TiplistRQ, R extends object>(
70
- rq: RQ,
71
- payload?: IApiPayload<R[]>
72
- ) {
69
+ protected listBase<
70
+ T extends DataTypes.IdType,
71
+ RQ extends TiplistRQ<T>,
72
+ R extends object
73
+ >(rq: RQ, payload?: IApiPayload<R[]>) {
73
74
  return this.api.post(`${this.flag}/List`, rq, payload);
74
75
  }
75
76
 
@@ -79,10 +80,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
79
80
  * @param payload Payload
80
81
  * @returns Result
81
82
  */
82
- protected queryBase<RQ extends QueryRQ, R extends object>(
83
- rq: RQ,
84
- payload?: IApiPayload<R[]>
85
- ) {
83
+ protected queryBase<
84
+ T extends DataTypes.IdType,
85
+ RQ extends QueryRQ<T>,
86
+ R extends object
87
+ >(rq: RQ, payload?: IApiPayload<R[]>) {
86
88
  return this.api.post(`${this.flag}/Query`, rq, payload);
87
89
  }
88
90
 
package/src/erp/OrgApi.ts CHANGED
@@ -41,7 +41,7 @@ export class OrgApi extends EntityApi {
41
41
  return this.listBase(items, serviceId);
42
42
  } else {
43
43
  if (typeof serviceId === 'object') return undefined;
44
- return this.listBase<OrgListRQ, ListType>(
44
+ return this.listBase<number, OrgListRQ, ListType>(
45
45
  { items, serviceId },
46
46
  { defaultValue: [], showLoading: false }
47
47
  );
package/src/erp/PublicApi.ts CHANGED
@@ -85,7 +85,7 @@ export class PublicApi extends BaseApi {
85
85
  * @param isJoined Add the join label like 'per Kg' for Kg
86
86
  * @returns Label
87
87
  */
88
- getUnitLabel(unit: ProductUnit, isJoined?: boolean | string) {
88
+ getUnitLabel(unit: ProductUnit | number, isJoined?: boolean | string) {
89
89
  const key = ProductUnit[unit];
90
90
  const label = this.app.get('unit' + key) ?? key;
91
91
  const join = this.getUnitJoin(isJoined);
package/src/erp/rq/MemberListRQ.ts CHANGED
@@ -3,4 +3,4 @@ import { TiplistRQ } from './TiplistRQ';
3
3
  /**
4
4
  * Member list request data
5
5
  */
6
- export type MemberListRQ = TiplistRQ & {};
6
+ export type MemberListRQ = TiplistRQ<string> & {};
package/src/erp/rq/QueryRQ.ts CHANGED
@@ -1,17 +1,19 @@
1
+ import { DataTypes } from '@etsoo/shared';
2
+
1
3
  /**
2
4
  * Query request data
3
5
  * com.etsoo.CoreFramework.Models.QueryRQ
4
6
  */
5
- export type QueryRQ = {
7
+ export type QueryRQ<T extends DataTypes.IdType = number> = {
6
8
  /**
7
9
  * Number id
8
10
  */
9
- id?: number;
11
+ id?: T;
10
12
 
11
13
  /**
12
14
  * String id
13
15
  */
14
- sid?: number;
16
+ sid?: string;
15
17
 
16
18
  /**
17
19
  * Current page
package/src/erp/rq/TiplistRQ.ts CHANGED
@@ -4,11 +4,11 @@ import { DataTypes } from '@etsoo/shared';
4
4
  * Tiplist request data
5
5
  * com.etsoo.CoreFramework.Models.TiplistRQ
6
6
  */
7
- export type TiplistRQ = {
7
+ export type TiplistRQ<T extends DataTypes.IdType = number> = {
8
8
  /**
9
9
  * number id
10
10
  */
11
- id?: number;
11
+ id?: T;
12
12
 
13
13
  /**
14
14
  * String id
@@ -18,7 +18,7 @@ export type TiplistRQ = {
18
18
  /**
19
19
  * Excluded ids
20
20
  */
21
- excludedIds?: DataTypes.IdType[];
21
+ excludedIds?: T[];
22
22
 
23
23
  /**
24
24
  * Filter keyword