@etsoo/smarterp-core 1.0.16 → 1.0.18

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 (34) hide show
  1. package/lib/cjs/UserApi.d.ts +15 -0
  2. package/lib/cjs/UserApi.js +17 -0
  3. package/lib/cjs/components/org/OrgTiplist.d.ts +5 -0
  4. package/lib/cjs/components/org/OrgTiplist.js +2 -2
  5. package/lib/cjs/components/user/UserTiplist.d.ts +5 -0
  6. package/lib/cjs/components/user/UserTiplist.js +2 -2
  7. package/lib/cjs/dto/user/UserUpdateReadDto.d.ts +39 -0
  8. package/lib/cjs/dto/user/UserUpdateReadDto.js +2 -0
  9. package/lib/cjs/index.d.ts +2 -0
  10. package/lib/cjs/index.js +2 -0
  11. package/lib/cjs/rq/member/MemberListRQ.d.ts +10 -0
  12. package/lib/cjs/rq/user/UserUpdateRQ.d.ts +37 -0
  13. package/lib/cjs/rq/user/UserUpdateRQ.js +2 -0
  14. package/lib/mjs/UserApi.d.ts +15 -0
  15. package/lib/mjs/UserApi.js +17 -0
  16. package/lib/mjs/components/org/OrgTiplist.d.ts +5 -0
  17. package/lib/mjs/components/org/OrgTiplist.js +2 -2
  18. package/lib/mjs/components/user/UserTiplist.d.ts +5 -0
  19. package/lib/mjs/components/user/UserTiplist.js +2 -2
  20. package/lib/mjs/dto/user/UserUpdateReadDto.d.ts +39 -0
  21. package/lib/mjs/dto/user/UserUpdateReadDto.js +1 -0
  22. package/lib/mjs/index.d.ts +2 -0
  23. package/lib/mjs/index.js +2 -0
  24. package/lib/mjs/rq/member/MemberListRQ.d.ts +10 -0
  25. package/lib/mjs/rq/user/UserUpdateRQ.d.ts +37 -0
  26. package/lib/mjs/rq/user/UserUpdateRQ.js +1 -0
  27. package/package.json +2 -2
  28. package/src/UserApi.ts +21 -0
  29. package/src/components/org/OrgTiplist.tsx +8 -1
  30. package/src/components/user/UserTiplist.tsx +8 -1
  31. package/src/dto/user/UserUpdateReadDto.ts +45 -0
  32. package/src/index.ts +2 -0
  33. package/src/rq/member/MemberListRQ.ts +12 -0
  34. package/src/rq/user/UserUpdateRQ.ts +43 -0
@@ -6,6 +6,8 @@ import { AuditHistoryDto } from "./dto/user/AuditHistoryDto";
6
6
  import { AppData } from "./dto/app/AppData";
7
7
  import { UserIdentifierData } from "./dto/user/UserIdentifierData";
8
8
  import { ValidateRQ } from "./rq/authCode/ValidateRQ";
9
+ import { UserUpdateReadDto } from "./dto/user/UserUpdateReadDto";
10
+ import { UserUpdateRQ } from "./rq/user/UserUpdateRQ";
9
11
  /**
10
12
  * User API
11
13
  * 用户接口
@@ -78,6 +80,13 @@ export declare class UserApi extends EntityApi {
78
80
  * @returns Result
79
81
  */
80
82
  getLatestApp(payload?: IApiPayload<AppData>): Promise<AppData | undefined>;
83
+ /**
84
+ * Update
85
+ * @param rq Request data
86
+ * @param payload Payload
87
+ * @returns Result
88
+ */
89
+ update(rq: UserUpdateRQ, payload?: IdResultPayload): Promise<import("@etsoo/shared").IdActionResult | undefined>;
81
90
  /**
82
91
  * Update avatar
83
92
  * @param data Avatar form data
@@ -85,4 +94,10 @@ export declare class UserApi extends EntityApi {
85
94
  * @returns Result
86
95
  */
