aldehyde 0.2.98 → 0.2.100

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -1,80 +1,115 @@
 import React from "react";
-import {Menu} from 'antd';
-import {Menu2layersProps} from "../../tmpl/interface";
-import MenuRender from './menu-render';
+import { Menu } from "antd";
+import { Menu2layersProps } from "../../tmpl/interface";
+import MenuRender from "./menu-render";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface Menu2layersState {
-    openKeys?: string[];
+  openKeys?: string[];
 }
 
-class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState> {
+class Menu2layers extends React.PureComponent<
+  Menu2layersProps,
+  Menu2layersState
+> {
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+  constructor(props) {
+    super(props);
+    this.state = {
+      openKeys: [],
+    };
+  }
 
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            openKeys: [],
-        }
+  componentDidMount() {
+    const { currentL2MenuId, blockMenu, collapsed } = this.props;
+    const { openKeys } = this.state;
+    let openKey = blockMenu
+      ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+      : undefined;
+    if (openKey && openKeys.length < 1) {
+      this.setState({
+        openKeys: [openKey.toString()],
+      });
     }
+  }
+  componentDidUpdate(prevProps) {
+    const { currentL2MenuId, blockMenu, collapsed } = this.props;
+    let { currentL2MenuId: preMenuId, blockMenu: preBlockMenu } = prevProps;
+    const { openKeys } = this.state;
 
-    componentDidMount() {
-        const {currentL2MenuId, blockMenu,collapsed} = this.props;
-        const {openKeys} = this.state;
-        let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
-        if(openKey && openKeys.length<1){
-            this.setState({
-                openKeys:[openKey.toString()]
-            })
-        }
+    if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
+      //console.log('currentL2MenuId:',currentL2MenuId);
+      let openKey = blockMenu
+        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+        : undefined;
+      if (openKey) {
+        this.setState({
+          openKeys: [openKey],
+        });
+      }
+    } else {
+      let openKey = blockMenu
+        ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+        : undefined;
+      let preOpenKey = blockMenu
+        ? MenuRender.findOpenId(preBlockMenu, preMenuId)
+        : undefined;
+      if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
+        this.setState({
+          openKeys: [openKey],
+        });
+      }
     }
-    componentDidUpdate(prevProps) {
-        const {currentL2MenuId, blockMenu,collapsed} = this.props;
-        let {currentL2MenuId:preMenuId,blockMenu:preBlockMenu}=prevProps;
-        const {openKeys} = this.state;
+  }
 
-        if(!preBlockMenu || !blockMenu  || blockMenu.id!=preBlockMenu.id ){
-                //console.log('currentL2MenuId:',currentL2MenuId);
-            let openKey = blockMenu? MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
-                if (openKey) {
-                    this.setState({
-                        openKeys:[openKey],
-                    })
-                }
-        }else {
-            let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
-            let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu, preMenuId):undefined;
-            if((!preOpenKey && openKey) || (openKey && openKey!=preOpenKey)){
-                this.setState({
-                    openKeys:[openKey],
-                })
-            }
-        }
+  handleOpen = (openKeys) => {
+    if (openKeys && openKeys.length > 1) {
+      openKeys.splice(0, 1);
     }
+    this.setState({
+      openKeys,
+    });
+  };
 
-    handleOpen = (openKeys) => {
-        if (openKeys && openKeys.length>1) {
-            openKeys.splice(0, 1);
-        }
-        this.setState({
-            openKeys
-        })
-    }
+  get computedBlockMenu() {
+    const { translate } = this.context;
+    const menu = JSON.parse(JSON.stringify(this.props.blockMenu));
+    menu &&
+      Array.isArray(menu.items) &&
+      menu.items.forEach((item) => {
+        item.title = translate("${" + item.title + "}");
+        return item;
+      });
+    return menu;
+  }
 
