@etsoo/smarterp-core 1.0.15 → 1.0.17

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 (48) hide show
  1. package/lib/cjs/MemberApi.d.ts +9 -1
  2. package/lib/cjs/MemberApi.js +9 -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/member/MemberQueryDto.d.ts +4 -0
  8. package/lib/cjs/dto/member/MemberReadDto.d.ts +10 -0
  9. package/lib/cjs/dto/member/MemberUpdateReadDto.d.ts +5 -0
  10. package/lib/cjs/i18n/en.json +3 -1
  11. package/lib/cjs/i18n/zh-Hans.json +2 -0
  12. package/lib/cjs/i18n/zh-Hant.json +2 -0
  13. package/lib/cjs/rq/member/MemberAdjustReportToRQ.d.ts +16 -0
  14. package/lib/cjs/rq/member/MemberAdjustReportToRQ.js +2 -0
  15. package/lib/cjs/rq/member/MemberListRQ.d.ts +10 -0
  16. package/lib/cjs/rq/member/MemberQueryRQ.d.ts +5 -0
  17. package/lib/cjs/rq/member/MemberUpdateRQ.d.ts +5 -0
  18. package/lib/mjs/MemberApi.d.ts +9 -1
  19. package/lib/mjs/MemberApi.js +9 -0
  20. package/lib/mjs/components/org/OrgTiplist.d.ts +5 -0
  21. package/lib/mjs/components/org/OrgTiplist.js +2 -2
  22. package/lib/mjs/components/user/UserTiplist.d.ts +5 -0
  23. package/lib/mjs/components/user/UserTiplist.js +2 -2
  24. package/lib/mjs/dto/member/MemberQueryDto.d.ts +4 -0
  25. package/lib/mjs/dto/member/MemberReadDto.d.ts +10 -0
  26. package/lib/mjs/dto/member/MemberUpdateReadDto.d.ts +5 -0
  27. package/lib/mjs/i18n/en.json +3 -1
  28. package/lib/mjs/i18n/zh-Hans.json +2 -0
  29. package/lib/mjs/i18n/zh-Hant.json +2 -0
  30. package/lib/mjs/rq/member/MemberAdjustReportToRQ.d.ts +16 -0
  31. package/lib/mjs/rq/member/MemberAdjustReportToRQ.js +1 -0
  32. package/lib/mjs/rq/member/MemberListRQ.d.ts +10 -0
  33. package/lib/mjs/rq/member/MemberQueryRQ.d.ts +5 -0
  34. package/lib/mjs/rq/member/MemberUpdateRQ.d.ts +5 -0
  35. package/package.json +1 -1
  36. package/src/MemberApi.ts +13 -1
  37. package/src/components/org/OrgTiplist.tsx +8 -1
  38. package/src/components/user/UserTiplist.tsx +8 -1
  39. package/src/dto/member/MemberQueryDto.ts +5 -0
  40. package/src/dto/member/MemberReadDto.ts +12 -0
  41. package/src/dto/member/MemberUpdateReadDto.ts +6 -0
  42. package/src/i18n/en.json +3 -1
  43. package/src/i18n/zh-Hans.json +2 -0
  44. package/src/i18n/zh-Hant.json +2 -0
  45. package/src/rq/member/MemberAdjustReportToRQ.ts +17 -0
  46. package/src/rq/member/MemberListRQ.ts +12 -0
  47. package/src/rq/member/MemberQueryRQ.ts +6 -0
  48. package/src/rq/member/MemberUpdateRQ.ts +6 -0
@@ -2,12 +2,13 @@ import { IApi, IApiPayload } from "@etsoo/restclient";
2
2
  import { MemberListRQ } from "./rq/member/MemberListRQ";
3
3
  import { MemberQueryRQ } from "./rq/member/MemberQueryRQ";
4
4
  import { MemberQueryDto } from "./dto/member/MemberQueryDto";
5
- import { EntityApi, IApp, IdResultPayload, MsgResultPayload } from "@etsoo/appscript";
5
+ import { EntityApi, IApp, IdResultPayload, MsgResultPayload, ResultPayload } from "@etsoo/appscript";
6
6
  import { MemberListDto } from "./dto/member/MemberListDto";
7
7
  import { MemberReadDto } from "./dto/member/MemberReadDto";
8
8
  import { MemberUpdateReadDto } from "./dto/member/MemberUpdateReadDto";
