@cpzxrobot/sdk 1.2.97 → 1.2.99

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 (5) hide show
  1. package/dist/unit_gateway.js +5 -0
  2. package/dist/user_gateway.js +3 -51
  3. package/package.json +1 -1
  4. package/unit_gateway.ts +6 -0
  5. package/user_gateway.ts +7 -55
package/dist/unit_gateway.js CHANGED
@@ -6,6 +6,11 @@ class UnitGateway extends Object {
6
6
  super();
7
7
  this.context = context;
8
8
  }
9
+ get(id) {
10
+ return this.context.ready.then((axios) => {
11
+ return axios.get(`/api/v1/unit/${id}`);
12
+ });
13
+ }
9
14
  get config() {
10
15
  return {
11
16
  add: (unit, type, config) => {
package/dist/user_gateway.js CHANGED
@@ -4,44 +4,16 @@ exports.UserGateway = void 0;
4
4
  class UserGateway extends Object {
5
5
  constructor(context) {
6
6
  super();
7
- this._selectedFarm = {
8
- code: "",
9
- name: "",
10
- company_code: "",
11
- id: 0,
12
- };
13
- this._selectedUnit = {
14
- name: "",
15
- id: 0,
16
- };
17
7
  this.context = context;
18
8
  }
19
9
  //获得当前用户选择的工厂
20
10
  async getSelectedFarm() {
21
- await this.context.ready;
22
- return new Promise((resolve, reject) => {
23
- switch (this.context.mode) {
24
- case "dev":
25
- resolve(this._selectedFarm);
26
- break;
27
- case "miniapp_in_app":
28
- this.context.platform.getSelectedFarmFromMiniApp().then((farm) => {
29
- this._selectedFarm = farm;
30
- resolve(farm);
31
- });
32
- break;
33
- case "miniapp_in_web":
34
- resolve(this._selectedFarm);
35
- break;
36
- default:
37
- reject("dev mode, ignore");
38
- break;
39
- }
40
- });
11
+ return this.context.platform.getSelectedFarmFromMiniApp();
41
12
  }
42
13
  async selectUnit(unit) {
43
14
  if ((typeof unit === "string") || (typeof unit === "number")) {
44
15
  var axios = await this.context.ready;
16
+ unit = await this.context.unit.get(unit);
45
17
  this.context.platform.setSelectedUnit(unit);
46
18
  }
47
19
  else {
@@ -50,27 +22,7 @@ class UserGateway extends Object {
50
22
  }
51
23
  //获得当前用户选择的单元
52
24
  getSelectedUnit() {
53
- return this.context.ready.then(() => {
54
- return new Promise((resolve, reject) => {
55
- switch (this.context.mode) {
56
- case "dev":
57
- resolve(this._selectedUnit);
58
- break;
59
- case "miniapp_in_app":
60
- this.context.platform.getSelectedUnitFromMiniApp().then((unit) => {
61
- this._selectedUnit = unit;
62
- resolve(unit);
63
- });
64
- break;
65
- case "miniapp_in_web":
66
- resolve(this._selectedUnit);
67
- break;
68
- default:
69
- reject("dev mode, ignore");
70
- break;
71
- }
72
- });
73
- });
25
+ return this.context.platform.getSelectedUnitFromMiniApp();
74
26
  }
75
27
  set selectedFarm(farm) {
76
28
  this.context.platform.setSelectedFarm(farm);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cpzxrobot/sdk",
3
- "version": "1.2.97",
3
+ "version": "1.2.99",
4
4
  "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/unit_gateway.ts CHANGED
@@ -6,6 +6,12 @@ export class UnitGateway extends Object {
6
6
  super();
7
7
  this.context = context;
8
8
  }
9
+
10
+ get(id: number|string) {
11
+ return this.context.ready.then((axios) => {
12
+ return axios.get(`/api/v1/unit/${id}`);
13
+ });
14
+ }
9
15
  get config() {
10
16
  return {
11
17
  add: (
package/user_gateway.ts CHANGED
@@ -1,17 +1,7 @@
1
1
  import { Cpzxrobot, type Factory, type Unit } from "./types";
2
2
 
3
3
  export class UserGateway extends Object {
4
- _selectedFarm: Factory = {
5
- code: "",
6
- name: "",
7
- company_code: "",
8
- id: 0,
9
- };
10
4
  context: Cpzxrobot;
11
- _selectedUnit: Unit = {
12
- name: "",
13
- id: 0,
14
- };
15
5
 
16
6
  constructor(context: Cpzxrobot) {
17
7
  super();
@@ -20,31 +10,13 @@ export class UserGateway extends Object {
20
10
 
21
11
  //获得当前用户选择的工厂
22
12
  public async getSelectedFarm(): Promise<Factory> {
23
- await this.context.ready;
24
- return new Promise<Factory>((resolve, reject) => {
25
- switch (this.context.mode) {
26
- case "dev":
27
- resolve(this._selectedFarm);
28
- break;
29
- case "miniapp_in_app":
30
- this.context.platform.getSelectedFarmFromMiniApp().then((farm: any) => {
31
- this._selectedFarm = farm;
32
- resolve(farm);
33
- });
34
- break;
35
- case "miniapp_in_web":
36
- resolve(this._selectedFarm);
37
- break;
38
- default:
39
- reject("dev mode, ignore");
40
- break;
41
- }
42
- });
13
+ return this.context.platform.getSelectedFarmFromMiniApp()
43
14
  }
44
15
 
45
- public async selectUnit(unit: Unit|String|Number) {
16
+ public async selectUnit(unit: Unit | String | Number) {
46
17
  if ((typeof unit === "string") || (typeof unit === "number")) {
47
18
  var axios = await this.context.ready;
19
+ unit = await this.context.unit.get(unit);
48
20
  this.context.platform.setSelectedUnit(unit);
49
21
  } else {
50
22
  this.context.platform.setSelectedUnit(unit);
@@ -53,27 +25,7 @@ export class UserGateway extends Object {
53
25
 
54
26
  //获得当前用户选择的单元
55
27
  getSelectedUnit() {
56
- return this.context.ready.then(() => {
57
- return new Promise<Unit>((resolve, reject) => {
58
- switch (this.context.mode) {
59
- case "dev":
60
- resolve(this._selectedUnit);
61
- break;
62
- case "miniapp_in_app":
63
- this.context.platform.getSelectedUnitFromMiniApp().then((unit: any) => {
64
- this._selectedUnit = unit;
65
- resolve(unit);
66
- });
67
- break;
68
- case "miniapp_in_web":
69
- resolve(this._selectedUnit);
70
- break;
71
- default:
72
- reject("dev mode, ignore");
73
- break;
74
- }
75
- });
76
- });
28
+ return this.context.platform.getSelectedUnitFromMiniApp();
77
29
  }
78
30
 
79
31
  set selectedFarm(farm: Factory) {
@@ -121,7 +73,7 @@ export class UserGateway extends Object {
121
73
  args = {
122
74
  roleCode: role
123
75
  }
124
- }else{
76
+ } else {
125
77
  args = {
126
78
  ...role,
127
79
  }
@@ -129,7 +81,7 @@ export class UserGateway extends Object {
129
81
  var axios = await this.context.ready;
130
82
  var factory = await this.context.user.getSelectedFarm();
131
83
  //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
132
- return axios.get(`/api/v2/company/${factory.id}/users`,{
84
+ return axios.get(`/api/v2/company/${factory.id}/users`, {
133
85
  params: args
134
86
  });
135
87
  }
@@ -341,7 +293,7 @@ export class UserGateway extends Object {
341
293
  return axios.post('/api/v2/coremde-sale/task/list', params);
342
294
  },
343
295
  // 任务指派功能
344
- assign: (taskId: number, deptId: number, handleUserId: number = 0)=> {
296
+ assign: (taskId: number, deptId: number, handleUserId: number = 0) => {
345
297
  return this.context.ready.then((axios) => {
346
298
  return axios.post('/api/v2/coremde-sale/task/assign', {
347
299
  taskId,