aldehyde 0.2.155 → 0.2.156

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

@@ -571,7 +571,7 @@ export default class HcserviceV3 {
       },
       method: "DELETE",
     });
-    if (res.status == "success") {
+    if (res && res.status == "success") {
       message.success(translate("${删除成功}"), 1);
       return true;
     } else {
@@ -644,7 +644,7 @@ export default class HcserviceV3 {
       method: "POST",
       data: { ...params, sourceId },
     });
-    if (res.status === "success") {
+    if (res && res.status === "success") {
       message.success(translate("${统计成功}"), 1);
     } else {
       message.error(translate("${统计失败}"));
@@ -674,9 +674,9 @@ export default class HcserviceV3 {
       null,
       null
     );
-    if (res.status == "success") {
+    if (res && res.status == "success") {
       if (res.message) {
-        message.info("提示信息：" + res.message, 4);
+        message.info( res.message, 4);
       }
     }
     return res.entityCode;
@@ -915,7 +915,7 @@ export default class HcserviceV3 {
       "formdata"
     );
 
-    if (res.status === "success") {
+    if (res && res.status === "success") {
       window.location.hash = "#/home";
     }
     return res;
@@ -927,7 +927,7 @@ export default class HcserviceV3 {
       header: { programCode },
       method: "POST",
     });
-    if (res.status === "success") {
+    if (res && res.status === "success") {
       return res;
     } else {
       return null;
@@ -941,7 +941,7 @@ export default class HcserviceV3 {
       serverKey,
       method: "GET",
     });
-    if (res.status === "success") {
+    if (res && res.status === "success") {
       return res.rasPubkey;
     } else {
       return null;

package/src/aldehyde/tmpl/interface.tsx

@@ -418,7 +418,7 @@ export interface VEControlProps extends EControlProps {
 
 export interface VControlProps extends ControlBaseProps {}
 
-export interface ControlBaseProps {
+export interface  ControlBaseProps {
   id?: any;
   value?: any;
   fieldConfig?: FieldConfig;

package/src/aldehyde/tmpl/superagent.js

@@ -13,11 +13,18 @@ export default class Superagent {
       programCode = Units.programCode(serverKey);
     }
 
-    const hydrocarbonToken = options.header?.hydrocarbonToken
-      ? options.header.hydrocarbonToken
-      : Units.hydrocarbonToken(programCode)
-      ? Units.hydrocarbonToken(programCode)
-      : serverKey?Units.hydrocarbonToken():Units.getAnoHydrocarbonToken();
+    debugger
+    let hydrocarbonToken =null;
+     if(options.header && options.header.hydrocarbonToken){
+          hydrocarbonToken=options.header.hydrocarbonToken;
+     }else if(Units.hydrocarbonToken(programCode)){
+       hydrocarbonToken=Units.hydrocarbonToken(programCode);
+     }else if(serverKey){
+       Units.hydrocarbonToken()
+     }else{
+       Units.getAnoHydrocarbonToken()
+     }
+
 
     let loading;
     if (options.data && options.data.isShowLoading !== false) {
@@ -78,14 +85,15 @@ export default class Superagent {
               //message.error("没找到服务(" + options.url + ")")
               resolve(res);
             } else if (res.status === 500) {
-              if (res.body) {
+              if (res.body && res.body.message) {
                 message.error(
                   translate("${后台处理错误}(") + res.body.message + ")",
-                  5
-                );
-                console.log(res.text);
+                  5)
+              }else if(res.text){
+                message.error(res.text);
               }
-              resolve(res);
+              console.log(res.text);
+              resolve(undefined);
             } else {
               message.error(
                 translate("${请求服务失败}(") + options.url + ")",

package/src/aldehyde/units/index.tsx

@@ -179,13 +179,14 @@ export default {
         if(!hydrocarbonToken){
             hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
         }
-
-        if(hydrocarbonToken){
-            // hydrocarbonToken=window.localStorage.getItem(programCode+'hydrocarbonToken');
+        if(!hydrocarbonToken){
+            hydrocarbonToken=window.localStorage.getItem(programCode+'hydrocarbonToken');
             // if(!hydrocarbonToken){
             //     hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
             // }
-            this.setSessionHydrocarbonToken(hydrocarbonToken,programCode);
+            if(hydrocarbonToken){
+                this.setSessionHydrocarbonToken(hydrocarbonToken,programCode);
+            }
         }
         return hydrocarbonToken;
     },