aldehyde 0.2.480 → 0.2.481

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

@@ -1,111 +1,111 @@
-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, messageText?: string | boolean) {
-    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 && messageText !== false) {
-          if (messageText) {
-            message.success(messageText, 1);
-          } else {
-            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, messageText?: string | boolean) {
+    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 && messageText !== false) {
+          if (messageText) {
+            message.success(messageText, 1);
+          } else {
+            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,146 +1,146 @@
-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 applicationCode = options.header?.applicationCode ? options.header?.applicationCode : Units.applicationCode(serverKey);
-
-        let hydrocarbonToken = null;
-        if (options.header && options.header.hydrocarbonToken) {
-            hydrocarbonToken = options.header.hydrocarbonToken;
-        } else if (serverKey) {
-            hydrocarbonToken = Units.serverHydrocarbonToken(serverKey)
-        } else if (Units.hydrocarbonToken(programCode, applicationCode)) {
-            hydrocarbonToken = Units.hydrocarbonToken(programCode, applicationCode);
-        } else {
-            hydrocarbonToken = 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)
-                .set("hydrocarbon-application-token", applicationCode)
-                .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 === 401) {
-                            Units.toLogin();
-                        } else if ([403, 405, 406].includes(res.status)) {
-                            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 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(serverKey) {
-        if (serverKey) {
-            return {
-                "hydrocarbon-token": Units.serverHydrocarbonToken(serverKey),
-                "hydrocarbon-program-token": Units.programCode(serverKey),
-                "hydrocarbon-application-token": Units.applicationCode(serverKey)
-            }
-        } else {
-            return {
-                "hydrocarbon-token": Units.hydrocarbonToken()
-                    ? Units.hydrocarbonToken()
-                    : Units.getAnoHydrocarbonToken(),
-                "hydrocarbon-program-token": Units.programCode(),
-                "hydrocarbon-application-token": Units.applicationCode(serverKey)
-            };
-        }
-    }
-}
+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 applicationCode = options.header?.applicationCode ? options.header?.applicationCode : Units.applicationCode(serverKey);
+
+        let hydrocarbonToken = null;
+        if (options.header && options.header.hydrocarbonToken) {
+            hydrocarbonToken = options.header.hydrocarbonToken;
+        } else if (serverKey) {
+            hydrocarbonToken = Units.serverHydrocarbonToken(serverKey)
+        } else if (Units.hydrocarbonToken(programCode, applicationCode)) {
+            hydrocarbonToken = Units.hydrocarbonToken(programCode, applicationCode);
+        } else {
+            hydrocarbonToken = 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)
+                .set("hydrocarbon-application-token", applicationCode)
+                .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 === 401) {
+                            Units.toLogin();
+                        } else if ([403, 405, 406].includes(res.status)) {
+                            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 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(serverKey) {
+        if (serverKey) {
+            return {
+                "hydrocarbon-token": Units.serverHydrocarbonToken(serverKey),
+                "hydrocarbon-program-token": Units.programCode(serverKey),
+                "hydrocarbon-application-token": Units.applicationCode(serverKey)
+            }
+        } else {
+            return {
+                "hydrocarbon-token": Units.hydrocarbonToken()
+                    ? Units.hydrocarbonToken()
+                    : Units.getAnoHydrocarbonToken(),
+                "hydrocarbon-program-token": Units.programCode(),
+                "hydrocarbon-application-token": Units.applicationCode(serverKey)
+            };
+        }
+    }
+}