87
96
  updateAvatar(data: FormData, payload?: MsgResultPayload): Promise<import("@etsoo/shared").MsgActionResult | undefined>;
97
+ /**
98
+ * Update read
99
+ * @param payload Payload
100
+ * @returns Result
101
+ */
102
+ updateRead(payload?: IApiPayload<UserUpdateReadDto>): Promise<UserUpdateReadDto | undefined>;
88
103
  }
@@ -94,6 +94,15 @@ class UserApi extends appscript_1.EntityApi {
94
94
  getLatestApp(payload) {
95
95
  return this.api.get("User/GetLatestApp", undefined, payload);
96
96
  }
97
+ /**
98
+ * Update
99
+ * @param rq Request data
100
+ * @param payload Payload
101
+ * @returns Result
102
+ */
103
+ update(rq, payload) {
104
+ return this.updateBase(rq, payload);
105
+ }
97
106
  /**
98
107
  * Update avatar
99
108
  * @param data Avatar form data
@@ -107,5 +116,13 @@ class UserApi extends appscript_1.EntityApi {
107
116
  payload.config.credentials = "include";
108
117
  return this.api.put(`${this.flag}/UpdateAvatar`, data, payload);
109
118
  }
119
+ /**
120
+ * Update read
121
+ * @param payload Payload
122
+ * @returns Result
123
+ */
124
+ updateRead(payload) {
125
+ return this.api.put(`${this.flag}/UpdateRead`, undefined, payload);
126
+ }
110
127
  }
111
128
  exports.UserApi = UserApi;
@@ -1,5 +1,6 @@
1
1
  import { TiplistProps } from "@etsoo/materialui";
2
2
  import { OrgListDto } from "../../dto/org/OrgListDto";
3
+ import { OrgListRQ } from "../../rq/org/OrgListRQ";
3
4
  /**
4
5
  * Organization tiplist properties
5
6
  * 机构提示列表属性
@@ -13,6 +14,10 @@ export type OrgTiplistProps = Omit<TiplistProps<OrgListDto, "id">, "loadData" |
13
14
  * Name
14
15
  */
15
16
  name?: string;
17
+ /**
18
+ * Default request data
19
+ */
20
+ rq?: Partial<OrgListRQ>;
16
21
  };
17
22
  /**
18
23
  * Organization tiplist
@@ -14,10 +14,10 @@ function OrgTiplist(props) {
14
14
  // App
15
15
  const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
16
16
  // Destruct
17
- const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", ...rest } = props;
17
+ const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", rq = { enabled: true }, ...rest } = props;
18
18
  // Layout
19
19
  return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list({
20
- enabled: true,
20
+ ...rq,
21
21
  keyword,
22
22
  id,
23
23
  queryPaging: {
@@ -1,5 +1,6 @@
1
1
  import { TiplistProps } from "@etsoo/materialui";
2
2
  import { MemberListDto } from "../../dto/member/MemberListDto";
3
+ import { MemberListRQ } from "../../rq/member/MemberListRQ";
3
4
  /**
4
5
  * User tiplist properties
5
6
  * 用户提示列表属性
@@ -13,6 +14,10 @@ export type UserTiplistProps = Omit<TiplistProps<MemberListDto, "id">, "loadData
13
14
  * Name
14
15
  */
15
16
  name?: string;
17
+ /**
18
+ * Default request data
19
+ */
20
+ rq?: Partial<MemberListRQ>;
16
21
  };