-    render() {
-        const {blockMenu, collapsed, currentL2MenuId,basePath,...other} = this.props;
-        const {openKeys} = this.state;
+  render() {
+    const {
+      blockMenu,
+      collapsed,
+      currentL2MenuId,
+      basePath,
+      ...other
+    } = this.props;
+    const { openKeys } = this.state;
 
-        return (
-            <Menu
-                {...other}
-                onOpenChange={this.handleOpen} //手风琴
-                selectedKeys={currentL2MenuId ? [currentL2MenuId.toString()] : undefined}
-                openKeys={!collapsed?openKeys:undefined}
-                items={blockMenu ? MenuRender.getMenu(blockMenu, undefined,basePath) : []}
-            >
-            </Menu>
-        );
-    }
+    return (
+      <Menu
+        {...other}
+        onOpenChange={this.handleOpen} //手风琴
+        selectedKeys={
+          currentL2MenuId ? [currentL2MenuId.toString()] : undefined
+        }
+        openKeys={!collapsed ? openKeys : undefined}
+        items={
+          blockMenu
+            ? MenuRender.getMenu(this.computedBlockMenu, undefined, basePath)
+            : []
+        }
+      ></Menu>
+    );
+  }
 }
 
-export default Menu2layers;
+export default Menu2layers;

package/src/aldehyde/layout/menu/reset-password.tsx

@@ -1,176 +1,227 @@
-import React from 'react'
+import React from "react";
 import {
-    message,
-    Button,
-    Popover,
-    Col,
-    Form,
-    Input, Row, FormInstance
-} from 'antd';
-import {LockOutlined} from '@ant-design/icons';
-import 'antd/dist/reset.css';
+  message,
+  Button,
+  Popover,
+  Col,
+  Form,
+  Input,
+  Row,
+  FormInstance,
+} from "antd";
+import { LockOutlined } from "@ant-design/icons";
+import "antd/dist/reset.css";
 import HCserviceV3 from "../../tmpl/hcservice-v3";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface ResetPasswordProps {
-    serverKey?:string,
+  serverKey?: string;
 }
 
-
 interface ResetPasswordState {
-    showPopover?:boolean,
-    pubkey?:string,
-    loading?:boolean
+  showPopover?: boolean;
+  pubkey?: string;
+  loading?: boolean;
 }
 
