aldehyde 0.2.99 → 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/sidebar/index.tsx

@@ -6,6 +6,7 @@ import { Menu2layersProps } from "../../tmpl/interface";
 import Scrollbars from "react-custom-scrollbars";
 import { Image, theme } from "antd";
 import logo from "./logo.png";
+import { useLocale } from "../../locale/useLocale";
 interface SideBarProps extends Menu2layersProps {
   title?: string;
   logo?: any;
@@ -14,6 +15,7 @@ interface SideBarProps extends Menu2layersProps {
 interface SideBarState {}
 const { useToken } = theme;
 const SideBar: React.FC<SideBarProps> = (props) => {
+  const { translate } = useLocale();
   const { token } = useToken();
   let syyy = { "--logo-blue-background": token.colorPrimary } as CSSProperties;
   let { collapsed } = props;
@@ -55,7 +57,9 @@ const SideBar: React.FC<SideBarProps> = (props) => {
                     ) : (
                       <></>
                     )}
-                    {props.title ? props.title : Units.programName_NavLeft()}
+                    {translate(
+                      props.title ? props.title : Units.programName_NavLeft()
+                    )}
                   </>
                 </h1>
               </>

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -121,9 +121,11 @@ export const LocaleProvider = ({ children }: { children: ReactNode }) => {
     for (const char of str) {
       if (char === "$") {
         enableMatch = true;
-        res.push(tres);
-        tres = "";
-        resMp.push(false);
+        if (tres !== "") {
+          res.push(tres);
+          tres = "";
+          resMp.push(false);
+        }
       } else if (enableMatch && char === "{") {
         continue;
       } else if (enableMatch && char === "}") {
@@ -140,18 +142,17 @@ export const LocaleProvider = ({ children }: { children: ReactNode }) => {
       else tres += char;
     }
 
-    res.push(tres);
-    resMp.push(false);
+    if (tres !== "") {
+      res.push(tres);
+      resMp.push(false);
+    }
 
     if (flag) return res.join("");
-
     let resStr = "";
     for (let i = 0; i < res.length; i++) {
-      if (i !== 0) resStr = " " + resStr;
-      if (resMp[i]) resStr += langPkg[locale][res[i]];
+      if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
       else resStr += res[i];
     }
-
     return resStr;
   };
 

package/src/aldehyde/locale/translate.ts

@@ -41,9 +41,11 @@ const translate = (str) => {
   for (const char of str) {
     if (char === "$") {
       enableMatch = true;
-      res.push(tres);
-      tres = "";
-      resMp.push(false);
+      if (tres !== "") {
+        res.push(tres);
+        tres = "";
+        resMp.push(false);
+      }
     } else if (enableMatch && char === "{") {
       continue;
     } else if (enableMatch && char === "}") {
@@ -60,15 +62,16 @@ const translate = (str) => {
     else tres += char;
   }
 
-  res.push(tres);
-  resMp.push(false);
+  if (tres !== "") {
+    res.push(tres);
+    resMp.push(false);
+  }
 
   if (flag) return res.join("");
 
   let resStr = "";
   for (let i = 0; i < res.length; i++) {
-    if (i !== 0) resStr = " " + resStr;
-    if (resMp[i]) resStr += langPkg[locale][res[i]];
+    if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
     else resStr += res[i];
   }