aldehyde 0.2.188 → 0.2.190

package/src/aldehyde/layout2/sider.tsx

@@ -9,7 +9,10 @@ import {
 } from "./util/menu.util";
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
-import { useLayoutContext } from "./LayoutContext";
+import {
+  MenuItemIdToFirstFloorIdxMapType,
+  useLayoutContext,
+} from "./LayoutContext";
 
 type SiderPropsType = {
   menuList: MenuType[];
@@ -18,8 +21,6 @@ type SiderPropsType = {
 
 type MenuItem = Required<MenuProps>["items"][number];
 
-type MenuItemIdToFirstFloorIdxMapType = { [key: string]: number };
-
 type SecoundFloorMenuList = MenuType[][];
 
 const items: MenuItem[] = [
@@ -149,35 +150,6 @@ const items: MenuItem[] = [
   },
 ];
 
-/**
- * @param menuList 自定义的menu
- * @param isRoot 是否为根节点
- * @param rootIdx 根节点层级
- * @param mp menu item 对应的根节点 map
- * @returns menu item 对应的根节点 map
- * @desc 获取 menu item 每一项对应其根节点的 map
- */
-const getMenuItemIdToFirstFloorIdxMap = (
-  menuList: MenuType[],
-  isRoot: boolean,
-  rootIdx?: number,
-  mp: MenuItemIdToFirstFloorIdxMapType = {}
-): MenuItemIdToFirstFloorIdxMapType => {
-  for (let i = 0; i < menuList.length; i++) {
-    const menuItem = menuList[i];
-    if (isRoot)
-      Array.isArray(menuItem.children) &&
-        getMenuItemIdToFirstFloorIdxMap(menuItem.children, false, i, mp);
-    else {
-      mp[menuItem.id] = rootIdx;
-      Array.isArray(menuItem.children) &&
-        getMenuItemIdToFirstFloorIdxMap(menuItem.children, false, rootIdx, mp);
-    }
-  }
-
-  return mp;
-};
-
 /**
  * @param menuList 自定义的menu
  * @returns 下标为 n 对应第 n 个根节点对应的第二层级menu
@@ -207,7 +179,7 @@ const getSecoundFloorMenuList = (
 const { useToken } = theme;
 
 const Sider: React.FC<SiderPropsType> = ({ menuList, style }) => {
-  const { setDocumentTitle } = useLayoutContext();
+  const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
 
   // token
   const {
@@ -218,15 +190,8 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, style }) => {
   // translate
   const { translate, getLocale } = useLocale();
 
-  const menuItemIdToFirstFloorIdxMap = useRef<
-    MenuItemIdToFirstFloorIdxMapType
-  >();
   const secoundFloorMenuList = useRef<SecoundFloorMenuList>([]);
   useEffect(() => {
-    menuItemIdToFirstFloorIdxMap.current = getMenuItemIdToFirstFloorIdxMap(
-      menuList,
-      true
-    );
     secoundFloorMenuList.current = getSecoundFloorMenuList(menuList);
   }, [menuList]);
 
@@ -295,9 +260,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, style }) => {
     if (!targetId) return;
 
     const curSiderMenuList =
-      secoundFloorMenuList.current[
-        menuItemIdToFirstFloorIdxMap.current[targetId]
-      ];
+      secoundFloorMenuList.current[menuItemIdToFirstFloorIdxMap[targetId]];
 
     if (curSiderMenuList) {
       setMenu(getMenuWithSecoundFloor(curSiderMenuList));
@@ -312,6 +275,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, style }) => {
         setMenu(getMenuWithSecoundFloor(secoundFloorMenuList.current[0]));
         setSelectedKeys([]);
       }
+      setDocumentTitle("");
+    } else {
+      const documentTitle =
+        menuList[menuItemIdToFirstFloorIdxMap[sourceId]]?.label;
+      setDocumentTitle(translate("${" + documentTitle + "}"));
     }
   }, [menuList, sourceId, getLocale()]);
 

package/src/aldehyde/login/login.tsx

@@ -86,8 +86,8 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
     await this.formRef.current
       .validateFields()
       .then(async (values) => {
-        if (needKaptcha && !vertify)
-          return this.setState({ showSlideVertify: true });
+        // if (needKaptcha && !vertify)
+        //   return this.setState({ showSlideVertify: false });
 
         const { programCode } = this.props;
         let json = { username: values.username, password: values.password };
@@ -178,7 +178,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
               prefix={<LockOutlined className="site-form-item-icon" />}
             />
           </Form.Item>
-          {/* {needKaptcha ? (
+          {needKaptcha ? (
             <Row gutter={8}>
               <Col span={12}>
                 <Form.Item
@@ -212,7 +212,7 @@ class Login extends React.PureComponent<LoginProps, LoginState> {
             </Row>
           ) : (
             ""
-          )} */}
+          )}
           <Form.Item>
             <Button
               type="primary"

package/src/aldehyde/login2/Login.tsx

@@ -1,9 +1,10 @@
-import { Button, Form, Input } from "antd";
+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;
@@ -15,6 +16,7 @@ type LoginPropType = {
 type FormType = {
   username: string;
   password: string;
+  kaptchaText:string;
 };
 
 const Login = (props: LoginPropType) => {
@@ -28,15 +30,18 @@ const Login = (props: LoginPropType) => {
   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
+    // form
   const [form] = Form.useForm<FormType>();
   const submit = async () => {
     try {
-      const { username, password } = await form.validateFields();
+      const { username, password,kaptchaText } = await form.validateFields();
 
       setLoading(true);
       const { programCode, onFinish } = props;
@@ -46,13 +51,16 @@ const Login = (props: LoginPropType) => {
       );
       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) {
@@ -60,9 +68,22 @@ const Login = (props: LoginPropType) => {
     }
   };
 
-  // button
-  const [loading, setLoading] = useState<boolean>(false);
+    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"
@@ -102,6 +123,62 @@ const Login = (props: LoginPropType) => {
           }}
         />
       </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
@@ -116,7 +193,7 @@ const Login = (props: LoginPropType) => {
             lineHeight: "15px",
           }}
         >
-          登录
+          {translate("登录")}
         </Button>
       </Form.Item>
     </Form>

package/src/aldehyde/table/query-table.tsx

@@ -259,7 +259,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     };
     const { queryKey } = this.props;
     await this.loadData(queryKey.key, pageInfo);
-    // onChangePage(pageNo, pageSize);
+    onChangePage(pageNo, pageSize);
   };
 
   queryTotal = async () => {
@@ -1073,6 +1073,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       tableProps,
       groupIColumns,
     } = this.props;
+    debugger
     const { touchEnd, total, loading, virtualEndPageNo } = this.state;
     const { translate } = this.context;