17
22
  /**
18
23
  * User tiplist
@@ -14,10 +14,10 @@ function UserTiplist(props) {
14
14
  // App
15
15
  const app = (0, ICoreServiceApp_1.useRequiredAppContext)();
16
16
  // Destruct
17
- const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", ...rest } = props;
17
+ const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", rq = { enabled: true }, ...rest } = props;
18
18
  // Layout
19
19
  return ((0, jsx_runtime_1.jsx)(materialui_1.Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list({
20
- enabled: true,
20
+ ...rq,
21
21
  keyword,
22
22
  id,
23
23
  queryPaging: {
@@ -0,0 +1,39 @@
1
+ /**
2
+ * User read for update data
3
+ * 用户更新读取数据
4
+ */
5
+ export type UserUpdateReadDto = {
6
+ /**
7
+ * Id
8
+ */
9
+ id: number;
10
+ /**
11
+ * Name
12
+ */
13
+ name: string;
14
+ /**
15
+ * Preferred name
16
+ * 首选名字
17
+ */
18
+ preferredName?: string;
19
+ /**
20
+ * Family name
21
+ * 姓
22
+ */
23
+ familyName?: string;
24
+ /**
25
+ * Given name
26
+ * 名
27
+ */
28
+ givenName?: string;
29
+ /**
30
+ * Latin family name
31
+ * 拉丁姓
32
+ */
33
+ latinFamilyName?: string;
34
+ /**
35
+ * Latin given name
36
+ * 拉丁名
37
+ */
38
+ latinGivenName?: string;
39
+ };
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
@@ -23,6 +23,7 @@ export * from "./dto/public/RegionData";
23
23
  export * from "./dto/user/AuditHistoryDto";
24
24
  export * from "./dto/user/DeviceListDto";
25
25
  export * from "./dto/user/UserIdentifierData";
26
+ export * from "./dto/user/UserUpdateReadDto";
26
27
  export * from "./dto/IdentityType";
27
28
  export * from "./i18n/CoreCulture";
28
29
  export * from "./rq/app/AppBuyNewRQ";
@@ -51,6 +52,7 @@ export * from "./rq/public/CreateBarcodeRQ";
51
52
  export * from "./rq/public/PinyinRQ";
52
53
  export * from "./rq/public/PlaceQueryRQ";
53
54
  export * from "./rq/user/AuditHistoryRQ";
55
+ export * from "./rq/user/UserUpdateRQ";
54
56
  export * from "./AppApi";
55
57
  export * from "./AuthCodeApi";
56
58
  export * from "./CoreApp";
package/lib/cjs/index.js CHANGED
@@ -40,6 +40,7 @@ __exportStar(require("./dto/public/RegionData"), exports);
40
40
  __exportStar(require("./dto/user/AuditHistoryDto"), exports);
41
41
  __exportStar(require("./dto/user/DeviceListDto"), exports);
42
42
  __exportStar(require("./dto/user/UserIdentifierData"), exports);
43
+ __exportStar(require("./dto/user/UserUpdateReadDto"), exports);
43
44
  __exportStar(require("./dto/IdentityType"), exports);
44
45
  // i18n
45
46
  __exportStar(require("./i18n/CoreCulture"), exports);
@@ -70,6 +71,7 @@ __exportStar(require("./rq/public/CreateBarcodeRQ"), exports);
70
71
  __exportStar(require("./rq/public/PinyinRQ"), exports);
71
72
  __exportStar(require("./rq/public/PlaceQueryRQ"), exports);
72
73
  __exportStar(require("./rq/user/AuditHistoryRQ"), exports);
74
+ __exportStar(require("./rq/user/UserUpdateRQ"), exports);
73
75
  // APIs
74
76
  __exportStar(require("./AppApi"), exports);
75
77
  __exportStar(require("./AuthCodeApi"), exports);
@@ -15,4 +15,14 @@ export type MemberListRQ = StatusQueryRQ & {
15
15
  * User role start
16
16
  */
17
17
  userRoleStart?: UserRole;
18
+ /**
19
+ * Inviter id
20
+ * 邀请人编号
21
+ */
22
+ inviterId?: number;
23
+ /**
24
+ * Report to
25
+ * 汇报对象
26
+ */
27
+ reportTo?: number;
18
28
  };
