aldehyde 0.2.496 → 0.2.498

package/src/aldehyde/routable/ttmpl-route.tsx

@@ -1,98 +1,98 @@
-import React from "react";
-import {
-  RouterCompProps,
-  TtmplConfig,
-} from "../tmpl/interface";
-import HCDataSource from "../tmpl/hc-data-source";
-import withRouter from "../routable/withroute";
-import ActTree from "../tree/act-tree";
-import { Card, message } from "antd";
-export interface TtmplRouteProps extends RouterCompProps {
-  layoutRootPath?: string;
-  treeTop?: number,
-}
-
-export interface TtmplRouteState {
-  ttmplConfig?: TtmplConfig;
-}
-
-class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
-  static defaultProps = {
-    basePath: "",
-  };
-  state = {
-    ttmplConfig: undefined,
-  };
-
-  async componentDidMount() {
-    this.loadData();
-  }
-
-  get computedLayoutPath() {
-    const { layoutRootPath } = this.props;
-    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
-    return "";
-  }
-
-  onRoute = (path) => {
-    this.props.navigate(path);
-  };
-
-  getMenuId = () => {
-    const { searchParams } = this.props;
-    let menuId = searchParams.get("menuId");
-    return menuId;
-  };
-
-  getServerKey = () => { // 获取serverKey
-    const { searchParams } = this.props;
-    let serverKey = searchParams.get("serverKey");
-    return serverKey || null;
-  };
-
-  loadData = async () => {
-    const { params } = this.props;
-    const { sourceId } = params;
-    const serverKey = this.getServerKey();
-    let ttmplConfig: TtmplConfig = await HCDataSource.requestTtmplConfig(serverKey, sourceId);
-    // debugger;
-    if (ttmplConfig.type == "1M") {//此处待优化。不建议支持
-      message.error("不支持的配置树。请联系管理员！")
-      // this.props.navigate(
-      //   `${this.computedLayoutPath}/${ttmplConfig.id}/act-table`
-      // );
-    } else {
-      this.setState({
-        ttmplConfig: { ...ttmplConfig },
-      });
-    }
-  };
-
-  async componentDidUpdate(prevProps) {
-    const { location, params } = this.props;
-    const { sourceId } = params;
-    let { sourceId: preSourceId } = prevProps.params;
-
-    if (sourceId && preSourceId && sourceId == preSourceId) {
-      return;
-    }
-    await this.loadData();
-  }
-
-  render() {
-    const { treeTop } = this.props;
-    const { ttmplConfig } = this.state;
-    const serverKey = this.getServerKey();
-    if (!ttmplConfig) {
-      return <Card loading={true}></Card>;
-    } else {
-      return (
-        <>
-          <ActTree key={ttmplConfig.sourceId} top={treeTop} ttmplConfig={ttmplConfig} serverKey={serverKey}></ActTree>
-        </>
-      );
-    }
-  }
-}
-
-export default withRouter(TtmplRoute);
+import React from "react";
+import {
+  RouterCompProps,
+  TtmplConfig,
+} from "../tmpl/interface";
+import HCDataSource from "../tmpl/hc-data-source";
+import withRouter from "../routable/withroute";
+import ActTree from "../tree/act-tree";
+import { Card, message } from "antd";
+export interface TtmplRouteProps extends RouterCompProps {
+  layoutRootPath?: string;
+  treeTop?: number,
+}
+
+export interface TtmplRouteState {
+  ttmplConfig?: TtmplConfig;
+}
+
+class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
+  static defaultProps = {
+    basePath: "",
+  };
+  state = {
+    ttmplConfig: undefined,
+  };
+
+  async componentDidMount() {
+    this.loadData();
+  }
+
+  get computedLayoutPath() {
+    const { layoutRootPath } = this.props;
+    if (layoutRootPath !== undefined) return `/${layoutRootPath}`;
+    return "";
+  }
+
+  onRoute = (path) => {
+    this.props.navigate(path);
+  };
+
+  getMenuId = () => {
+    const { searchParams } = this.props;
+    let menuId = searchParams.get("menuId");
+    return menuId;
+  };
+
+  getServerKey = () => { // 获取serverKey
+    const { searchParams } = this.props;
+    let serverKey = searchParams.get("serverKey");
+    return serverKey || null;
+  };
+
+  loadData = async () => {
+    const { params } = this.props;
+    const { sourceId } = params;
+    const serverKey = this.getServerKey();
+    let ttmplConfig: TtmplConfig = await HCDataSource.requestTtmplConfig(serverKey, sourceId);
+    // debugger;
+    if (ttmplConfig.type == "1M") {//此处待优化。不建议支持
+      message.error("不支持的配置树。请联系管理员！")
+      // this.props.navigate(
+      //   `${this.computedLayoutPath}/${ttmplConfig.id}/act-table`
+      // );
+    } else {
+      this.setState({
+        ttmplConfig: { ...ttmplConfig },
+      });
+    }
+  };
+
+  async componentDidUpdate(prevProps) {
+    const { location, params } = this.props;
+    const { sourceId } = params;
+    let { sourceId: preSourceId } = prevProps.params;
+
+    if (sourceId && preSourceId && sourceId == preSourceId) {
+      return;
+    }
+    await this.loadData();
+  }
+
+  render() {
+    const { treeTop } = this.props;
+    const { ttmplConfig } = this.state;
+    const serverKey = this.getServerKey();
+    if (!ttmplConfig) {
+      return <Card loading={true}></Card>;
+    } else {
+      return (
+        <>
+          <ActTree key={ttmplConfig.sourceId} top={treeTop} ttmplConfig={ttmplConfig} serverKey={serverKey}></ActTree>
+        </>
+      );
+    }
+  }
+}
+
+export default withRouter(TtmplRoute);