-
-class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswordState> {
-    state={
-        showPopover:false,
-        pubkey:undefined,
-        loading:false,
-    }
-    formRef = React.createRef<FormInstance>();
-
-    async componentDidMount() {
-        const {serverKey}=this.props;
-        let pubkey = await HCserviceV3.getRasPubkey(serverKey);
-        this.setState({
-            pubkey
-        })
-    }
-
-
-
-    handleSubmit = async (values) => {
-
-        this.setState({
-            loading: true
-        })
-        const {pubkey}=this.state
-
-        const {serverKey}=this.props;
-
-         let res = await HCserviceV3.resetPassword(serverKey,values.oldPassword, values.newPassword,pubkey);
-         if(res.status == 'success') {
-                message.info("密码已重置,请重新登录")
-                    HCserviceV3.logout();
-          }
-
-        this.setState({
-            loading: false
-        })
-    }
-
-    handleBlurCapture=()=>{
-       //判断新密码和确认密码相同
-        //console.log("this.formRef.current.getFieldValue('newPassword')",this.formRef.current.getFieldValue('newPassword')) ;
-       let newPassword= this.formRef.current.getFieldValue('newPassword');
-        let reNewPassword= this.formRef.current.getFieldValue('reNewPassword');
-        if(newPassword  && reNewPassword && newPassword!=reNewPassword){
-            this.formRef.current.setFields([{
-                name:'reNewPassword',
-                value:reNewPassword,
-                errors:['两次密码输入不一致！']
-            }]);
-        }else{
-            this.formRef.current.setFields([{
-                name:'reNewPassword',
-                value:reNewPassword,
-                errors:[]
-            }]);
-        }
-    }
-
-    getForm=()=>{
-        const {loading} = this.state;
-        return <Row  justify="center" align="middle">
-            <Col>
-                <Form style={{width: 350}} ref={this.formRef}
-                      name="normal_login"
-                      className="login-form"
-                      onFinish={this.handleSubmit}
-                >
-                    <Form.Item
-                        label={"原密码"}
-                        name="oldPassword"
-                        rules={[{required: true, message: '请输入原密码!'}]}
-                    >
-                        <Input.Password
-                            placeholder="密码"
-                            prefix={<LockOutlined className="site-form-item-icon"/>}
-                        />
-                    </Form.Item>
-                    <Form.Item
-                        label={"新设密码"}
-                    name="newPassword"
-                    rules={[{required: true, message: '请输入新密码!'}]}
-                >
-                    <Input.Password
-                        placeholder="新设密码"
-                        onBlurCapture={this.handleBlurCapture}
-                        prefix={<LockOutlined className="site-form-item-icon"/>}
-                    />
-                </Form.Item>
-                    <Form.Item
-                        label={"确认密码"}
-                        name="reNewPassword"
-                        rules={[{required: true, message: '请输入确认密码!'},
-                            ({ getFieldValue }) => ({
-                                validator(_, value) {
-                                    if (!value || getFieldValue('newPassword') === value) {
-                                        return Promise.resolve();
-                                    }
-                                    return Promise.reject(new Error('两次密码输入不一致!'));
-                                },
-                            }),]}
-                    >
-                        <Input.Password
-                            placeholder="确认密码"
-                            //onBlurCapture={this.handleBlurCapture}
-                            prefix={<LockOutlined className="site-form-item-icon"/>}
-                        />
-                    </Form.Item>
-
-                    <Form.Item>
-                        <Row align="middle"  gutter={32} >
-                            <Col  span={12}>
-                                {/*<Space style={{alignContent:"right"}} key={3} size={[8, 16]}>*/}
-                                {/*    <Button type="primary">确定</Button>*/}
-                                {/*    <Button >取消</Button>*/}
-                                {/*</Space>*/}
-                                <Button  style={{width: '100%'}}   type="primary" loading={loading} onClick={()=>this.formRef.current.submit()}>确定</Button>
-                            </Col>
-                            <Col span={12}>
-                                <Button  style={{width: '100%'}} onClick={()=>{
-                                    this.setState({
-                                        showPopover:false
-                                    })
-                                }} >取消</Button>
-                            </Col>
-                        </Row>
-
-                    </Form.Item>
-                </Form>
-            </Col>
-        </Row>
-
+class ResetPassword extends React.PureComponent<
+  ResetPasswordProps,
+  ResetPasswordState
+> {
+  state = {
+    showPopover: false,
+    pubkey: undefined,
+    loading: false,
+  };
+  formRef = React.createRef<FormInstance>();
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  async componentDidMount() {
+    const { serverKey } = this.props;
+    let pubkey = await HCserviceV3.getRasPubkey(serverKey);
+    this.setState({
+      pubkey,
+    });
+  }
+
+  handleSubmit = async (values) => {
+    const { translate } = this.context;
+
+    this.setState({
+      loading: true,
+    });
+    const { pubkey } = this.state;
+
+    const { serverKey } = this.props;
+
+    let res = await HCserviceV3.resetPassword(
+      serverKey,
+      values.oldPassword,
+      values.newPassword,
+      pubkey
+    );
+    if (res.status == "success") {
+      message.info(translate("${密码已重置,请重新登录}"));
+      HCserviceV3.logout();
     }
 
-    render() {
-        const {showPopover,loading} = this.state;
-        return (
-            <>
-                <Popover destroyTooltipOnHide={true} open={showPopover} overlayStyle={{maxWidth: '400px'}} title={'修改密码'} placement="leftBottom" trigger="click"
-                         content={this.getForm()}
-                ><span onClick={()=>{
-                    this.setState({
-                        showPopover:!showPopover
-                    })}} >修改密码</span>
-                    {/*<KeyOutlined />*/}
-                </Popover>
-            </>
-        );
+    this.setState({
+      loading: false,
+    });
+  };
+
+  handleBlurCapture = () => {
+    const { translate } = this.context;
+    //判断新密码和确认密码相同
+    //console.log("this.formRef.current.getFieldValue('newPassword')",this.formRef.current.getFieldValue('newPassword')) ;
+    let newPassword = this.formRef.current.getFieldValue("newPassword");
+    let reNewPassword = this.formRef.current.getFieldValue("reNewPassword");
+    if (newPassword && reNewPassword && newPassword != reNewPassword) {
+      this.formRef.current.setFields([
+        {
+          name: "reNewPassword",
+          value: reNewPassword,
+          errors: [translate("${两次密码输入不一致}!")],
+        },
+      ]);
+    } else {
+      this.formRef.current.setFields([
+        {
+          name: "reNewPassword",
+          value: reNewPassword,
+          errors: [],
+        },
+      ]);
     }
+  };
+
+  getForm = () => {
+    const { loading } = this.state;
+    const { translate } = this.context;
+    return (
+      <Row justify="center" align="middle">
+        <Col>
+          <Form
+            style={{ width: 350 }}
+            ref={this.formRef}
+            name="normal_login"
+            className="login-form"
+            onFinish={this.handleSubmit}
+          >
+            <Form.Item
+              label={translate("${原密码}")}
+              name="oldPassword"
+              rules={[
+                { required: true, message: translate("${请输入}${原密码}") },
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${密码}")}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+            <Form.Item
+              label={translate("${新设密码}")}
+              name="newPassword"
+              rules={[
+                { required: true, message: translate("${请输入}${新密码}!") },
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${新设密码}")}
+                onBlurCapture={this.handleBlurCapture}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+            <Form.Item
+              label={translate("${确认密码}")}
+              name="reNewPassword"
+              rules={[
+                { required: true, message: translate("${请输入}${确认密码}") },
+                ({ getFieldValue }) => ({
+                  validator(_, value) {
+                    if (!value || getFieldValue("newPassword") === value) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(
+                      new Error(translate("${两次密码输入不一致}!"))
+                    );
+                  },
+                }),
+              ]}
+            >
+              <Input.Password
+                placeholder={translate("${确认密码}")}
+                //onBlurCapture={this.handleBlurCapture}
+                prefix={<LockOutlined className="site-form-item-icon" />}
+              />
+            </Form.Item>
+
+            <Form.Item>
+              <Row align="middle" gutter={32}>
+                <Col span={12}>
+                  {/*<Space style={{alignContent:"right"}} key={3} size={[8, 16]}>*/}
+                  {/*    <Button type="primary">确定</Button>*/}
+                  {/*    <Button >取消</Button>*/}
+                  {/*</Space>*/}
+                  <Button
+                    style={{ width: "100%" }}
+                    type="primary"
+                    loading={loading}
+                    onClick={() => this.formRef.current.submit()}
+                  >
+                    {translate("${确定}")}
+                  </Button>
+                </Col>
+                <Col span={12}>
+                  <Button
+                    style={{ width: "100%" }}
+                    onClick={() => {
+                      this.setState({
+                        showPopover: false,
+                      });
+                    }}
+                  >
+                    {translate("${取消}")}
+                  </Button>
+                </Col>
+              </Row>
+            </Form.Item>
+          </Form>
+        </Col>
+      </Row>
+    );
+  };
+
+  render() {
+    const { showPopover, loading } = this.state;
+    const { translate } = this.context;
+    return (
+      <>
+        <Popover
+          destroyTooltipOnHide={true}
+          open={showPopover}
+          overlayStyle={{ maxWidth: "400px" }}
+          title={translate("${修改密码}")}
+          placement="leftBottom"
+          trigger="click"
+          content={this.getForm()}
+        >
+          <span
+            onClick={() => {
+              this.setState({
+                showPopover: !showPopover,
+              });
+            }}
+          >
+            {translate("${修改密码}")}
+          </span>
+          {/*<KeyOutlined />*/}
+        </Popover>
+      </>
+    );
+  }
 }
 
-export default ResetPassword;
+export default ResetPassword;