9
9
  import { MemberUpdateRQ } from "./rq/member/MemberUpdateRQ";
10
10
  import { MemberInviteRQ } from "./rq/member/MemberInviteRQ";
11
+ import { MemberAdjustReportToRQ } from "./rq/member/MemberAdjustReportToRQ";
11
12
  /**
12
13
  * Member API
13
14
  */
@@ -18,6 +19,13 @@ export declare class MemberApi extends EntityApi {
18
19
  * @param api API
19
20
  */
20
21
  constructor(app: IApp, api?: IApi);
22
+ /**
23
+ * Adjust report to
24
+ * @param rq Request data
25
+ * @param payload Payload
26
+ * @returns Result
27
+ */
28
+ adjustReportToRQ(rq: MemberAdjustReportToRQ, payload?: ResultPayload): Promise<import("@etsoo/shared").IActionResult<{}> | undefined>;
21
29
  /**
22
30
  * Delete
23
31
  * @param id Id
@@ -14,6 +14,15 @@ class MemberApi extends appscript_1.EntityApi {
14
14
  constructor(app, api = app.api) {
15
15
  super("Member", app, api);
16
16
  }
17
+ /**
18
+ * Adjust report to
19
+ * @param rq Request data
20
+ * @param payload Payload
21
+ * @returns Result
22
+ */
23
+ adjustReportToRQ(rq, payload) {
24
+ return this.api.put(`${this.flag}/AdjustReportTo`, rq, payload);
25
+ }
17
26
  /**
18
27
  * Delete
19
28
  * @param id Id
@@ -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: {
@@ -12,6 +12,10 @@ export type MemberQueryDto = {
12
12
  * User role
13
13
  */
14
14
  userRole: UserRole;
15
+ /**
16
+ * Direct reports
17
+ */
18
+ directReports: number;
15
19
  /**
16
20
  * Status
17
21
  */
@@ -53,4 +53,14 @@ export type MemberReadDto = {
53
53
  * Inviter
54
54
  */
55
55
  inviter?: string;
56
+ /**
57
+ * Direct reports
58
+ * 直接下属人数
59
+ */
60
+ directReports: number;
61
+ /**
62
+ * Report to
63
+ * 汇报对象
64
+ */
65
+ reportTo?: string;
56
66
  };
@@ -36,4 +36,9 @@ export type MemberUpdateReadDto = {
36
36
  * Status
37
37
  */
38
38
  status: EntityStatus;
39
+ /**
40
+ * Report to
41
+ * 汇报对象
42
+ */
43
+ reportTo?: number;
39
44
  };
@@ -18,8 +18,9 @@
18
18
  "collapseNavMenuAriaLabel": "Collapse navigation menu",
19
19
  "companyNo": "Company No.",
20
20
  "currentOrg": "Current organization",
21
- "days": "Days",
22
21
  "darkMode": "Dark mode",
22
+ "days": "Days",
23
+ "directReports": "Direct reports",
23
24
  "editAvatar": "Edit avatar",
24
25
  "editLogo": "Edit logo",
25
26
  "expandMenu": "Expand menu",
@@ -49,6 +50,7 @@
49
50
  "pin": "ID",
50
51
  "preferredName": "Preferred name",
51
52
  "refreshTime": "Refresh time",
53
+ "reportTo": "Report to",
52
54
  "role": "Role",
53
55
  "roleAdmin": "Admin",
54
56
  "roleAPI": "API User",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "当前机构",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天数",
23
+ "directReports": "直接下属",
23
24
  "editAvatar": "修改头像",
24
25
  "editLogo": "修改图标",
25
26
  "expandMenu": "展开菜单",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份证号码",
50
51
  "preferredName": "首选姓名",
51
52
  "refreshTime": "刷新时间",
53
+ "reportTo": "汇报对象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理员",
54
56
  "roleAPI": "接口用户",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "當前機構",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天數",
23
+ "directReports": "直接下屬",
23
24
  "editAvatar": "修改頭像",
24
25
  "editLogo": "修改圖標",
25
26
  "expandMenu": "展開菜單",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份證號碼",
50
51
  "preferredName": "首選姓名",
51
52
  "refreshTime": "刷新時間",
53
+ "reportTo": "匯報對象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理員",
54
56
  "roleAPI": "接口用戶",
@@ -0,0 +1,16 @@
1
+ /**
2
+ * Member adjust report to request data
3
+ * 成员调整汇报对象请求数据
4
+ */
5
+ export type MemberAdjustReportToRQ = {
6
+ /**
7
+ * Old id
8
+ * 旧编号
9
+ */
10
+ oldId: number;
11
+ /**
12
+ * New id
13
+ * 新编号
14
+ */
15
+ newId: number;
16
+ };
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
@@ -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
  };
