aldehyde 0.2.196 → 0.2.198

package/src/aldehyde/tmpl/model-struc-v3.tsx

@@ -1,107 +1,107 @@
-import { message } from "antd";
-import Superagent from "./superagent";
-import translate from "../locale/translate";
-
-export default class ModelStrucV3 {
-  static url = "/v3/mstruc/data";
-
-  static async post(sourceId: string, jsonEntity: object, serverKey?: string) {
-    const formData = new FormData();
-    formData.append("sourceId", sourceId);
-    formData.append("jsonEntity", JSON.stringify(jsonEntity));
-    let res = await Superagent.super(
-      {
-        url: this.url,
-        serverKey,
-        data: formData,
-        method: "POST",
-      },
-      "formdata",
-      null
-    );
-    let code = null;
-    if (res) {
-      if (res.status === "success") {
-        if (message) {
-          if (res.message) {
-            message.warning(translate("${保存成功}!") + res.message, 4);
-          } else {
-            message.success(translate("${保存成功}!"), 1);
-          }
-        }
-        code = res.entityCode ? res.entityCode : res.code;
-      }
-    } else {
-      if (message) {
-        message.error(translate("${保存失败}!"),5);
-      }
-    }
-    return { code, status: res ? res.status : "error" };
-  }
-
-  static async get(sourceId: string, params?: object, serverKey?: string) {
-    let res = await Superagent.super(
-      {
-        url: this.url,
-        serverKey,
-        query: { pageSize: 1000, sourceId, ...params },
-        method: "GET",
-      },
-      null,
-      null
-    );
-    let code = null;
-    if (res) {
-      if (res.status === "success") {
-        if (message) {
-          if (res.message) {
-            message.warning(translate("${查询成功}!") + res.message, 4);
-          }
-        }
-        code = res.entityCode ? res.entityCode : res.code;
-      } else {
-        if (res.message) {
-          message.error(translate("${查询失败}!") + res.message, 5);
-        }
-      }
-    } else {
-      if (message) {
-        message.error(translate("${查询失败}!"),5);
-      }
-    }
-    return res ? res : { status: "error" };
-  }
-
-  static async delete(sourceId: string, codes: string[], serverKey?: string) {
-    let res = await Superagent.super(
-      {
-        url: this.url,
-        serverKey,
-        query: { sourceId, codes },
-        method: "DELETE",
-      },
-      null,
-      null
-    );
-    let code = null;
-    if (res) {
-      if (res.status === "success") {
-        if (message) {
-          if (res.message) {
-            message.warning(translate("${删除成功}!") + res.message, 4);
-          }
-        }
-        code = res.entityCode ? res.entityCode : res.code;
-      } else {
-        if (res.message) {
-          message.error(translate("${删除失败}!") + res.message, 5);
-        }
-      }
-    } else {
-      if (message) {
-        message.error(translate("${删除失败}!"),5);
-      }
-    }
-    return res;
-  }
-}
+import { message } from "antd";
+import Superagent from "./superagent";
+import translate from "../locale/translate";
+
+export default class ModelStrucV3 {
+  static url = "/v3/mstruc/data";
+
+  static async post(sourceId: string, jsonEntity: object, serverKey?: string) {
+    const formData = new FormData();
+    formData.append("sourceId", sourceId);
+    formData.append("jsonEntity", JSON.stringify(jsonEntity));
+    let res = await Superagent.super(
+      {
+        url: this.url,
+        serverKey,
+        data: formData,
+        method: "POST",
+      },
+      "formdata",
+      null
+    );
+    let code = null;
+    if (res) {
+      if (res.status === "success") {
+        if (message) {
+          if (res.message) {
+            message.warning(translate("${保存成功}!") + res.message, 4);
+          } else {
+            message.success(translate("${保存成功}!"), 1);
+          }
+        }
+        code = res.entityCode ? res.entityCode : res.code;
+      }
+    } else {
+      if (message) {
+        message.error(translate("${保存失败}!"),5);
+      }
+    }
+    return { code, status: res ? res.status : "error" };
+  }
+
+  static async get(sourceId: string, params?: object, serverKey?: string) {
+    let res = await Superagent.super(
+      {
+        url: this.url,
+        serverKey,
+        query: { pageSize: 1000, sourceId, ...params },
+        method: "GET",
+      },
+      null,
+      null
+    );
+    let code = null;
+    if (res) {
+      if (res.status === "success") {
+        if (message) {
+          if (res.message) {
+            message.warning(translate("${查询成功}!") + res.message, 4);
+          }
+        }
+        code = res.entityCode ? res.entityCode : res.code;
+      } else {
+        if (res.message) {
+          message.error(translate("${查询失败}!") + res.message, 5);
+        }
+      }
+    } else {
+      if (message) {
+        message.error(translate("${查询失败}!"),5);
+      }
+    }
+    return res ? res : { status: "error" };
+  }
+
+  static async delete(sourceId: string, codes: string[], serverKey?: string) {
+    let res = await Superagent.super(
+      {
+        url: this.url,
+        serverKey,
+        query: { sourceId, codes },
+        method: "DELETE",
+      },
+      null,
+      null
+    );
+    let code = null;
+    if (res) {
+      if (res.status === "success") {
+        if (message) {
+          if (res.message) {
+            message.warning(translate("${删除成功}!") + res.message, 4);
+          }
+        }
+        code = res.entityCode ? res.entityCode : res.code;
+      } else {
+        if (res.message) {
+          message.error(translate("${删除失败}!") + res.message, 5);
+        }
+      }
+    } else {
+      if (message) {
+        message.error(translate("${删除失败}!"),5);
+      }
+    }
+    return res;
+  }
+}