package/src/aldehyde/routable/withroute.tsx

@@ -1,36 +1,36 @@
-import React from "react";
-import {
-  useLocation,
-  useNavigate,
-  useParams,
-  useSearchParams,
-} from "react-router-dom";
-
-const withRouter = (Comp) => (props) => {
-  const { compRef, ...otherProps } = props;
-  const location = useLocation();
-  const navigate = useNavigate();
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  // const { pathname } = location;
-  // const {sourceId} = useParams();
-  //let sourceId= pathname.split("/")[2];
-
-  // debugger
-  // if(location.pathname.indexOf(sourceId)<=0){
-  //   return <></>
-  // }
-
-  return (
-    <Comp
-      {...otherProps}
-      location={location}
-      navigate={navigate}
-      params={{ ...useParams() }}
-      searchParams={searchParams}
-      ref={compRef} // 外部组件获取class组件实例
-    />
-  );
-};
-
-export default withRouter;
+import React from "react";
+import {
+  useLocation,
+  useNavigate,
+  useParams,
+  useSearchParams,
+} from "react-router-dom";
+
+const withRouter = (Comp) => (props) => {
+  const { compRef, ...otherProps } = props;
+  const location = useLocation();
+  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  // const { pathname } = location;
+  // const {sourceId} = useParams();
+  //let sourceId= pathname.split("/")[2];
+
+  // debugger
+  // if(location.pathname.indexOf(sourceId)<=0){
+  //   return <></>
+  // }
+
+  return (
+    <Comp
+      {...otherProps}
+      location={location}
+      navigate={navigate}
+      params={{ ...useParams() }}
+      searchParams={searchParams}
+      ref={compRef} // 外部组件获取class组件实例
+    />
+  );
+};
+
+export default withRouter;

package/src/aldehyde/sso-Login/index.tsx

