aldehyde 0.2.197 → 0.2.199

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.tsx

@@ -1,203 +1,203 @@
-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";
-
-type LoginPropType = {
-  onFinish?: (token: string) => void;
-  title?: any;
-  programCode?: string;
-  autoSaveUser?: boolean;
-};
-
-type FormType = {
-  username: string;
-  password: string;
-  kaptchaText:string;
-};
-
-const Login = (props: LoginPropType) => {
-  // locale
-  const { translate } = useLocale();
-
-  useEffect(() => {
-    localStorage.setItem("version", "v2");
-  }, []);
-
-  const { programCode: routeProgramCode } = useParams();
-  useEffect(() => {
-    if (routeProgramCode === undefined) return;
-    Units.setProgramCode(routeProgramCode);
-  }, [routeProgramCode]);
-    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 () => {
-    try {
-      const { username, password,kaptchaText } = await form.validateFields();
-
-      setLoading(true);
-      const { programCode, onFinish } = props;
-      const pubkey = await HCserviceV3.getRasPubkey(
-        null,
-        programCode ? programCode : routeProgramCode
-      );
-      const res = await HCserviceV3.login(
-        { username, password },
-          kaptchaToken,
-          kaptchaText,
-        pubkey,
-        programCode ? programCode : routeProgramCode
-      );
-      if (res.status === "success") {
-        onFinish(res.token);
-      }else if (res.status === "error") {
-          setNeedKaptcha(true);
-          await getKaptchaToken();
-      }
-      setLoading(false);
-    } catch (err) {
-      console.error(err);
-    }
-  };
-
-    const  getKaptchaToken = async () => {
-
-        let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
-        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={{
-            borderRadius: "50px",
-            background: "#EEF3FB",
-            height: "50px",
-            fontSize: "15px",
-            lineHeight: "15px",
-          }}
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="password"
-        rules={[{ required: true, message: translate("请输入密码") }]}
-      >
-        <Input.Password
-          placeholder={translate("请输入密码")}
-          style={{
-            borderRadius: "50px",
-            background: "#EEF3FB",
-            height: "50px",
-            fontSize: "15px",
-            lineHeight: "15px",
-          }}
-        />
-      </Form.Item>
-      {needKaptcha ? (
-          <Row gutter={8}>
-            <Col span={16}>
-              <Form.Item
-                  style={{
-                      borderRadius: "50px",
-                      background: "#EEF3FB",
-                      height: "50px",
-                      fontSize: "15px",
-                      lineHeight: "15px",
-                  }}
-                  name="kaptchaText"
-                  rules={[
-                    {
-                      required: true,
-                      message: translate("${请输入}${验证码}!"),
-                    },
-                  ]}
-              >
-                <Input
-                    style={{
-                        borderRadius: "50px",
-                        background: "#EEF3FB",
-                        height: "50px",
-                        fontSize: "15px",
-                        lineHeight: "15px",
-                    }}
-                    prefix={
-                      <SafetyCertificateOutlined className="site-form-item-icon" />
-                    }
-                    placeholder={translate("${验证码}")}
-                    //onKeyDown={this.handleKeyDown}
-                />
-              </Form.Item>
-            </Col>
-            <Col span={8}>
-              <img
-                  style={{
-                      borderRadius: "30px",
-                      background: "#EEF3FB",
-                      height: "50px",
-                      fontSize: "15px",
-                      lineHeight: "15px",
-                      cursor: "pointer"
-                  }}
-                  // height={50}
-                  width={110}
-                  title={translate("${点击刷新}")}
-                  onClick={getKaptchaToken}
-                  src={kaptchaImg}
-              ></img>
-            </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",
-          }}
-        >
-          {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";
+
+type LoginPropType = {
+  onFinish?: (token: string) => void;
+  title?: any;
+  programCode?: string;
+  autoSaveUser?: boolean;
+};
+
+type FormType = {
+  username: string;
+  password: string;
+  kaptchaText:string;
+};
+
+const Login = (props: LoginPropType) => {
+  // locale
+  const { translate } = useLocale();
+
+  useEffect(() => {
+    localStorage.setItem("version", "v2");
+  }, []);
+
+  const { programCode: routeProgramCode } = useParams();
+  useEffect(() => {
+    if (routeProgramCode === undefined) return;
+    Units.setProgramCode(routeProgramCode);
+  }, [routeProgramCode]);
+    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 () => {
+    try {
+      const { username, password,kaptchaText } = await form.validateFields();
+
+      setLoading(true);
+      const { programCode, onFinish } = props;
+      const pubkey = await HCserviceV3.getRasPubkey(
+        null,
+        programCode ? programCode : routeProgramCode
+      );
+      const res = await HCserviceV3.login(
+        { username, password },
+          kaptchaToken,
+          kaptchaText,
+        pubkey,
+        programCode ? programCode : routeProgramCode
+      );
+      if (res.status === "success") {
+        onFinish(res.token);
+      }else if (res.status === "error") {
+          setNeedKaptcha(true);
+          await getKaptchaToken();
+      }
+      setLoading(false);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+    const  getKaptchaToken = async () => {
+
+        let res = await HCserviceV3.getKaptchaToken(routeProgramCode);
+        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={{
+            borderRadius: "50px",
+            background: "#EEF3FB",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+        />
+      </Form.Item>
+
+      <Form.Item
+        name="password"
+        rules={[{ required: true, message: translate("请输入密码") }]}
+      >
+        <Input.Password
+          placeholder={translate("请输入密码")}
+          style={{
+            borderRadius: "50px",
+            background: "#EEF3FB",
+            height: "50px",
+            fontSize: "15px",
+            lineHeight: "15px",
+          }}
+        />
+      </Form.Item>
+      {needKaptcha ? (
+          <Row gutter={8}>
+            <Col span={16}>
+              <Form.Item
+                  style={{
+                      borderRadius: "50px",
+                      background: "#EEF3FB",
+                      height: "50px",
+                      fontSize: "15px",
+                      lineHeight: "15px",
+                  }}
+                  name="kaptchaText"
+                  rules={[
+                    {
+                      required: true,
+                      message: translate("${请输入}${验证码}!"),
+                    },
+                  ]}
+              >
+                <Input
+                    style={{
+                        borderRadius: "50px",
+                        background: "#EEF3FB",
+                        height: "50px",
+                        fontSize: "15px",
+                        lineHeight: "15px",
+                    }}
+                    prefix={
+                      <SafetyCertificateOutlined className="site-form-item-icon" />
+                    }
+                    placeholder={translate("${验证码}")}
+                    //onKeyDown={this.handleKeyDown}
+                />
+              </Form.Item>
+            </Col>
+            <Col span={8}>
+              <img
+                  style={{
+                      borderRadius: "30px",
+                      background: "#EEF3FB",
+                      height: "50px",
+                      fontSize: "15px",
+                      lineHeight: "15px",
+                      cursor: "pointer"
+                  }}
+                  // height={50}
+                  width={110}
+                  title={translate("${点击刷新}")}
+                  onClick={getKaptchaToken}
+                  src={kaptchaImg}
+              ></img>
+            </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",
+          }}
+        >
+          {translate("登录")}
+        </Button>
+      </Form.Item>
+    </Form>
+  );
+};
+
+export default Login;

package/src/aldehyde/login2/LoginPage.tsx

@@ -1,64 +1,64 @@
-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 Units from "../units";
-import {Button, Col, Row} from "antd";
-import ResetPassword from "../layout/menu/reset-password";
-
-const LoginPage = () => {
-  const { translate } = useLocale();
-
-  return (
-    <div
-      style={{
-        width: "100%",
-        height: "100%",
-        // minWidth: "1600px",
-        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: 60,
-          }}
-        >
-          {translate("欢迎, 登录")}
-        </div>
-        <Login
-          onFinish={(token) => {
-            HCDataSource.clear();
-            window.location.hash = "/v2";
-            Units.setHydrocarbonToken(token);
-          }}
-        ></Login>
-          <Row>
-              <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
-          </Row>
-      </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 Units from "../units";
+import {Button, Col, Row} from "antd";
+import ResetPassword from "../layout/menu/reset-password";
+
+const LoginPage = () => {
+  const { translate } = useLocale();
+
+  return (
+    <div
+      style={{
+        width: "100%",
+        height: "100%",
+        // minWidth: "1600px",
+        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: 60,
+          }}
+        >
+          {translate("欢迎, 登录")}
+        </div>
+        <Login
+          onFinish={(token) => {
+            HCDataSource.clear();
+            window.location.hash = "/v2";
+            Units.setHydrocarbonToken(token);
+          }}
+        ></Login>
+          <Row>
+              <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
+          </Row>
+      </div>
+    </div>
+  );
+};
+
+export default LoginPage;

package/src/aldehyde/login2/index.tsx

@@ -1,4 +1,4 @@
-import Login from "./Login";
-import LoginPage from "./LoginPage";
-
-export { Login, LoginPage };
+import Login from "./Login";
+import LoginPage from "./LoginPage";
+
+export { Login, LoginPage };