@@ -0,0 +1,37 @@
1
+ import { UpdateModel } from "@etsoo/appscript";
2
+ /**
3
+ * Update user request data
4
+ * 更新用户请求数据
5
+ */
6
+ export interface UserUpdateRQ extends UpdateModel {
7
+ /**
8
+ * Name
9
+ * 姓名
10
+ */
11
+ name?: string;
12
+ /**
13
+ * Preferred name
14
+ * 首选名字
15
+ */
16
+ preferredName?: string;
17
+ /**
18
+ * Family name
19
+ * 姓
20
+ */
21
+ familyName?: string;
22
+ /**
23
+ * Given name
24
+ * 名
25
+ */
26
+ givenName?: string;
27
+ /**
28
+ * Latin family name
29
+ * 拉丁姓
30
+ */
31
+ latinFamilyName?: string;
32
+ /**
33
+ * Latin given name
34
+ * 拉丁名
35
+ */
36
+ latinGivenName?: string;
37
+ }
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
@@ -6,6 +6,8 @@ import { AuditHistoryDto } from "./dto/user/AuditHistoryDto";
6
6
  import { AppData } from "./dto/app/AppData";
7
7
  import { UserIdentifierData } from "./dto/user/UserIdentifierData";
8
8
  import { ValidateRQ } from "./rq/authCode/ValidateRQ";
9
+ import { UserUpdateReadDto } from "./dto/user/UserUpdateReadDto";
10
+ import { UserUpdateRQ } from "./rq/user/UserUpdateRQ";
9
11
  /**
10
12
  * User API
11
13
  * 用户接口
@@ -78,6 +80,13 @@ export declare class UserApi extends EntityApi {
78
80
  * @returns Result
79
81
  */
80
82
  getLatestApp(payload?: IApiPayload<AppData>): Promise<AppData | undefined>;
83
+ /**
84
+ * Update
85
+ * @param rq Request data
86
+ * @param payload Payload
87
+ * @returns Result
88
+ */
89
+ update(rq: UserUpdateRQ, payload?: IdResultPayload): Promise<import("@etsoo/shared").IdActionResult | undefined>;
81
90
  /**
82
91
  * Update avatar
83
92
  * @param data Avatar form data
@@ -85,4 +94,10 @@ export declare class UserApi extends EntityApi {
85
94
  * @returns Result
86
95
  */
87
96
  updateAvatar(data: FormData, payload?: MsgResultPayload): Promise<import("@etsoo/shared").MsgActionResult | undefined>;
97
+ /**
98
+ * Update read
99
+ * @param payload Payload
100
+ * @returns Result
101
+ */
102
+ updateRead(payload?: IApiPayload<UserUpdateReadDto>): Promise<UserUpdateReadDto | undefined>;
88
103
  }
@@ -91,6 +91,15 @@ export class UserApi extends EntityApi {
91
91
  getLatestApp(payload) {
92
92
  return this.api.get("User/GetLatestApp", undefined, payload);
93
93
  }
94
+ /**
95
+ * Update
96
+ * @param rq Request data
97
+ * @param payload Payload
98
+ * @returns Result
99
+ */
100
+ update(rq, payload) {
101
+ return this.updateBase(rq, payload);
102
+ }
94
103
  /**
95
104
  * Update avatar
96
105
  * @param data Avatar form data
@@ -104,4 +113,12 @@ export class UserApi extends EntityApi {
104
113
  payload.config.credentials = "include";
105
114
  return this.api.put(`${this.flag}/UpdateAvatar`, data, payload);
106
115
  }
116
+ /**
117
+ * Update read
118
+ * @param payload Payload
119
+ * @returns Result
120
+ */
121
+ updateRead(payload) {
122
+ return this.api.put(`${this.flag}/UpdateRead`, undefined, payload);
123
+ }
107
124
  }
@@ -1,5 +1,6 @@
1
1
  import { TiplistProps } from "@etsoo/materialui";
2
2
  import { OrgListDto } from "../../dto/org/OrgListDto";