@@ -1,74 +1,74 @@
-import React, { useState, useMemo, useEffect } from "react";
-import { useLocation } from "react-router-dom";
-import { Spin } from "antd";
-import HCserviceV3 from "../tmpl/hcservice-v3";
-import HCDataSource from "../tmpl/hc-data-source";
-import ProgramConfig from "../units";
-import { getMenuConfig } from "../layout2/page";
-
-interface Props {
-    serverKey?: string;
-}
-
-const Index = (props: Props) => {
-    const { serverKey } = props;
-    const [loading, setLoading] = useState<boolean>(true);
-    const { search } = useLocation();
-
-    const params = useMemo(() => {
-        const temParams = new URLSearchParams(search);
-        const username = temParams.get("username");
-        const ssoToken = temParams.get("ssoToken");
-        const programCode = temParams.get("programCode");
-        const token = temParams.get("token");
-        const sourceId = temParams.get("sourceId");
-        const applicationCode = temParams.get("applicationCode");
-        return { username, ssoToken, programCode, token, sourceId, applicationCode };
-    }, [search]);
-
-    const ssoTokenLogin = async () => {
-        setLoading(true);
-        const { username, ssoToken, programCode, sourceId, applicationCode } = params;
-        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, applicationCode, serverKey);
-        const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
-        if (res.status === "success") {
-            HCDataSource.clear();
-            ProgramConfig.setHydrocarbonToken(res.token);
-            if (sourceId) {
-                const temData = await getMenuConfig(defaultStyleTheme || "v2");
-                const menu = ProgramConfig.findItemByIdIterative(temData.menu, sourceId);
-                window.location.hash = menu?.url || `/${defaultStyleTheme || "v2"}/home`;
-            } else {
-                window.location.hash = `/${defaultStyleTheme || "v2"}/home`;
-            }
-        } else if (res.status === "error") {
-            const allThemes = ProgramConfig.getAllThemes();
-            window.location.hash = `/${allThemes[defaultStyleTheme || "v2"].loginPath}`;
-        }
-        setLoading(false);
-    };
-
-    const tokenLogin = async () => {
-        const { token, sourceId } = params;
-        const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
-        HCDataSource.clear();
-        ProgramConfig.setHydrocarbonToken(token);
-        if (sourceId) {
-            const temData = await getMenuConfig(defaultStyleTheme || "v2");
-            const menu = ProgramConfig.findItemByIdIterative(temData.menu, sourceId);
-            window.location.hash = `/${menu?.url}` || `/${defaultStyleTheme || "v2"}/home`;
-        } else {
-            window.location.hash = `/${defaultStyleTheme || "v2"}/home`;
-        }
-    }
-
-    useEffect(() => {
-        if (params) {
-            params.token ? tokenLogin() : ssoTokenLogin();
-        }
-    }, [params])
-
-    return <Spin spinning={loading} fullscreen />;
-}
-
+import React, { useState, useMemo, useEffect } from "react";
+import { useLocation } from "react-router-dom";
+import { Spin } from "antd";
+import HCserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from "../tmpl/hc-data-source";
+import ProgramConfig from "../units";
+import { getMenuConfig } from "../layout2/page";
+
+interface Props {
+    serverKey?: string;
+}
+
+const Index = (props: Props) => {
+    const { serverKey } = props;
+    const [loading, setLoading] = useState<boolean>(true);
+    const { search } = useLocation();
+
+    const params = useMemo(() => {
+        const temParams = new URLSearchParams(search);
+        const username = temParams.get("username");
+        const ssoToken = temParams.get("ssoToken");
+        const programCode = temParams.get("programCode");
+        const token = temParams.get("token");
+        const sourceId = temParams.get("sourceId");
+        const applicationCode = temParams.get("applicationCode");
+        return { username, ssoToken, programCode, token, sourceId, applicationCode };
+    }, [search]);
+
+    const ssoTokenLogin = async () => {
+        setLoading(true);
+        const { username, ssoToken, programCode, sourceId, applicationCode } = params;
+        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, applicationCode, serverKey);
+        const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
+        if (res.status === "success") {
+            HCDataSource.clear();
+            ProgramConfig.setHydrocarbonToken(res.token);
+            if (sourceId) {
+                const temData = await getMenuConfig(defaultStyleTheme || "v2");
+                const menu = ProgramConfig.findItemByIdIterative(temData.menu, sourceId);
+                window.location.hash = menu?.url || `/${defaultStyleTheme || "v2"}/home`;
+            } else {
+                window.location.hash = `/${defaultStyleTheme || "v2"}/home`;
+            }
+        } else if (res.status === "error") {
+            const allThemes = ProgramConfig.getAllThemes();
+            window.location.hash = `/${allThemes[defaultStyleTheme || "v2"].loginPath}`;
+        }
+        setLoading(false);
+    };
+
+    const tokenLogin = async () => {
+        const { token, sourceId } = params;
+        const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
+        HCDataSource.clear();
+        ProgramConfig.setHydrocarbonToken(token);
+        if (sourceId) {
+            const temData = await getMenuConfig(defaultStyleTheme || "v2");
+            const menu = ProgramConfig.findItemByIdIterative(temData.menu, sourceId);
+            window.location.hash = `/${menu?.url}` || `/${defaultStyleTheme || "v2"}/home`;
+        } else {
+            window.location.hash = `/${defaultStyleTheme || "v2"}/home`;
+        }
+    }
+
+    useEffect(() => {
+        if (params) {
+            params.token ? tokenLogin() : ssoTokenLogin();
+        }
+    }, [params])
+
+    return <Spin spinning={loading} fullscreen />;
+}
+
 export default Index;