@@ -7,4 +7,9 @@ export type MemberQueryRQ = MemberListRQ & {
7
7
  * Assigned ID
8
8
  */
9
9
  assignedId?: string;
10
+ /**
11
+ * Report to
12
+ * 汇报对象
13
+ */
14
+ reportTo?: number;
10
15
  };
@@ -29,4 +29,9 @@ export interface MemberUpdateRQ extends UpdateModel {
29
29
  * 状况
30
30
  */
31
31
  status?: EntityStatus;
32
+ /**
33
+ * Report to
34
+ * 汇报对象
35
+ */
36
+ reportTo?: number;
32
37
  }
@@ -2,12 +2,13 @@ import { IApi, IApiPayload } from "@etsoo/restclient";
2
2
  import { MemberListRQ } from "./rq/member/MemberListRQ";
3
3
  import { MemberQueryRQ } from "./rq/member/MemberQueryRQ";
4
4
  import { MemberQueryDto } from "./dto/member/MemberQueryDto";
5
- import { EntityApi, IApp, IdResultPayload, MsgResultPayload } from "@etsoo/appscript";
5
+ import { EntityApi, IApp, IdResultPayload, MsgResultPayload, ResultPayload } from "@etsoo/appscript";
6
6
  import { MemberListDto } from "./dto/member/MemberListDto";
7
7
  import { MemberReadDto } from "./dto/member/MemberReadDto";
8
8
  import { MemberUpdateReadDto } from "./dto/member/MemberUpdateReadDto";
9
9
  import { MemberUpdateRQ } from "./rq/member/MemberUpdateRQ";
10
10
  import { MemberInviteRQ } from "./rq/member/MemberInviteRQ";
11
+ import { MemberAdjustReportToRQ } from "./rq/member/MemberAdjustReportToRQ";
11
12
  /**
12
13
  * Member API
13
14
  */