3
+ import { OrgListRQ } from "../../rq/org/OrgListRQ";
3
4
  /**
4
5
  * Organization tiplist properties
5
6
  * 机构提示列表属性
@@ -13,6 +14,10 @@ export type OrgTiplistProps = Omit<TiplistProps<OrgListDto, "id">, "loadData" |
13
14
  * Name
14
15
  */
15
16
  name?: string;
17
+ /**
18
+ * Default request data
19
+ */
20
+ rq?: Partial<OrgListRQ>;
16
21
  };
17
22
  /**
18
23
  * Organization tiplist
@@ -11,10 +11,10 @@ export function OrgTiplist(props) {
11
11
  // App
12
12
  const app = useRequiredAppContext();
13
13
  // Destruct
14
- const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", ...rest } = props;
14
+ const { fullWidth = true, label = app.get("org"), maxItems = 10, getOptionLabel = (data) => data.name + "(" + data.pin + ")", name = "organizationId", rq = { enabled: true }, ...rest } = props;
15
15
  // Layout
16
16
  return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.orgApi.list({
17
- enabled: true,
17
+ ...rq,
18
18
  keyword,
19
19
  id,
20
20
  queryPaging: {
@@ -1,5 +1,6 @@
1
1
  import { TiplistProps } from "@etsoo/materialui";
2
2
  import { MemberListDto } from "../../dto/member/MemberListDto";
3
+ import { MemberListRQ } from "../../rq/member/MemberListRQ";
3
4
  /**
4
5
  * User tiplist properties
5
6
  * 用户提示列表属性
@@ -13,6 +14,10 @@ export type UserTiplistProps = Omit<TiplistProps<MemberListDto, "id">, "loadData
13
14
  * Name
14
15
  */
15
16
  name?: string;
17
+ /**
18
+ * Default request data
19
+ */
20
+ rq?: Partial<MemberListRQ>;
16
21
  };
17
22
  /**
18
23
  * User tiplist
@@ -11,10 +11,10 @@ export function UserTiplist(props) {
11
11
  // App
12
12
  const app = useRequiredAppContext();
13
13
  // Destruct
14
- const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", ...rest } = props;
14
+ const { fullWidth = true, label = app.get("user"), maxItems = 10, getOptionLabel = (data) => data.name, name = "userId", rq = { enabled: true }, ...rest } = props;
15
15
  // Layout
16
16
  return (_jsx(Tiplist, { label: label, getOptionLabel: getOptionLabel, name: name, fullWidth: fullWidth, maxItems: maxItems, loadData: (keyword, id, maxItems) => app.core.memberApi.list({
17
- enabled: true,
17
+ ...rq,
18
18
  keyword,
19
19
  id,
20
20
  queryPaging: {
@@ -0,0 +1,39 @@
1
+ /**
2
+ * User read for update data
3
+ * 用户更新读取数据
4
+ */
5
+ export type UserUpdateReadDto = {
6
+ /**
7
+ * Id
8
+ */
9
+ id: number;
10
+ /**
11
+ * Name
12
+ */
13
+ name: string;
14
+ /**
15
+ * Preferred name
16
+ * 首选名字
17
+ */
18
+ preferredName?: string;
19
+ /**
20
+ * Family name
21
+ * 姓
22
+ */
23
+ familyName?: string;
24
+ /**
25
+ * Given name
26
+ * 名
27
+ */
28
+ givenName?: string;
29
+ /**
30
+ * Latin family name
31
+ * 拉丁姓
32
+ */
33
+ latinFamilyName?: string;
34
+ /**
35
+ * Latin given name
36
+ * 拉丁名
37
+ */
38
+ latinGivenName?: string;
39
+ };
@@ -0,0 +1 @@
1
+ export {};
@@ -23,6 +23,7 @@ export * from "./dto/public/RegionData";
23
23
  export * from "./dto/user/AuditHistoryDto";
24
24
  export * from "./dto/user/DeviceListDto";
25
25
  export * from "./dto/user/UserIdentifierData";