package/src/aldehyde/sso-Login/service/index.js

@@ -1,17 +1,17 @@
-import { handleLogin } from "./login";
-
-const Username = "";
-const Password = "";
-const SourceId = ""; // 菜单SourceId
-const Path = "";
-const ProgramCode = "";
-const ApplicationCode = "";
-
-export const getUrl = async () => {
-    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode, applicationCode: ApplicationCode });
-    if (!token) {
-        return null;
-    }
-    const url = `${Path}/#/sso-token?token=${token}&sourceId=${SourceId}`;
-    return url;
+import { handleLogin } from "./login";
+
+const Username = "";
+const Password = "";
+const SourceId = ""; // 菜单SourceId
+const Path = "";
+const ProgramCode = "";
+const ApplicationCode = "";
+
+export const getUrl = async () => {
+    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode, applicationCode: ApplicationCode });
+    if (!token) {
+        return null;
+    }
+    const url = `${Path}/#/sso-token?token=${token}&sourceId=${SourceId}`;
+    return url;
 }

package/src/aldehyde/sso-Login/service/login.js

@@ -1,76 +1,76 @@
-import dayjs from "dayjs";
-import JSEncrypt from 'jsencrypt';
-import superagent from "superagent";
-
-export const handleLogin = async (params) => {
-    const { username, password, programCode, path, applicationCode } = params || {};
-    if (!username || !password || !programCode || !path) {
-        return null;
-    }
-    const pubkey = await getPubkey(params);
-    if (!pubkey) {
-        return null;
-    }
-    const res = await login({ loginData: { username, password }, pubkey, programCode, path, applicationCode });
-    if (res.status === "success") {
-        return res.token;
-    } else {
-        console.log("error:", res.message);
-        return null;
-    }
-}
-
-const getPubkey = async (params) => {
-    const { programCode, path, applicationCode } = params || {};
-    if (!programCode) {
-        return null;
-    }
-    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, applicationCode, method: "GET", path });
-    return res?.status === "success" ? res.rasPubkey : null;
-};
-
-const rsaEncrypt = (word, keyStr) => {
-    const encrypt = new JSEncrypt();
-    encrypt.setPublicKey(keyStr);
-    return encrypt.encrypt(word);
-}
-
-const login = async (params) => {
-    const { loginData, pubkey, programCode, applicationCode, serverKey, path } = params;
-    let datetime = dayjs(new Date()).tz("Europe/London").format("YYYY-MM-DD HH:mm:ss");
-    let userInfo = rsaEncrypt(JSON.stringify({ ...loginData, datetime }), pubkey);
-    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, applicationCode, query: { userInfo }, method: "GET", path });
-    return { status: res.status, token: res.token };
-}
-
-const request = (params) => {
-    const { programCode, method, path, query, data, url, applicationCode } = params;
-    return new Promise((resolve, reject) => {
-        superagent(method || "POST", path + url)
-            .type("form")
-            .set("hydrocarbon-program-token", programCode)
-            .set("hydrocarbon-application-token", applicationCode)
-            .query(query || "")
-            .send(data)
-            .end((req, res) => {
-                if (!res) {
-                    resolve({ message: "服务器连接失败" });
-                } else {
-                    if (res.status === 200) {
-                        let result = res.body;
-                        resolve(result);
-                    } else if ([201, 403].includes(res.status)) {
-                        resolve(res);
-                    } else if (res.status === 405 || res.status === 406) {
-                        resolve({ ...res, message: "权限不足" });
-                    } else if (res.status === 404 || res.status === 504) {
-                        resolve({ ...res, message: "没找到服务" });
-                    } else if (res.status === 500) {
-                        resolve(undefined);
-                    } else {
-                        reject(res.body);
-                    }
-                }
-            });
-    });
+import dayjs from "dayjs";
+import JSEncrypt from 'jsencrypt';
+import superagent from "superagent";
+
+export const handleLogin = async (params) => {
+    const { username, password, programCode, path, applicationCode } = params || {};
+    if (!username || !password || !programCode || !path) {
+        return null;
+    }
+    const pubkey = await getPubkey(params);
+    if (!pubkey) {
+        return null;
+    }
+    const res = await login({ loginData: { username, password }, pubkey, programCode, path, applicationCode });
+    if (res.status === "success") {
+        return res.token;
+    } else {
+        console.log("error:", res.message);
+        return null;
+    }
+}
+
+const getPubkey = async (params) => {
+    const { programCode, path, applicationCode } = params || {};
+    if (!programCode) {
+        return null;
+    }
+    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, applicationCode, method: "GET", path });
+    return res?.status === "success" ? res.rasPubkey : null;
+};
+
+const rsaEncrypt = (word, keyStr) => {
+    const encrypt = new JSEncrypt();
+    encrypt.setPublicKey(keyStr);
+    return encrypt.encrypt(word);
+}
+
+const login = async (params) => {
+    const { loginData, pubkey, programCode, applicationCode, serverKey, path } = params;
+    let datetime = dayjs(new Date()).tz("Europe/London").format("YYYY-MM-DD HH:mm:ss");
+    let userInfo = rsaEncrypt(JSON.stringify({ ...loginData, datetime }), pubkey);
+    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, applicationCode, query: { userInfo }, method: "GET", path });
+    return { status: res.status, token: res.token };
+}
+
+const request = (params) => {
+    const { programCode, method, path, query, data, url, applicationCode } = params;
+    return new Promise((resolve, reject) => {
+        superagent(method || "POST", path + url)
+            .type("form")
+            .set("hydrocarbon-program-token", programCode)
+            .set("hydrocarbon-application-token", applicationCode)
+            .query(query || "")
+            .send(data)
+            .end((req, res) => {
+                if (!res) {
+                    resolve({ message: "服务器连接失败" });
+                } else {
+                    if (res.status === 200) {
+                        let result = res.body;
+                        resolve(result);
+                    } else if ([201, 403].includes(res.status)) {
+                        resolve(res);
+                    } else if (res.status === 405 || res.status === 406) {
+                        resolve({ ...res, message: "权限不足" });
+                    } else if (res.status === 404 || res.status === 504) {
+                        resolve({ ...res, message: "没找到服务" });
+                    } else if (res.status === 500) {
+                        resolve(undefined);
+                    } else {
+                        reject(res.body);
+                    }
+                }
+            });
+    });
 }