aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/login/vertify/tool.ts

@@ -1,13 +1,13 @@
-function getRandomNumberByRange(start: number, end: number) {
-  return Math.round(Math.random() * (end - start) + start);
-}
-
-function sum(x: number, y: number) {
-  return x + y;
-}
-
-function square(x: number) {
-  return x * x;
-}
-
-export { getRandomNumberByRange, sum, square };
+function getRandomNumberByRange(start: number, end: number) {
+  return Math.round(Math.random() * (end - start) + start);
+}
+
+function sum(x: number, y: number) {
+  return x + y;
+}
+
+function square(x: number) {
+  return x * x;
+}
+
+export { getRandomNumberByRange, sum, square };

package/src/aldehyde/login2/login-page.tsx

@@ -1,92 +1,92 @@
-import React from "react";
-import Login from "./login";
-import LoginBgPng from "./img/login-bg.png";
-import { useLocale } from "../locale/useLocale";
-import HCDataSource from "../tmpl/hc-data-source";
-import ProgramConfig from "../units";
-import { Col, Row } from "antd";
-import ResetPassword from "../layout/menu/reset-password";
-import { SafetyCertificateTwoTone } from '@ant-design/icons'
-type LoginPageProps = {
-  programName?: string;
-  copyright?: string;
-};
-const LoginPage = (props: LoginPageProps) => {
-
-  const { translate } = useLocale();
-
-  return (
-    <div
-      style={{
-        width: "100%",
-        height: "100%",
-        position: "absolute",
-        background: `url(${LoginBgPng})`,
-        backgroundSize: "cover",
-        display: "flex",
-        flexDirection: "row-reverse",
-        justifyContent: "flex-start",
-        alignItems: "center",
-      }}
-    >
-      <div
-        style={{
-          width: "500px",
-          // height: "500px",
-          background: "linear-gradient(0deg, #FFFFFF 65%, #DFEDFF)",
-          boxShadow: "0px 10px 15px -3px rgba(0,0,0,0.1)",
-          marginRight: "10%",
-          padding: "60px",
-          aspectRatio: "1/1",
-        }}
-      >
-        <div
-          style={{
-            fontWeight: 600,
-            fontSize: "30px",
-            color: "#222222",
-            marginBottom: 10,
-          }}
-        >
-          {translate("${欢迎,登录}")}
-        </div>
-        <div
-          style={{
-            fontWeight: 600,
-            fontSize: "24px",
-            color: "#222222",
-            marginBottom: 40,
-          }}
-        >{props.programName == "Aldehyde" ? "" :
-          <><SafetyCertificateTwoTone />
-            {props.programName ? translate("${" + props.programName + "}") : translate("${" + ProgramConfig.programName() + "}")}
-          </>}
-        </div>
-        <Login
-          onFinish={(token) => {
-            HCDataSource.clear();
-            window.location.hash = "/v2/home";
-            ProgramConfig.setHydrocarbonToken(token);
-          }}
-        ></Login>
-        <Row>
-          <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
-        </Row>
-        {props.copyright ?
-          <div
-            style={{
-              fontWeight: 600,
-              fontSize: "14px",
-              color: "#999",
-              marginTop: 40,
-            }}
-          >
-            {"Copyright ◎ 2025" + (props.copyright || "")}
-          </div> : ""
-        }
-      </div>
-    </div>
-  );
-};
-
-export default LoginPage;
+import React from "react";
+import Login from "./login";
+import LoginBgPng from "./img/login-bg.png";
+import { useLocale } from "../locale/useLocale";
+import HCDataSource from "../tmpl/hc-data-source";
+import ProgramConfig from "../units";
+import { Col, Row } from "antd";
+import ResetPassword from "../layout/menu/reset-password";
+import { SafetyCertificateTwoTone } from '@ant-design/icons'
+type LoginPageProps = {
+  programName?: string;
+  copyright?: string;
+};
+const LoginPage = (props: LoginPageProps) => {
+
+  const { translate } = useLocale();
+
+  return (
+    <div
+      style={{
+        width: "100%",
+        height: "100%",
+        position: "absolute",
+        background: `url(${LoginBgPng})`,
+        backgroundSize: "cover",
+        display: "flex",
+        flexDirection: "row-reverse",
+        justifyContent: "flex-start",
+        alignItems: "center",
+      }}
+    >
+      <div
+        style={{
+          width: "500px",
+          // height: "500px",
+          background: "linear-gradient(0deg, #FFFFFF 65%, #DFEDFF)",
+          boxShadow: "0px 10px 15px -3px rgba(0,0,0,0.1)",
+          marginRight: "10%",
+          padding: "60px",
+          aspectRatio: "1/1",
+        }}
+      >
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: "30px",
+            color: "#222222",
+            marginBottom: 10,
+          }}
+        >
+          {translate("${欢迎,登录}")}
+        </div>
+        <div
+          style={{
+            fontWeight: 600,
+            fontSize: "24px",
+            color: "#222222",
+            marginBottom: 40,
+          }}
+        >{props.programName == "Aldehyde" ? "" :
+          <><SafetyCertificateTwoTone />
+            {props.programName ? translate("${" + props.programName + "}") : translate("${" + ProgramConfig.programName() + "}")}
+          </>}
+        </div>
+        <Login
+          onFinish={(token) => {
+            HCDataSource.clear();
+            window.location.hash = "/v2/home";
+            ProgramConfig.setHydrocarbonToken(token);
+          }}
+        ></Login>
+        <Row>
+          <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
+        </Row>
+        {props.copyright ?
+          <div
+            style={{
+              fontWeight: 600,
+              fontSize: "14px",
+              color: "#999",
+              marginTop: 40,
+            }}
+          >
+            {"Copyright ◎ 2025" + (props.copyright || "")}
+          </div> : ""
+        }
+      </div>
+    </div>
+  );
+};
+
+export default LoginPage;