package/src/aldehyde/tmpl/superagent.js

@@ -1,165 +1,165 @@
-import superagent from "superagent";
-import { message } from "antd";
-import Units from "../units";
-import translate from "../locale/translate";
-
-export default class Superagent {
-  static super(options, type, load) {
-    const serverKey = options.serverKey;
-    let programCode=null;
-    if (options.header?.programCode) {
-      programCode = options.header.programCode;
-    } else {
-      programCode = Units.programCode(serverKey);
-    }
-
-    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) {
-      loading = document.getElementById("ajaxLoading");
-      loading.style.display = load ? load : "block";
-    }
-    let ty = "form";
-    if (type === "formdata") {
-      ty = null;
-    } else if (type === "json") {
-      ty = "application/json";
-    }
-    let method = options.method ? options.method : "POST";
-
-    return new Promise((resolve, reject) => {
-      let server = options.hydrocarbonServer
-        ? options.hydrocarbonServer
-        : Units.api(serverKey);
-
-      superagent(method, Units.joinPath(server, options.url))
-        .type(ty)
-        .set("hydrocarbon-token", hydrocarbonToken)
-        .set("hydrocarbon-program-token", programCode)
-        .query(options.query || "")
-        .send(options.data)
-        .end((req, res) => {
-          if (!res) {
-            message.error(translate("${服务器连接失败}"));
-            resolve(null);
-          } else {
-            if (options.data && options.data.isShowLoading !== false) {
-              loading = document.getElementById("ajaxLoading");
-              loading.style.display = "none";
-            }
-            if (res.status === 200) {
-              //Units.setHydrocarbonToken("hydrocarbonToken", hydrocarbonToken)
-              let result = res.body;
-              if (result) {
-                if (result.status === "error") {
-                  message.error(translate("${错误消息}: ") + translate("${" + result.message + "}"), 5);
-                }
-                // else if(result.message){
-                //     message.warn(result.message,4)
-                // }
-              }
-              resolve(result);
-            } else if (res.status === 201) {
-              //Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
-              resolve(res);
-            } else if (res.status === 403) {
-              Units.toLogin();
-            } else if (res.status === 405 || res.status === 406) {
-              message.error(translate("${权限不足}"),5);
-              resolve(res);
-            } else if (res.status === 404 || res.status === 504) {
-              //因为hydrogen v2 首次跳转时会报此错误，影响用户感受
-              console.log(translate("${没找到服务}(") + options.url + ")", 5);
-              //message.error("没找到服务(" + options.url + ")")
-              resolve(res);
-            } else if (res.status === 500) {
-              if (res.body && res.body.message) {
-                message.error(
-                  translate("${后台处理错误}(") + translate("${" + res.body.message + "}")  + ")",
-                  5)
-              }else if(res.text){
-                message.error(res.text);
-              }
-              console.log(res.text);
-              resolve(undefined);
-            } else {
-              message.error(
-                translate("${请求服务失败}(") + options.url + ")",
-                5
-              );
-              reject(res.body);
-            }
-          }
-        });
-    });
-  }
-
-  // static get(options) {
-  //     let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api();
-  //     return new Promise((resolve, reject) => {
-  //         superagent
-  //             .get(Units.joinPath(server, options.url))
-  //             .query(options.query || '')
-  //             .end((req, res) => {
-  //                 if (!res) {
-  //                     message.error("服务器连接失败")
-  //                     resolve(null);
-  //                 } else {
-  //                     if (res.status === 200) {
-  //                         resolve(res.body)
-  //                     } else if (res.status === 403) {
-  //                         //message.info("请求权限不足,可能是token已经超时")
-  //                         Units.toLogin();
-  //                     } else if (res.status === 404 || res.status === 504) {
-  //                         message.error("服务资源未找到("+res.status+")")
-  //                         resolve(res);
-  //                     } else if (res.status === 500) {
-  //                         message.error("后台处理错误(" + res.text + ")",5)
-  //                         resolve(res);
-  //                     } else {
-  //                         message.error("服务资源请求失败!");
-  //                         reject(res.body)
-  //                     }
-  //                 }
-  //             })
-  //     })
-  // }
-
-  static getProramConfig() {
-    return new Promise((resolve, reject) => {
-      superagent.get("programConfig.json").end((req, res) => {
-        if (!res) {
-          reject();
-        } else {
-          if (res.status === 200) {
-            resolve(res.body);
-          } else {
-            reject(res.body);
-          }
-        }
-      });
-    }).catch((err) => {
-      console.log(err);
-    });
-  }
-
-  static getHeaderObj() {
-    return {
-      "hydrocarbon-token": Units.hydrocarbonToken()
-        ? Units.hydrocarbonToken()
-        : Units.getAnoHydrocarbonToken(),
-      "hydrocarbon-program-token": Units.programCode(),
-    };
-  }
-}
+import superagent from "superagent";
+import { message } from "antd";
+import Units from "../units";
+import translate from "../locale/translate";
+
+export default class Superagent {
+  static super(options, type, load) {
+    const serverKey = options.serverKey;
+    let programCode=null;
+    if (options.header?.programCode) {
+      programCode = options.header.programCode;
+    } else {
+      programCode = Units.programCode(serverKey);
+    }
+
+    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) {
+      loading = document.getElementById("ajaxLoading");
+      loading.style.display = load ? load : "block";
+    }
+    let ty = "form";
+    if (type === "formdata") {
+      ty = null;
+    } else if (type === "json") {
+      ty = "application/json";
+    }
+    let method = options.method ? options.method : "POST";
+
+    return new Promise((resolve, reject) => {
+      let server = options.hydrocarbonServer
+        ? options.hydrocarbonServer
+        : Units.api(serverKey);
+
+      superagent(method, Units.joinPath(server, options.url))
+        .type(ty)
+        .set("hydrocarbon-token", hydrocarbonToken)
+        .set("hydrocarbon-program-token", programCode)
+        .query(options.query || "")
+        .send(options.data)
+        .end((req, res) => {
+          if (!res) {
+            message.error(translate("${服务器连接失败}"));
+            resolve(null);
+          } else {
+            if (options.data && options.data.isShowLoading !== false) {
+              loading = document.getElementById("ajaxLoading");
+              loading.style.display = "none";
+            }
+            if (res.status === 200) {
+              //Units.setHydrocarbonToken("hydrocarbonToken", hydrocarbonToken)
+              let result = res.body;
+              if (result) {
+                if (result.status === "error") {
+                  message.error(translate("${错误消息}: ") + translate("${" + result.message + "}"), 5);
+                }
+                // else if(result.message){
+                //     message.warn(result.message,4)
+                // }
+              }
+              resolve(result);
+            } else if (res.status === 201) {
+              //Units.setLocalStorge("hydrocarbonToken", hydrocarbonToken)
+              resolve(res);
+            } else if (res.status === 403) {
+              Units.toLogin();
+            } else if (res.status === 405 || res.status === 406) {
+              message.error(translate("${权限不足}"),5);
+              resolve(res);
+            } else if (res.status === 404 || res.status === 504) {
+              //因为hydrogen v2 首次跳转时会报此错误，影响用户感受
+              console.log(translate("${没找到服务}(") + options.url + ")", 5);
+              //message.error("没找到服务(" + options.url + ")")
+              resolve(res);
+            } else if (res.status === 500) {
+              if (res.body && res.body.message) {
+                message.error(
+                  translate("${后台处理错误}(") + translate("${" + res.body.message + "}")  + ")",
+                  5)
+              }else if(res.text){
+                message.error(res.text);
+              }
+              console.log(res.text);
+              resolve(undefined);
+            } else {
+              message.error(
+                translate("${请求服务失败}(") + options.url + ")",
+                5
+              );
+              reject(res.body);
+            }
+          }
+        });
+    });
+  }
+
+  // static get(options) {
+  //     let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api();
+  //     return new Promise((resolve, reject) => {
+  //         superagent
+  //             .get(Units.joinPath(server, options.url))
+  //             .query(options.query || '')
+  //             .end((req, res) => {
+  //                 if (!res) {
+  //                     message.error("服务器连接失败")
+  //                     resolve(null);
+  //                 } else {
+  //                     if (res.status === 200) {
+  //                         resolve(res.body)
+  //                     } else if (res.status === 403) {
+  //                         //message.info("请求权限不足,可能是token已经超时")
+  //                         Units.toLogin();
+  //                     } else if (res.status === 404 || res.status === 504) {
+  //                         message.error("服务资源未找到("+res.status+")")
+  //                         resolve(res);
+  //                     } else if (res.status === 500) {
+  //                         message.error("后台处理错误(" + res.text + ")",5)
+  //                         resolve(res);
+  //                     } else {
+  //                         message.error("服务资源请求失败!");
+  //                         reject(res.body)
+  //                     }
+  //                 }
+  //             })
+  //     })
+  // }
+
+  static getProramConfig() {
+    return new Promise((resolve, reject) => {
+      superagent.get("programConfig.json").end((req, res) => {
+        if (!res) {
+          reject();
+        } else {
+          if (res.status === 200) {
+            resolve(res.body);
+          } else {
+            reject(res.body);
+          }
+        }
+      });
+    }).catch((err) => {
+      console.log(err);
+    });
+  }
+
+  static getHeaderObj() {
+    return {
+      "hydrocarbon-token": Units.hydrocarbonToken()
+        ? Units.hydrocarbonToken()
+        : Units.getAnoHydrocarbonToken(),
+      "hydrocarbon-program-token": Units.programCode(),
+    };
+  }
+}