@cpzxrobot/sdk 1.2.96 → 1.2.98

package/dist/index.js

@@ -58,7 +58,6 @@ class Cpzxrobot {
         this.hash = "shzx";
         this.mode = "dev";
         this.auth = "";
-        this.token = "";
         this.car = new car_gateway_1.CarGateway(this);
         this.project = new project_gateway_1.ProjectGateway(this);
         this.product = new product_gateway_1.ProductGateway(this);
@@ -126,7 +125,7 @@ class Cpzxrobot {
                 this.mode = "miniapp_in_web";
                 baseURL = "https://www.cpzxrobot.com";
             }
-            this.platform = new web_platform_1.WebPlatform(this.token, this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
+            this.platform = new web_platform_1.WebPlatform(this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
         }
         this.platformReady = this.platform.ready();
         this.axios = this.platform.getAxiosFromMiniApp();
@@ -187,7 +186,7 @@ class Cpzxrobot {
             const token = localStorage.getItem("token");
             if (token) {
                 logger(`found token(${token}) in localstorage`, "debug");
-                this.token = token;
+                this.platform.setToken(token);
                 this.axios.get("/api/v1/user/auth").then((res) => {
                     if (res.data.Error) {
                         window.location.href = "/login.html?error=" + res.data.Error;
@@ -252,12 +251,12 @@ class Cpzxrobot {
                             return;
                         }
                         if (res.data.token) {
-                            this.token = "Bearer " + res.data.token;
+                            this.platform.setToken("Bearer " + res.data.token);
                         }
                         else if (access_token.startsWith("Bearer ")) {
-                            this.token = access_token;
+                            this.platform.setToken(access_token);
                         }
-                        localStorage.setItem("token", this.token);
+                        localStorage.setItem("token", this.platform.getToken());
                         this.resolveReady(this.axios);
                     });
                     return;
@@ -272,7 +271,7 @@ class Cpzxrobot {
             logger(`sdk under ${this.mode} mode`, "debug");
             this.auth = auth;
             if (this.auth.startsWith("Bearer ")) {
-                this.token = auth;
+                this.platform.setToken(auth);
                 this.resolveReady(this.axios);
             }
             else {
@@ -286,7 +285,7 @@ class Cpzxrobot {
                         throw res.data.Error;
                     }
                     else {
-                        this.token = "Bearer " + res.data.token;
+                        this.platform.setToken("Bearer " + res.data.token);
                     }
                     this.resolveReady(this.axios);
                 })

package/dist/mobile_platform.js

@@ -23,6 +23,11 @@ class MobilePlatform {
             }
         }, false);
     }
+    getToken() {
+        return "";
+    }
+    setToken(token) {
+    }
     setSelectedFarm(farm) {
         throw new Error("Method not implemented.");
     }

package/dist/platform_interface.js

@@ -2,9 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformInterface = void 0;
 class PlatformInterface {
+    getToken() {
+        throw new Error("Method not implemented.");
+    }
+    setToken(token) {
+        throw new Error("Method not implemented.");
+    }
     //define constructor(token: string, appCode: string) {
-    constructor(token, appCode, baseURL) {
-        this.token = token;
+    constructor(appCode, baseURL) {
         this.appCode = appCode;
         this.baseURL = baseURL;
     }

package/dist/user_gateway.js

@@ -4,40 +4,11 @@ exports.UserGateway = void 0;
 class UserGateway extends Object {
     constructor(context) {
         super();
-        this._selectedFarm = {
-            code: "",
-            name: "",
-            company_code: "",
-            id: 0,
-        };
-        this._selectedUnit = {
-            name: "",
-            id: 0,
-        };
         this.context = context;
     }
     //获得当前用户选择的工厂
     async getSelectedFarm() {
-        await this.context.ready;
-        return new Promise((resolve, reject) => {
-            switch (this.context.mode) {
-                case "dev":
-                    resolve(this._selectedFarm);
-                    break;
-                case "miniapp_in_app":
-                    this.context.platform.getSelectedFarmFromMiniApp().then((farm) => {
-                        this._selectedFarm = farm;
-                        resolve(farm);
-                    });
-                    break;
-                case "miniapp_in_web":
-                    resolve(this._selectedFarm);
-                    break;
-                default:
-                    reject("dev mode, ignore");
-                    break;
-            }
-        });
+        return this.context.platform.getSelectedFarmFromMiniApp();
     }
     async selectUnit(unit) {
         if ((typeof unit === "string") || (typeof unit === "number")) {
@@ -50,27 +21,7 @@ class UserGateway extends Object {
     }
     //获得当前用户选择的单元
     getSelectedUnit() {
-        return this.context.ready.then(() => {
-            return new Promise((resolve, reject) => {
-                switch (this.context.mode) {
-                    case "dev":
-                        resolve(this._selectedUnit);
-                        break;
-                    case "miniapp_in_app":
-                        this.context.platform.getSelectedUnitFromMiniApp().then((unit) => {
-                            this._selectedUnit = unit;
-                            resolve(unit);
-                        });
-                        break;
-                    case "miniapp_in_web":
-                        resolve(this._selectedUnit);
-                        break;
-                    default:
-                        reject("dev mode, ignore");
-                        break;
-                }
-            });
-        });
+        return this.context.platform.getSelectedUnitFromMiniApp();
     }
     set selectedFarm(farm) {
         this.context.platform.setSelectedFarm(farm);

package/dist/web_platform.js

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebPlatform = void 0;
 class WebPlatform {
-    constructor(token, appCode, baseURL, selectedFarm, selectedUnit) {
+    constructor(appCode, baseURL, selectedFarm, selectedUnit) {
         this.token = "";
         this.appCode = "";
         this.baseURL = "";
-        this.token = token;
         this.appCode = appCode;
         this.baseURL = baseURL !== null && baseURL !== void 0 ? baseURL : "";
         this._selectedFarm = selectedFarm;
         this._selectedUnit = selectedUnit;
     }
+    getToken() {
+        return this.token;
+    }
+    setToken(token) {
+        this.token = token;
+    }
     setSelectedFarm(farm) {
         this._selectedFarm = farm;
     }

package/dist/windows_platform.js

@@ -21,6 +21,11 @@ class WindwosMiniAppPlatform {
             }
         }, false);
     }
+    getToken() {
+        return "";
+    }
+    setToken(token) {
+    }
     setSelectedFarm(farm) {
         throw new Error("Method not implemented.");
     }

package/index.ts

@@ -38,7 +38,7 @@ export class Cpzxrobot {
   axios!: MyAxiosInstance;
   appCode: string;
   user: UserGateway;
-  token: string = "";
+  // token: string = "";
   factory: FactoryGateway;
   ready: Promise<MyAxiosInstance>;
   resolveReady!: (
@@ -129,7 +129,7 @@ export class Cpzxrobot {
         this.mode = "miniapp_in_web";
         baseURL = "https://www.cpzxrobot.com"
       }
-      this.platform = new WebPlatform(this.token, this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
+      this.platform = new WebPlatform(this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
     }
 
     this.platformReady = this.platform.ready();
@@ -199,7 +199,7 @@ export class Cpzxrobot {
       const token = localStorage.getItem("token");
       if (token) {
         logger(`found token(${token}) in localstorage`, "debug");
-        this.token = token;
+        this.platform.setToken(token);
         this.axios.get("/api/v1/user/auth").then((res) => {
           if (res.data.Error) {
             window.location.href = "/login.html?error=" + res.data.Error;
@@ -262,11 +262,11 @@ export class Cpzxrobot {
                 return;
               }
               if (res.data.token) {
-                this.token = "Bearer " + res.data.token;
+                this.platform.setToken("Bearer " + res.data.token);
               } else if (access_token.startsWith("Bearer ")) {
-                this.token = access_token;
+                this.platform.setToken(access_token);
               }
-              localStorage.setItem("token", this.token);
+              localStorage.setItem("token", this.platform.getToken());
               this.resolveReady(this.axios);
             });
           return;
@@ -280,7 +280,7 @@ export class Cpzxrobot {
       logger(`sdk under ${this.mode} mode`, "debug");
       this.auth = auth;
       if (this.auth.startsWith("Bearer ")) {
-        this.token = auth;
+        this.platform.setToken(auth);
         this.resolveReady(this.axios);
       } else {
         this.axios
@@ -292,7 +292,7 @@ export class Cpzxrobot {
             if (res.data.Error) {
               throw res.data.Error;
             } else {
-              this.token = "Bearer " + res.data.token;
+              this.platform.setToken("Bearer " + res.data.token);
             }
             this.resolveReady(this.axios);
           })

package/mobile_platform.ts

@@ -28,6 +28,12 @@ export class MobilePlatform implements PlatformInterface {
       }
     }, false);
   }
+  getToken(): string {
+    return "";
+  }
+  setToken(token: string): void {
+  }
+  
   setSelectedFarm(farm: Factory): void {
     throw new Error("Method not implemented.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.2.96",
+  "version": "1.2.98",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {

package/platform_interface.ts

@@ -1,14 +1,18 @@
 import { Factory, MyAxiosInstance, Unit } from "./types";
 
 export abstract class PlatformInterface {
+  getToken(): string {
+    throw new Error("Method not implemented.");
+  }
+  setToken(token: string) {
+    throw new Error("Method not implemented.");
+  }
 
-  token: string;
   appCode: string;
   baseURL: string;
 
   //define constructor(token: string, appCode: string) {
-  constructor(token: string, appCode: string, baseURL: string) {
-    this.token = token;
+  constructor(appCode: string, baseURL: string) {
     this.appCode = appCode;
     this.baseURL = baseURL;
   }

package/user_gateway.ts

@@ -1,17 +1,7 @@
 import { Cpzxrobot, type Factory, type Unit } from "./types";
 
 export class UserGateway extends Object {
-  _selectedFarm: Factory = {
-    code: "",
-    name: "",
-    company_code: "",
-    id: 0,
-  };
   context: Cpzxrobot;
-  _selectedUnit: Unit = {
-    name: "",
-    id: 0,
-  };
 
   constructor(context: Cpzxrobot) {
     super();
@@ -20,29 +10,10 @@ export class UserGateway extends Object {
 
   //获得当前用户选择的工厂
   public async getSelectedFarm(): Promise<Factory> {
-    await this.context.ready;
-    return new Promise<Factory>((resolve, reject) => {
-      switch (this.context.mode) {
-        case "dev":
-          resolve(this._selectedFarm);
-          break;
-        case "miniapp_in_app":
-          this.context.platform.getSelectedFarmFromMiniApp().then((farm: any) => {
-            this._selectedFarm = farm;
-            resolve(farm);
-          });
-          break;
-        case "miniapp_in_web":
-          resolve(this._selectedFarm);
-          break;
-        default:
-          reject("dev mode, ignore");
-          break;
-      }
-    });
+    return this.context.platform.getSelectedFarmFromMiniApp()
   }
 
-  public async selectUnit(unit: Unit|String|Number) {
+  public async selectUnit(unit: Unit | String | Number) {
     if ((typeof unit === "string") || (typeof unit === "number")) {
       var axios = await this.context.ready;
       this.context.platform.setSelectedUnit(unit);
@@ -53,27 +24,7 @@ export class UserGateway extends Object {
 
   //获得当前用户选择的单元
   getSelectedUnit() {
-    return this.context.ready.then(() => {
-      return new Promise<Unit>((resolve, reject) => {
-        switch (this.context.mode) {
-          case "dev":
-            resolve(this._selectedUnit);
-            break;
-          case "miniapp_in_app":
-            this.context.platform.getSelectedUnitFromMiniApp().then((unit: any) => {
-              this._selectedUnit = unit;
-              resolve(unit);
-            });
-            break;
-          case "miniapp_in_web":
-            resolve(this._selectedUnit);
-            break;
-          default:
-            reject("dev mode, ignore");
-            break;
-        }
-      });
-    });
+    return this.context.platform.getSelectedUnitFromMiniApp();
   }
 
   set selectedFarm(farm: Factory) {
@@ -121,7 +72,7 @@ export class UserGateway extends Object {
       args = {
         roleCode: role
       }
-    }else{
+    } else {
       args = {
         ...role,
       }
@@ -129,7 +80,7 @@ export class UserGateway extends Object {
     var axios = await this.context.ready;
     var factory = await this.context.user.getSelectedFarm();
     //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
-    return axios.get(`/api/v2/company/${factory.id}/users`,{
+    return axios.get(`/api/v2/company/${factory.id}/users`, {
       params: args
     });
   }
@@ -341,7 +292,7 @@ export class UserGateway extends Object {
         return axios.post('/api/v2/coremde-sale/task/list', params);
       },
       // 任务指派功能
-      assign: (taskId: number, deptId: number, handleUserId: number = 0)=> {
+      assign: (taskId: number, deptId: number, handleUserId: number = 0) => {
         return this.context.ready.then((axios) => {
           return axios.post('/api/v2/coremde-sale/task/assign', {
             taskId,

package/web_platform.ts

@@ -8,13 +8,18 @@ export class WebPlatform implements PlatformInterface {
   _selectedFarm: Factory | undefined;
   _selectedUnit: Unit | undefined;
 
-  constructor(token: string, appCode: string, baseURL: string, selectedFarm: Factory | undefined, selectedUnit: Unit | undefined) {
-    this.token = token;
+  constructor(appCode: string, baseURL: string, selectedFarm: Factory | undefined, selectedUnit: Unit | undefined) {
     this.appCode = appCode;
     this.baseURL = baseURL ?? "";
     this._selectedFarm = selectedFarm;
     this._selectedUnit = selectedUnit;
   }
+  getToken(): string {
+    return this.token;
+  }
+  setToken(token: string): void {
+    this.token = token;
+  }
   setSelectedFarm(farm: Factory): void {
     this._selectedFarm = farm;
   }

package/windows_platform.ts

@@ -23,6 +23,11 @@ export class WindwosMiniAppPlatform implements PlatformInterface {
       }
     }, false);
   }
+  getToken(): string {
+    return "";
+  }
+  setToken(token: string): void {
+  }
   setSelectedFarm(farm: Factory): void {
     throw new Error("Method not implemented.");
   }