@@ -18,6 +19,13 @@ export declare class MemberApi extends EntityApi {
18
19
  * @param api API
19
20
  */
20
21
  constructor(app: IApp, api?: IApi);
22
+ /**
23
+ * Adjust report to
24
+ * @param rq Request data
25
+ * @param payload Payload
26
+ * @returns Result
27
+ */
28
+ adjustReportToRQ(rq: MemberAdjustReportToRQ, payload?: ResultPayload): Promise<import("@etsoo/shared").IActionResult<{}> | undefined>;
21
29
  /**
22
30
  * Delete
23
31
  * @param id Id
@@ -11,6 +11,15 @@ export class MemberApi extends EntityApi {
11
11
  constructor(app, api = app.api) {
12
12
  super("Member", app, api);
13
13
  }
14
+ /**
15
+ * Adjust report to
16
+ * @param rq Request data
17
+ * @param payload Payload
18
+ * @returns Result
19
+ */
20
+ adjustReportToRQ(rq, payload) {
21
+ return this.api.put(`${this.flag}/AdjustReportTo`, rq, payload);
22
+ }
14
23
  /**
15
24
  * Delete
16
25
  * @param id Id
@@ -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: {
@@ -12,6 +12,10 @@ export type MemberQueryDto = {
12
12
  * User role
13
13
  */
14
14
  userRole: UserRole;
15
+ /**
16
+ * Direct reports
17
+ */
18
+ directReports: number;
15
19
  /**
16
20
  * Status
17
21
  */
@@ -53,4 +53,14 @@ export type MemberReadDto = {
53
53
  * Inviter
54
54
  */
55
55
  inviter?: string;
56
+ /**
57
+ * Direct reports
58
+ * 直接下属人数
59
+ */
60
+ directReports: number;
61
+ /**
62
+ * Report to
63
+ * 汇报对象
64
+ */
65
+ reportTo?: string;
56
66
  };
@@ -36,4 +36,9 @@ export type MemberUpdateReadDto = {
36
36
  * Status
37
37
  */
38
38
  status: EntityStatus;
39
+ /**
40
+ * Report to
41
+ * 汇报对象
42
+ */
43
+ reportTo?: number;
39
44
  };
@@ -18,8 +18,9 @@
18
18
  "collapseNavMenuAriaLabel": "Collapse navigation menu",
19
19
  "companyNo": "Company No.",
20
20
  "currentOrg": "Current organization",
21
- "days": "Days",
22
21
  "darkMode": "Dark mode",
22
+ "days": "Days",
23
+ "directReports": "Direct reports",
23
24
  "editAvatar": "Edit avatar",
24
25
  "editLogo": "Edit logo",
25
26
  "expandMenu": "Expand menu",
@@ -49,6 +50,7 @@
49
50
  "pin": "ID",
50
51
  "preferredName": "Preferred name",
51
52
  "refreshTime": "Refresh time",
53
+ "reportTo": "Report to",
52
54
  "role": "Role",
53
55
  "roleAdmin": "Admin",
54
56
  "roleAPI": "API User",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "当前机构",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天数",
23
+ "directReports": "直接下属",
23
24
  "editAvatar": "修改头像",
24
25
  "editLogo": "修改图标",
25
26
  "expandMenu": "展开菜单",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份证号码",
50
51
  "preferredName": "首选姓名",
51
52
  "refreshTime": "刷新时间",
53
+ "reportTo": "汇报对象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理员",
54
56
  "roleAPI": "接口用户",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "當前機構",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天數",
23
+ "directReports": "直接下屬",
23
24
  "editAvatar": "修改頭像",
24
25
  "editLogo": "修改圖標",
25
26
  "expandMenu": "展開菜單",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份證號碼",
50
51
  "preferredName": "首選姓名",
51
52
  "refreshTime": "刷新時間",
53
+ "reportTo": "匯報對象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理員",
54
56
  "roleAPI": "接口用戶",
@@ -0,0 +1,16 @@
1
+ /**
2
+ * Member adjust report to request data
3
+ * 成员调整汇报对象请求数据
4
+ */
5
+ export type MemberAdjustReportToRQ = {
6
+ /**
7
+ * Old id
8
+ * 旧编号
9
+ */
10
+ oldId: number;
11
+ /**
12
+ * New id
13
+ * 新编号
14
+ */
15
+ newId: number;
16
+ };
@@ -0,0 +1 @@
1
+ export {};
@@ -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
  };
@@ -7,4 +7,9 @@ export type MemberQueryRQ = MemberListRQ & {
7
7
  * Assigned ID
8
8
  */
9
9
  assignedId?: string;
10
+ /**
11
+ * Report to
12
+ * 汇报对象
13
+ */
14
+ reportTo?: number;
10
15
  };