26
+ export * from "./dto/user/UserUpdateReadDto";
26
27
  export * from "./dto/IdentityType";
27
28
  export * from "./i18n/CoreCulture";
28
29
  export * from "./rq/app/AppBuyNewRQ";
@@ -51,6 +52,7 @@ export * from "./rq/public/CreateBarcodeRQ";
51
52
  export * from "./rq/public/PinyinRQ";
52
53
  export * from "./rq/public/PlaceQueryRQ";
53
54
  export * from "./rq/user/AuditHistoryRQ";
55
+ export * from "./rq/user/UserUpdateRQ";
54
56
  export * from "./AppApi";
55
57
  export * from "./AuthCodeApi";
56
58
  export * from "./CoreApp";
package/lib/mjs/index.js CHANGED
@@ -24,6 +24,7 @@ export * from "./dto/public/RegionData";
24
24
  export * from "./dto/user/AuditHistoryDto";
25
25
  export * from "./dto/user/DeviceListDto";
26
26
  export * from "./dto/user/UserIdentifierData";
27
+ export * from "./dto/user/UserUpdateReadDto";
27
28
  export * from "./dto/IdentityType";
28
29
  // i18n
29
30
  export * from "./i18n/CoreCulture";
@@ -54,6 +55,7 @@ export * from "./rq/public/CreateBarcodeRQ";
54
55
  export * from "./rq/public/PinyinRQ";
55
56
  export * from "./rq/public/PlaceQueryRQ";
56
57
  export * from "./rq/user/AuditHistoryRQ";
58
+ export * from "./rq/user/UserUpdateRQ";
57
59
  // APIs
58
60
  export * from "./AppApi";
59
61
  export * from "./AuthCodeApi";
@@ -15,4 +15,14 @@ export type MemberListRQ = StatusQueryRQ & {
15
15
  * User role start
16
16
  */
17
17
  userRoleStart?: UserRole;
18
+ /**
19
+ * Inviter id
20
+ * 邀请人编号
21
+ */
22
+ inviterId?: number;
23
+ /**
24
+ * Report to
25
+ * 汇报对象
26
+ */
27
+ reportTo?: number;
18
28
  };
@@ -0,0 +1,37 @@
1
+ import { UpdateModel } from "@etsoo/appscript";
2
+ /**
3
+ * Update user request data
4
+ * 更新用户请求数据
5
+ */
6
+ export interface UserUpdateRQ extends UpdateModel {
7
+ /**
8
+ * Name
9
+ * 姓名
10
+ */
11
+ name?: string;
12
+ /**
13
+ * Preferred name
14
+ * 首选名字
15
+ */
16
+ preferredName?: string;
17
+ /**
18
+ * Family name
19
+ * 姓
20
+ */
21
+ familyName?: string;
22
+ /**
23
+ * Given name
24
+ * 名
25
+ */
26
+ givenName?: string;
27
+ /**
28
+ * Latin family name
29
+ * 拉丁姓
30
+ */
31
+ latinFamilyName?: string;
32
+ /**
33
+ * Latin given name
34
+ * 拉丁名
35
+ */
36
+ latinGivenName?: string;
37
+ }
@@ -0,0 +1 @@
1
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/smarterp-core",
3
- "version": "1.0.16",
3
+ "version": "1.0.18",
4
4
  "description": "TypeScript APIs for SmartERP Core",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
54
54
  },
