aldehyde 0.2.315 → 0.2.317

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -41,7 +41,7 @@ export default class HcserviceV3 {
     return jsonFile;
   }
 
-  static  toFilePath(value,serverKey) {
+  static toFilePath(value, serverKey) {
     if (!value) {
       return null;
     }
@@ -57,24 +57,24 @@ export default class HcserviceV3 {
         filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
       } else {
         let jsonValue = this.getJsonValue(value);
-        filePath=this.toFilePathObject(jsonValue,serverKey);
+        filePath = this.toFilePathObject(jsonValue, serverKey);
       }
-    }else if(value.base){
-      filePath=this.toFilePathObject(value,serverKey);
+    } else if (value.base) {
+      filePath = this.toFilePathObject(value, serverKey);
     }
     return filePath;
   }
 
-  static toFilePathObject(jsonValue,serverKey:string){
-    let filePath:any={};
+  static toFilePathObject(jsonValue, serverKey: string) {
+    let filePath: any = {};
     if (jsonValue) {
       filePath.path = this.getFileUrl(serverKey, jsonValue.base?.path);
       filePath.iconPath = jsonValue.icon?.path ? this.getFileUrl(serverKey, jsonValue.icon?.path) : null;
       filePath.fileName = jsonValue.fileName ? jsonValue.fileName : this.getFileNameFrom(jsonValue.base?.path);
       filePath.contentType = this.getFileSuffixFrom(filePath.fileName);
       filePath.valid = jsonValue.valid;
-      filePath.baseType=jsonValue.base?.type;
-      filePath.basePath=jsonValue.base?.path;
+      filePath.baseType = jsonValue.base?.type;
+      filePath.basePath = jsonValue.base?.path;
       return filePath;
     }
     return null;
@@ -217,18 +217,18 @@ export default class HcserviceV3 {
   }
 
   static async requestQueryReportData(
-      serverKey:string,
-      queryKey:string,language:string
-){
-    let url="/v3/ltmpl/report-data";
+    serverKey: string,
+    queryKey: string, language: string
+  ) {
+    let url = "/v3/ltmpl/report-data";
     let res = await Super.super({
       url: url,
       serverKey,
       method: "GET",
-      query:{queryKey,language},
+      query: { queryKey, language },
     });
     return res;
-}
+  }
 
   static async requestTtmplRootData(
     serverKey: string,
@@ -310,20 +310,20 @@ export default class HcserviceV3 {
     }
   }
 
-  static  isForeignLanguageMode(){
-    if(translate("${保存}")=="保存"){
+  static isForeignLanguageMode() {
+    if (translate("${保存}") == "保存") {
       return false;
-    }else{
+    } else {
       return true;
     }
   }
 
-  static async requestVersionList(serverKey: string, sourceId: string, code,pageNo?:number) {
+  static async requestVersionList(serverKey: string, sourceId: string, code, pageNo?: number) {
     let res = await Super.super({
       url: `/v3/dtmpl/data/versions`,
       serverKey,
       query: {
-        pageNo: pageNo?pageNo:1,
+        pageNo: pageNo ? pageNo : 1,
         sourceId,
         code,
       },
@@ -667,7 +667,7 @@ export default class HcserviceV3 {
     return res;
   }
 
-  static async doPostRequest(serverKey: string, url:string,params?:object) {
+  static async doPostRequest(serverKey: string, url: string, params?: object) {
     let res = await Super.super({
       url,
       serverKey,
@@ -677,7 +677,7 @@ export default class HcserviceV3 {
     return res;
   }
 
-  static async doGetRequest(serverKey: string, url:string,params?:object) {
+  static async doGetRequest(serverKey: string, url: string, params?: object) {
     let res = await Super.super({
       url,
       serverKey,
@@ -688,8 +688,8 @@ export default class HcserviceV3 {
   }
 
   static async requestChartData(
-      serverKey: string,
-      sourceId: string,
+    serverKey: string,
+    sourceId: string,
   ) {
     let res = await Super.super({
       url: `/v3/chart/data`,
@@ -868,25 +868,25 @@ export default class HcserviceV3 {
     Units.openFile(path, fileName, toolbar);
   }
 
-  static getFileUrl(serverKey: string, path:string) {
+  static getFileUrl(serverKey: string, path: string) {
     const hydrocarbonToken = Units.serverHydrocarbonToken(serverKey);
     const programCode = Units.programCode(serverKey);
     let root;
     let url;
     //判断是否为全URL
-    if(path?.startsWith("http") || path?.startsWith("HTTP")){
-      root=path;
-      if(path.indexOf("?")>0){
+    if (path?.startsWith("http") || path?.startsWith("HTTP")) {
+      root = path;
+      if (path.indexOf("?") > 0) {
         url = root +
-            `&@token=${hydrocarbonToken}&@programToken=${programCode}`;
-      }else{
+          `&@token=${hydrocarbonToken}&@programToken=${programCode}`;
+      } else {
         url = root +
-            `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
+          `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
       }
-    }else{
-      root=Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path));
+    } else {
+      root = Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path));
       url = root +
-      `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
+        `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
     }
 
     let encodeUri = encodeURI(url);
@@ -906,12 +906,14 @@ export default class HcserviceV3 {
 
   static async requestBlocks(
     l2MenuId: string,
-    blockId: string
+    blockId: string,
+    programCode?: string,
   ): Promise<MenuConfigAPIType> {
     let url = `/v3/menu/blocks`;
     let res = await Super.super({
       url: url,
       method: "GET",
+      header: { programCode },
       query: {
         l2MenuId,
         blockId,
@@ -993,10 +995,10 @@ export default class HcserviceV3 {
   }
 
   static async resetPassword2(
-      serverKey: string,userName:string,
-      oPassword: string,
-      nPassword: string,
-      pubkey
+    serverKey: string, userName: string,
+    oPassword: string,
+    nPassword: string,
+    pubkey
   ) {
     let oldPassword = EncryptUtils.rsaEncrypt(oPassword, pubkey);
     let newPassword = EncryptUtils.rsaEncrypt(nPassword, pubkey);
@@ -1034,19 +1036,19 @@ export default class HcserviceV3 {
     return res ? res.value : null;
   }
 
-  static async loginServer(serverKey:string,username:string,password:string){
-    let pubkey=await this.getRasPubkey(serverKey);
-    if(pubkey){
-      let json = {username, password};
-     let res= await this.login(json,null,null,pubkey,null,serverKey);
-     if(res.status == "success"){
-       Units.setServerHydrocarbonToken(serverKey,res.token);
-       return res;
-     }else{
-       return {status:"error",message:"登陆失败"}
-     }
-    }else{
-      return {status:"error",message:"登陆失败"}
+  static async loginServer(serverKey: string, username: string, password: string) {
+    let pubkey = await this.getRasPubkey(serverKey);
+    if (pubkey) {
+      let json = { username, password };
+      let res = await this.login(json, null, null, pubkey, null, serverKey);
+      if (res.status == "success") {
+        Units.setServerHydrocarbonToken(serverKey, res.token);
+        return res;
+      } else {
+        return { status: "error", message: "登陆失败" }
+      }
+    } else {
+      return { status: "error", message: "登陆失败" }
     }
   }
 
@@ -1076,16 +1078,16 @@ export default class HcserviceV3 {
       },
       method: "GET",
     });
-    if(res.passwordState){
-      if(res.passwordState=="expiry"){
-        message.warning(translate("${"+res.message+"}"), 10);
-      }else if(res.passwordState=="expiried"){
-        message.error(translate("${"+res.message+"}"), 10)
-      }else if(res.passwordState=="restricted"){
-        message.error(translate("${"+res.message+"}"), 15)
+    if (res.passwordState) {
+      if (res.passwordState == "expiry") {
+        message.warning(translate("${" + res.message + "}"), 10);
+      } else if (res.passwordState == "expiried") {
+        message.error(translate("${" + res.message + "}"), 10)
+      } else if (res.passwordState == "restricted") {
+        message.error(translate("${" + res.message + "}"), 15)
       }
     }
-    return {status:res.status,token:res.token};
+    return { status: res.status, token: res.token };
   }
 
   static async setContext(json) {