@@ -29,4 +29,9 @@ export interface MemberUpdateRQ extends UpdateModel {
29
29
  * 状况
30
30
  */
31
31
  status?: EntityStatus;
32
+ /**
33
+ * Report to
34
+ * 汇报对象
35
+ */
36
+ reportTo?: number;
32
37
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/smarterp-core",
3
- "version": "1.0.15",
3
+ "version": "1.0.17",
4
4
  "description": "TypeScript APIs for SmartERP Core",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/MemberApi.ts CHANGED
@@ -6,13 +6,15 @@ import {
6
6
  EntityApi,
7
7
  IApp,
8
8
  IdResultPayload,
9
- MsgResultPayload
9
+ MsgResultPayload,
10
+ ResultPayload
10
11
  } from "@etsoo/appscript";
11
12
  import { MemberListDto } from "./dto/member/MemberListDto";
12
13
  import { MemberReadDto } from "./dto/member/MemberReadDto";
13
14
  import { MemberUpdateReadDto } from "./dto/member/MemberUpdateReadDto";
14
15
  import { MemberUpdateRQ } from "./rq/member/MemberUpdateRQ";
15
16
  import { MemberInviteRQ } from "./rq/member/MemberInviteRQ";
17
+ import { MemberAdjustReportToRQ } from "./rq/member/MemberAdjustReportToRQ";
16
18
 
17
19
  /**
18
20
  * Member API
@@ -27,6 +29,16 @@ export class MemberApi extends EntityApi {
27
29
  super("Member", app, api);
28
30
  }
29
31
 
32
+ /**
33
+ * Adjust report to
34
+ * @param rq Request data
35
+ * @param payload Payload
36
+ * @returns Result
37
+ */
38
+ adjustReportToRQ(rq: MemberAdjustReportToRQ, payload?: ResultPayload) {
39
+ return this.api.put(`${this.flag}/AdjustReportTo`, rq, payload);
40
+ }
41
+
30
42
  /**
31
43
  * Delete
32
44
  * @param id Id
@@ -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: {
@@ -16,6 +16,11 @@ export type MemberQueryDto = {
16
16
  */
17
17
  userRole: UserRole;
18
18
 
19
+ /**
20
+ * Direct reports
21
+ */
22
+ directReports: number;
23
+
19
24
  /**
20
25
  * Status
21
26
  */
@@ -65,4 +65,16 @@ export type MemberReadDto = {
65
65
  * Inviter
66
66
  */
67
67
  inviter?: string;
68
+
69
+ /**
70
+ * Direct reports
71
+ * 直接下属人数
72
+ */
73
+ directReports: number;
74
+
75
+ /**
76
+ * Report to
77
+ * 汇报对象
78
+ */
79
+ reportTo?: string;
68
80
  };
@@ -44,4 +44,10 @@ export type MemberUpdateReadDto = {
44
44
  * Status
45
45
  */
46
46
  status: EntityStatus;
47
+
48
+ /**
49
+ * Report to
50
+ * 汇报对象
51
+ */
52
+ reportTo?: number;
47
53
  };
package/src/i18n/en.json CHANGED
@@ -18,8 +18,9 @@
18
18
  "collapseNavMenuAriaLabel": "Collapse navigation menu",
19
19
  "companyNo": "Company No.",
20
20
  "currentOrg": "Current organization",
21
- "days": "Days",
22
21
  "darkMode": "Dark mode",
22
+ "days": "Days",
23
+ "directReports": "Direct reports",
23
24
  "editAvatar": "Edit avatar",
24
25
  "editLogo": "Edit logo",
25
26
  "expandMenu": "Expand menu",
@@ -49,6 +50,7 @@
49
50
  "pin": "ID",
50
51
  "preferredName": "Preferred name",
51
52
  "refreshTime": "Refresh time",
53
+ "reportTo": "Report to",
52
54
  "role": "Role",
53
55
  "roleAdmin": "Admin",
54
56
  "roleAPI": "API User",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "当前机构",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天数",
23
+ "directReports": "直接下属",
23
24
  "editAvatar": "修改头像",
24
25
  "editLogo": "修改图标",
25
26
  "expandMenu": "展开菜单",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份证号码",
50
51
  "preferredName": "首选姓名",
51
52
  "refreshTime": "刷新时间",
53
+ "reportTo": "汇报对象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理员",
54
56
  "roleAPI": "接口用户",
@@ -20,6 +20,7 @@
20
20
  "currentOrg": "當前機構",
21
21
  "darkMode": "深色模式",
22
22
  "days": "天數",
23
+ "directReports": "直接下屬",
23
24
  "editAvatar": "修改頭像",
24
25
  "editLogo": "修改圖標",
25
26
  "expandMenu": "展開菜單",
@@ -49,6 +50,7 @@
49
50
  "pin": "身份證號碼",
50
51
  "preferredName": "首選姓名",
51
52
  "refreshTime": "刷新時間",
53
+ "reportTo": "匯報對象",
52
54
  "role": "角色",
53
55
  "roleAdmin": "管理員",
54
56
  "roleAPI": "接口用戶",
@@ -0,0 +1,17 @@
1
+ /**
2
+ * Member adjust report to request data
3
+ * 成员调整汇报对象请求数据
4
+ */
5
+ export type MemberAdjustReportToRQ = {
6
+ /**
7
+ * Old id
8
+ * 旧编号
9
+ */
10
+ oldId: number;
11
+
12
+ /**
13
+ * New id
14
+ * 新编号
15
+ */
16
+ newId: number;
17
+ };
@@ -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
  };
@@ -8,4 +8,10 @@ export type MemberQueryRQ = MemberListRQ & {
8
8
  * Assigned ID
9
9
  */
10
10
  assignedId?: string;
11
+
12
+ /**
13
+ * Report to
14
+ * 汇报对象
15
+ */
16
+ reportTo?: number;
11
17
  };
@@ -34,4 +34,10 @@ export interface MemberUpdateRQ extends UpdateModel {
34
34
  * 状况
35
35
  */
36
36
  status?: EntityStatus;
37
+
38
+ /**
39
+ * Report to
40
+ * 汇报对象
41
+ */
42
+ reportTo?: number;
37
43
  }