55
55
  "dependencies": {
56
56
  "@etsoo/appscript": "^1.6.12",
57
- "@etsoo/materialui": "^1.4.88",
57
+ "@etsoo/materialui": "^1.4.90",
58
58
  "@etsoo/react": "^1.8.31",
59
59
  "@etsoo/shared": "^1.2.61",
60
60
  "@etsoo/toolpad": "^1.0.17",
package/src/UserApi.ts CHANGED
@@ -13,6 +13,8 @@ import { AuditHistoryDto } from "./dto/user/AuditHistoryDto";
13
13
  import { AppData } from "./dto/app/AppData";
14
14
  import { UserIdentifierData } from "./dto/user/UserIdentifierData";
15
15
  import { ValidateRQ } from "./rq/authCode/ValidateRQ";
16
+ import { UserUpdateReadDto } from "./dto/user/UserUpdateReadDto";
17
+ import { UserUpdateRQ } from "./rq/user/UserUpdateRQ";
16
18
 
17
19
  /**
18
20
  * User API
@@ -124,6 +126,16 @@ export class UserApi extends EntityApi {
124
126
  return this.api.get("User/GetLatestApp", undefined, payload);
125
127
  }
126
128
 
129
+ /**
130
+ * Update
131
+ * @param rq Request data
132
+ * @param payload Payload
133
+ * @returns Result
134
+ */
135
+ update(rq: UserUpdateRQ, payload?: IdResultPayload) {
136
+ return this.updateBase(rq, payload);
137
+ }
138
+
127
139
  /**
128
140
  * Update avatar
129
141
  * @param data Avatar form data
@@ -139,4 +151,13 @@ export class UserApi extends EntityApi {
139
151
 
140
152
  return this.api.put(`${this.flag}/UpdateAvatar`, data, payload);
141
153
  }
154
+
155
+ /**
156
+ * Update read
157
+ * @param payload Payload
158
+ * @returns Result
159
+ */
160
+ updateRead(payload?: IApiPayload<UserUpdateReadDto>) {
161
+ return this.api.put(`${this.flag}/UpdateRead`, undefined, payload);
162
+ }
142
163
  }
@@ -1,6 +1,7 @@
1
1
  import { Tiplist, TiplistProps } from "@etsoo/materialui";
2
2
  import { OrgListDto } from "../../dto/org/OrgListDto";
3
3
  import { useRequiredAppContext } from "../../ICoreServiceApp";
4
+ import { OrgListRQ } from "../../rq/org/OrgListRQ";
4
5
 
5
6
  /**
6
7
  * Organization tiplist properties
@@ -19,6 +20,11 @@ export type OrgTiplistProps = Omit<
19
20
  * Name
20
21
  */
21
22
  name?: string;
23
+
24
+ /**
25
+ * Default request data
26
+ */
27
+ rq?: Partial<OrgListRQ>;
22
28
  };
23
29
 
24
30
  /**
@@ -38,6 +44,7 @@ export function OrgTiplist(props: OrgTiplistProps) {
38
44
  maxItems = 10,
39
45
  getOptionLabel = (data) => data.name + "(" + data.pin + ")",
40
46
  name = "organizationId",
47
+ rq = { enabled: true },
41
48
  ...rest
42
49
  } = props;
43
50
 
@@ -52,7 +59,7 @@ export function OrgTiplist(props: OrgTiplistProps) {
52
59
  loadData={(keyword, id, maxItems) =>
53
60
  app.core.orgApi.list(
54
61
  {
55
- enabled: true,
62
+ ...rq,
56
63
  keyword,
57
64
  id,
58
65
  queryPaging: {
@@ -1,6 +1,7 @@
1
1
  import { Tiplist, TiplistProps } from "@etsoo/materialui";
2
2
  import { useRequiredAppContext } from "../../ICoreServiceApp";
3
3
  import { MemberListDto } from "../../dto/member/MemberListDto";
4
+ import { MemberListRQ } from "../../rq/member/MemberListRQ";
4
5
 
5
6
  /**
6
7
  * User tiplist properties
@@ -19,6 +20,11 @@ export type UserTiplistProps = Omit<
19
20
  * Name
20
21
  */
21
22
  name?: string;
23
+
24
+ /**
25
+ * Default request data
26
+ */
27
+ rq?: Partial<MemberListRQ>;
22
28
  };
23
29
 