package/src/aldehyde/login2/login.tsx

@@ -1,226 +1,226 @@
-import { Button, Col, Form, Input, Row } from "antd";
-import React, { useEffect, useState } from "react";
-import HCserviceV3 from "../tmpl/hcservice-v3";
-import { useLocale } from "../locale/useLocale";
-import { useParams } from "react-router-dom";
-import Units from "../units";
-import { SafetyCertificateOutlined } from "@ant-design/icons";
-import { useSessionStorageState } from 'ahooks';
-import { KeepAliveTab } from "../hooks/use-tabs";
-
-type LoginPropType = {
-  onFinish?: (token: string) => void;
-  title?: any;
-  programCode?: string;
-  autoSaveUser?: boolean;
-  version?: string;
-  style?: { [key: string]: any };
-  applicationCode?: string;
-};
-
-type FormType = {
-  username: string;
-  password: string;
-  kaptchaText: string;
-};
-
-const defStyle = {
-  input: { borderRadius: "50px", background: "#EEF3FB" },
-  kaptcha: { borderRadius: "30px", background: "#EEF3FB" },
-  button: { shape: "round" }
-}
-
-const Login = (props: LoginPropType) => {
-  const { version = "v2", style = defStyle } = props;
-  // locale
-  const { translate } = useLocale();
-  const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
-    defaultValue: [],
-  });
-
-  useEffect(() => {
-    localStorage.setItem("version", version);
-  }, []);
-
-  const { programCode: routeProgramCode, applicationCode: routeApplicationCode } = useParams();
-
-
-  useEffect(() => {
-    if (routeProgramCode) Units.setProgramCode(routeProgramCode);
-    if (routeApplicationCode) Units.setApplicationCode(routeApplicationCode);
-  }, [routeProgramCode, routeApplicationCode]);
-
-  const [loading, setLoading] = useState<boolean>(false);
-  const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
-  const [kaptchaImg, setKaptchaImg] = useState<string>(null);
-  const [kaptchaToken, setKaptchaToken] = useState<string>(null);
-
-  // form
-  const [form] = Form.useForm<FormType>();
-  const submit = async () => {
-    setKeepAliveTabs([]);
-    try {
-      const { username, password, kaptchaText } = await form.validateFields();
-
-      setLoading(true);
-      const { programCode, applicationCode, onFinish } = props;
-      const pubkey = await HCserviceV3.getRasPubkey(
-        null,
-        programCode || routeProgramCode,
-        applicationCode || routeApplicationCode
-      );
-      const res = await HCserviceV3.login(
-        { username, password },
-        kaptchaToken,
-        kaptchaText,
-        pubkey,
-        programCode || routeProgramCode,
-        applicationCode || routeApplicationCode
-      );
-      if (res.status === "success") {
-        onFinish(res.token);
-      } else if (res.status === "error") {
-        setNeedKaptcha(true);
-        await getKaptchaToken();
-      }
-      setLoading(false);
-    } catch (err) {
-      console.error(err);
-    }
-  };
-
-  const handleKeyDown = (event) => {
-    //按下enter键，触发login事件
-    switch (event.keyCode) {
-      case 13:
-        submit();
-        break;
-      default:
-        break;
-    }
-  };
-
-  const getKaptchaToken = async () => {
-
-    let res = await HCserviceV3.getKaptchaToken(routeProgramCode, routeApplicationCode);
-    if (res) {
-      let kaptchaImg;
-      if (res.img && res.img.indexOf("data:") == 0) {
-        kaptchaImg = res.img;
-      } else {
-        kaptchaImg = `data:image/png;base64,${res.img}`;
-      }
-      setKaptchaImg(kaptchaImg);
-      setKaptchaToken(res.kaptchaToken);
-    }
-  };
-
-  // button
-  return (
-    <Form
-      name="login"
-      form={form}
-      wrapperCol={{ span: 24 }}
-      initialValues={{ remember: true }}
-      autoComplete="off"
-    >
-      <Form.Item
-        name="username"
-        rules={[{ required: true, message: translate("请输入用户名") }]}
-      >
-        <Input
-          placeholder={translate("请输入用户名")}
-          style={{
-            height: "50px",
-            fontSize: "15px",
-            lineHeight: "15px",
-            ...style.input
-          }}
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="password"
-        rules={[{ required: true, message: translate("请输入密码") }]}
-      >
-        <Input.Password
-          placeholder={translate("请输入密码")}
-          onKeyDown={handleKeyDown}
-          style={{
-            height: "50px",
-            fontSize: "15px",
-            lineHeight: "15px",
-            ...style.input
-          }}
-        />
-      </Form.Item>
-      {needKaptcha ? (
-        <Row gutter={8}>
-          <Col span={16}>
-            <Form.Item
-              name="kaptchaText"
-              rules={[
-                {
-                  required: true,
-                  message: translate("${请输入}${验证码}!"),
-                },
-              ]}
-            >
-              <Input
-                style={{
-                  height: "50px",
-                  fontSize: "15px",
-                  lineHeight: "15px",
-                  ...style.input
-                }}
-                onKeyDown={handleKeyDown}
-                prefix={
-                  <SafetyCertificateOutlined className="site-form-item-icon" />
-                }
-                placeholder={translate("${验证码}")}
-              //onKeyDown={this.handleKeyDown}
-              />
-            </Form.Item>
-          </Col>
-          <Col span={8}>
-            <img
-              style={{
-                height: "50px",
-                fontSize: "15px",
-                lineHeight: "15px",
-                cursor: "pointer",
-                width: "100%",
-                ...style.kaptcha
-              }}
-              title={translate("${点击刷新}")}
-              onClick={getKaptchaToken}
-              src={kaptchaImg}
-            />
-          </Col>
-        </Row>
-      ) : (
-        ""
-      )}
-
-      <Form.Item wrapperCol={{ span: 24 }}>
-        <Button
-          type="primary"
-          onClick={submit}
-          shape="round"
-          loading={loading}
-          style={{
-            width: "100%",
-            height: "50px",
-            fontSize: "15px",
-            lineHeight: "15px",
-          }}
-          {...style.button}
-        >
-          {translate("登录")}
-        </Button>
-      </Form.Item>
-    </Form>
-  );
-};
-
-export default Login;
+import { Button, Col, Form, Input, Row } from "antd";
+import React, { useEffect, useState } from "react";
+import HCserviceV3 from "../tmpl/hcservice-v3";
+import { useLocale } from "../locale/useLocale";
+import { useParams } from "react-router-dom";
+import Units from "../units";
+import { SafetyCertificateOutlined } from "@ant-design/icons";
+import { useSessionStorageState } from 'ahooks';
+import { KeepAliveTab } from "../hooks/use-tabs";
+
+type LoginPropType = {
+  onFinish?: (token: string) => void;
+  title?: any;
+  programCode?: string;
+  autoSaveUser?: boolean;
+  version?: string;
+  style?: { [key: string]: any };
+  applicationCode?: string;
+};
+
+type FormType = {
+  username: string;
+  password: string;
+  kaptchaText: string;
+};
+
+const defStyle = {
+  input: { borderRadius: "50px", background: "#EEF3FB" },
+  kaptcha: { borderRadius: "30px", background: "#EEF3FB" },
+  button: { shape: "round" }
+}
+
+const Login = (props: LoginPropType) => {
+  const { version = "v2", style = defStyle } = props;
+  // locale
+  const { translate } = useLocale();
+  const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
+    defaultValue: [],
+  });
+
+  useEffect(() => {
+    localStorage.setItem("version", version);
+  }, []);
+
+  const { programCode: routeProgramCode, applicationCode: routeApplicationCode } = useParams();
+
+
+  useEffect(() => {
+    if (routeProgramCode) Units.setProgramCode(routeProgramCode);
+    if (routeApplicationCode) Units.setApplicationCode(routeApplicationCode);
+  }, [routeProgramCode, routeApplicationCode]);
+
+  const [loading, setLoading] = useState<boolean>(false);
+  const [needKaptcha, setNeedKaptcha] = useState<boolean>(false);
+  const [kaptchaImg, setKaptchaImg] = useState<string>(null);
+  const [kaptchaToken, setKaptchaToken] = useState<string>(null);
+
+  // form
+  const [form] = Form.useForm<FormType>();
+  const submit = async () => {
+    setKeepAliveTabs([]);
+    try {
+      const { username, password, kaptchaText } = await form.validateFields();
+
+      setLoading(true);
+      const { programCode, applicationCode, onFinish } = props;
+      const pubkey = await HCserviceV3.getRasPubkey(
+        null,
+        programCode || routeProgramCode,
+        applicationCode || routeApplicationCode
+      );
+      const res = await HCserviceV3.login(
+        { username, password },
+        kaptchaToken,
+        kaptchaText,
+        pubkey,
+        programCode || routeProgramCode,
+        applicationCode || routeApplicationCode
+      );
+      if (res.status === "success") {
+        onFinish(res.token);
+      } else if (res.status === "error") {
+        setNeedKaptcha(true);
+        await getKaptchaToken();
+      }
+      setLoading(false);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  const handleKeyDown = (event) => {
+    //按下enter键，触发login事件
+    switch (event.keyCode) {
+      case 13:
+        submit();
+        break;
+      default:
+        break;
+    }
+  };
+
+  const getKaptchaToken = async () => {
+
+    let res = await HCserviceV3.getKaptchaToken(routeProgramCode, routeApplicationCode);
+    if (res) {
+      let kaptchaImg;
+      if (res.img && res.img.indexOf("data:") == 0) {
+        kaptchaImg = res.img;
+      } else {
+        kaptchaImg = `data:image/png;base64,${res.img}`;
+      }
+      setKaptchaImg(kaptchaImg);
+      setKaptchaToken(res.kaptchaToken);
+    }
+  };
+
+  // button
+  return (
+    <Form
+      name="login"
+      form={form}
+      wrapperCol={{ span: 24 }}
+      initialValues={{ remember: true }}
+      autoComplete="off"
+    >
+      <Form.Item
+        name="username"
+        rules={[{ required: true, message: translate("请输入用户名") }]}
+      >
+        <Input
+          placeholder={translate("请输入用户名")}
+          style={{
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+            ...style.input
+          }}
+        />
+      </Form.Item>
+
+      <Form.Item
+        name="password"
+        rules={[{ required: true, message: translate("请输入密码") }]}
+      >
+        <Input.Password
+          placeholder={translate("请输入密码")}
+          onKeyDown={handleKeyDown}
+          style={{
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+            ...style.input
+          }}
+        />
+      </Form.Item>
+      {needKaptcha ? (
+        <Row gutter={8}>
+          <Col span={16}>
+            <Form.Item
+              name="kaptchaText"
+              rules={[
+                {
+                  required: true,
+                  message: translate("${请输入}${验证码}!"),
+                },
+              ]}
+            >
+              <Input
+                style={{
+                  height: "50px",
+                  fontSize: "15px",
+                  lineHeight: "15px",
+                  ...style.input
+                }}
+                onKeyDown={handleKeyDown}
+                prefix={
+                  <SafetyCertificateOutlined className="site-form-item-icon" />
+                }
+                placeholder={translate("${验证码}")}
+              //onKeyDown={this.handleKeyDown}
+              />
+            </Form.Item>
+          </Col>
+          <Col span={8}>
+            <img
+              style={{
+                height: "50px",
+                fontSize: "15px",
+                lineHeight: "15px",
+                cursor: "pointer",
+                width: "100%",
+                ...style.kaptcha
+              }}
+              title={translate("${点击刷新}")}
+              onClick={getKaptchaToken}
+              src={kaptchaImg}
+            />
+          </Col>
+        </Row>
+      ) : (
+        ""
+      )}
+
+      <Form.Item wrapperCol={{ span: 24 }}>
+        <Button
+          type="primary"
+          onClick={submit}
+          shape="round"
+          loading={loading}
+          style={{
+            width: "100%",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+          {...style.button}
+        >
+          {translate("登录")}
+        </Button>
+      </Form.Item>
+    </Form>
+  );
+};
+
+export default Login;