24
30
  /**
@@ -38,6 +44,7 @@ export function UserTiplist(props: UserTiplistProps) {
38
44
  maxItems = 10,
39
45
  getOptionLabel = (data) => data.name,
40
46
  name = "userId",
47
+ rq = { enabled: true },
41
48
  ...rest
42
49
  } = props;
43
50
 
@@ -52,7 +59,7 @@ export function UserTiplist(props: UserTiplistProps) {
52
59
  loadData={(keyword, id, maxItems) =>
53
60
  app.core.memberApi.list(
54
61
  {
55
- enabled: true,
62
+ ...rq,
56
63
  keyword,
57
64
  id,
58
65
  queryPaging: {
@@ -0,0 +1,45 @@
1
+ /**
2
+ * User read for update data
3
+ * 用户更新读取数据
4
+ */
5
+ export type UserUpdateReadDto = {
6
+ /**
7
+ * Id
8
+ */
9
+ id: number;
10
+
11
+ /**
12
+ * Name
13
+ */
14
+ name: string;
15
+
16
+ /**
17
+ * Preferred name
18
+ * 首选名字
19
+ */
20
+ preferredName?: string;
21
+
22
+ /**
23
+ * Family name
24
+ * 姓
25
+ */
26
+ familyName?: string;
27
+
28
+ /**
29
+ * Given name
30
+ * 名
31
+ */
32
+ givenName?: string;
33
+
34
+ /**
35
+ * Latin family name
36
+ * 拉丁姓
37
+ */
38
+ latinFamilyName?: string;
39
+
40
+ /**
41
+ * Latin given name
42
+ * 拉丁名
43
+ */
44
+ latinGivenName?: string;
45
+ };
package/src/index.ts CHANGED
@@ -29,6 +29,7 @@ export * from "./dto/public/RegionData";
29
29
  export * from "./dto/user/AuditHistoryDto";
30
30
  export * from "./dto/user/DeviceListDto";
31
31
  export * from "./dto/user/UserIdentifierData";
32
+ export * from "./dto/user/UserUpdateReadDto";
32
33
 
33
34
  export * from "./dto/IdentityType";
34
35
 
@@ -67,6 +68,7 @@ export * from "./rq/public/PinyinRQ";
67
68
  export * from "./rq/public/PlaceQueryRQ";
68
69
 
69
70
  export * from "./rq/user/AuditHistoryRQ";
71
+ export * from "./rq/user/UserUpdateRQ";
70
72
 
71
73
  // APIs
72
74
  export * from "./AppApi";
@@ -18,4 +18,16 @@ export type MemberListRQ = StatusQueryRQ & {
18
18
  * User role start
19
19
  */
20
20
  userRoleStart?: UserRole;
21
+
22
+ /**
23
+ * Inviter id
24
+ * 邀请人编号
25
+ */
26
+ inviterId?: number;
27
+
28
+ /**
29
+ * Report to
30
+ * 汇报对象
31
+ */
32
+ reportTo?: number;
21
33
  };
@@ -0,0 +1,43 @@
1
+ import { UpdateModel } from "@etsoo/appscript";
2
+
3
+ /**
4
+ * Update user request data
5
+ * 更新用户请求数据
6
+ */
7
+ export interface UserUpdateRQ extends UpdateModel {
8
+ /**
9
+ * Name
10
+ * 姓名
11
+ */
12
+ name?: string;
13
+
14
+ /**
15
+ * Preferred name
16
+ * 首选名字
17
+ */
18
+ preferredName?: string;
19
+
20
+ /**
21
+ * Family name
22
+ * 姓
23
+ */
24
+ familyName?: string;
25
+
26
+ /**
27
+ * Given name
28
+ * 名
29
+ */
30
+ givenName?: string;
31
+
32
+ /**
33
+ * Latin family name
34
+ * 拉丁姓
35
+ */
36
+ latinFamilyName?: string;
37
+
38
+ /**
39
+ * Latin given name
40
+ * 拉丁名
41
+ */
42
+ latinGivenName?: string;
43
+ }