aldehyde 0.2.196 → 0.2.198

package/src/aldehyde/layout/sidebar/index.css

@@ -1,57 +1,57 @@
-.logo-dark{
-	line-height: 38px;
-	height: 42px;
-	margin: 16px;
-	background: rgba(255, 255, 255, 0.3);
-}
-.logo-blue{
-	line-height: 50px;
-	height: 58px;
-	margin: 0 0px 0 0px;
-	background: rgba(255, 255, 255, 0.3);
-}
-.logo-blue h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	vertical-align: middle;
-	width:100%;
-	margin:0;
-	background: var(--logo-blue-background);
-}
-
-.logo-dark h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	/*vertical-align: middle;*/
-	width:100%;
-	margin:0;
-}
-
-.logonly h1{
-	font-size: 20px;
-	color:#fff;
-	display: inline-block;
-	text-align: center;
-	/*vertical-align: middle;*/
-	width:100%;
-	margin:0;
-	background: var(--logo-blue-background);
-}
-
-.logonly{
-	border-radius: 4px;
-	line-height: 58px;
-	height: 48px;
-	margin: 0px;
-	/*background: rgba(0, 0, 0, 0.8);*/
-	background: rgba(255, 255, 255, 0.8);
-}
-
-.ant-menu-inline-collapsed{
-	width: 50px!important;
-}
-
+.logo-dark{
+	line-height: 38px;
+	height: 42px;
+	margin: 16px;
+	background: rgba(255, 255, 255, 0.3);
+}
+.logo-blue{
+	line-height: 50px;
+	height: 58px;
+	margin: 0 0px 0 0px;
+	background: rgba(255, 255, 255, 0.3);
+}
+.logo-blue h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	vertical-align: middle;
+	width:100%;
+	margin:0;
+	background: var(--logo-blue-background);
+}
+
+.logo-dark h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	/*vertical-align: middle;*/
+	width:100%;
+	margin:0;
+}
+
+.logonly h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	/*vertical-align: middle;*/
+	width:100%;
+	margin:0;
+	background: var(--logo-blue-background);
+}
+
+.logonly{
+	border-radius: 4px;
+	line-height: 58px;
+	height: 48px;
+	margin: 0px;
+	/*background: rgba(0, 0, 0, 0.8);*/
+	background: rgba(255, 255, 255, 0.8);
+}
+
+.ant-menu-inline-collapsed{
+	width: 50px!important;
+}
+

package/src/aldehyde/layout/sidebar/index.tsx

@@ -1,85 +1,85 @@
-import React, { CSSProperties } from "react";
-import "./index.css";
-import Units from "../../units";
-import Menu2layers from "../menu/menu-2layers";
-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 {
-  header?:any;
-  collapsedHeader?:any;
-  title?: string;
-  logo?: any;
-}
-
-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,header,collapsedHeader } = props;
-  return (
-    <div>
-      <Scrollbars
-        style={{ height: "calc(100vh)" }}
-        autoHide
-        autoHideTimeout={1000}
-      >
-        <div className={collapsed ? "logonly" : "logo-blue"} style={syyy}>
-          <a href="#/home">
-            {collapsed ?( collapsedHeader ? <div style={{
-                      overflow: "hidden",
-                      height: "56px",
-                      padding:"2px"
-                    }}>{collapsedHeader}</div>:
-                props.logo ?
-                    <Image src={props.logo}/>
-                 : (
-                    <h1
-                        style={{
-                          overflow: "hidden",
-                          height: "56px",
-                          paddingLeft: "-20px",
-                        }}
-                    >
-                      M
-                    </h1>
-                )
-            ) : (header ? <div style={{
-                      overflow: "hidden",
-                      height: "56px",
-                      padding: "2px"
-                    }}>{header}</div> :
-                    <>
-                      <h1
-                          style={{
-                            overflow: "hidden",
-                            height: "56px",
-                            paddingLeft: "-20px",
-                          }}
-                      >
-                        <>
-                          {props.logo ? (
-                              <Image width={"30px"} src={props.logo}/>
-                          ) : (
-                              <></>
-                          )}
-                          {translate(
-                              props.title ? props.title : Units.programName_NavLeft()
-                          )}
-                        </>
-                      </h1>
-                    </>
-            )}
-          </a>
-        </div>
-        <Menu2layers mode="inline" theme="light" {...props}></Menu2layers>
-      </Scrollbars>
-    </div>
-  );
-};
-
-export default SideBar;
+import React, { CSSProperties } from "react";
+import "./index.css";
+import Units from "../../units";
+import Menu2layers from "../menu/menu-2layers";
+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 {
+  header?:any;
+  collapsedHeader?:any;
+  title?: string;
+  logo?: any;
+}
+
+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,header,collapsedHeader } = props;
+  return (
+    <div>
+      <Scrollbars
+        style={{ height: "calc(100vh)" }}
+        autoHide
+        autoHideTimeout={1000}
+      >
+        <div className={collapsed ? "logonly" : "logo-blue"} style={syyy}>
+          <a href="#/home">
+            {collapsed ?( collapsedHeader ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding:"2px"
+                    }}>{collapsedHeader}</div>:
+                props.logo ?
+                    <Image src={props.logo}/>
+                 : (
+                    <h1
+                        style={{
+                          overflow: "hidden",
+                          height: "56px",
+                          paddingLeft: "-20px",
+                        }}
+                    >
+                      M
+                    </h1>
+                )
+            ) : (header ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding: "2px"
+                    }}>{header}</div> :
+                    <>
+                      <h1
+                          style={{
+                            overflow: "hidden",
+                            height: "56px",
+                            paddingLeft: "-20px",
+                          }}
+                      >
+                        <>
+                          {props.logo ? (
+                              <Image width={"30px"} src={props.logo}/>
+                          ) : (
+                              <></>
+                          )}
+                          {translate(
+                              props.title ? props.title : Units.programName_NavLeft()
+                          )}
+                        </>
+                      </h1>
+                    </>
+            )}
+          </a>
+        </div>
+        <Menu2layers mode="inline" theme="light" {...props}></Menu2layers>
+      </Scrollbars>
+    </div>
+  );
+};
+
+export default SideBar;

package/src/aldehyde/layout2/LayoutContext.tsx

@@ -1,95 +1,95 @@
-import React, { createContext, ReactNode, useContext, useState } from "react";
-import Units from "../units";
-import { MenuType } from "./type/layout.type";
-
-export type MenuItemIdToFirstFloorIdxMapType = { [key: string]: number };
-
-/**
- * @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;
-};
-
-type LayoutContextType = {
-  menuItemIdToFirstFloorIdxMap: MenuItemIdToFirstFloorIdxMapType;
-  updateMenuItemIdToFirstFloorIdxMap: (menuList: MenuType[]) => void;
-  documentTitle: string;
-  setDocumentTitle: (title: string) => void;
-};
-
-const LayoutContext = createContext<LayoutContextType>({
-  menuItemIdToFirstFloorIdxMap: {},
-  updateMenuItemIdToFirstFloorIdxMap: (menuList: MenuType[]) => {},
-  documentTitle: "",
-  setDocumentTitle: (title: string) => {},
-});
-
-export const LayoutProvider = ({ children }: { children: ReactNode }) => {
-  const documentTitleSuffix = Units.programName()
-    ? Units.programName()
-    : "HYDROCARBON";
-
-  const [documentTitle, setDocumentTitle] = useState<string>();
-  const [
-    menuItemIdToFirstFloorIdxMap,
-    setMenuItemIdToFirstFloorIdxMap,
-  ] = useState<MenuItemIdToFirstFloorIdxMapType>({});
-
-  const setTitle = (title: string) => {
-    setDocumentTitle(`${title} - ${documentTitleSuffix}`);
-  };
-
-  const updateMenuItemIdToFirstFloorIdxMap = (menuList: MenuType[]) => {
-    setMenuItemIdToFirstFloorIdxMap(
-      getMenuItemIdToFirstFloorIdxMap(menuList, true)
-    );
-  };
-
-  return (
-    <LayoutContext.Provider
-      value={{
-        documentTitle,
-        setDocumentTitle: setTitle,
-        menuItemIdToFirstFloorIdxMap,
-        updateMenuItemIdToFirstFloorIdxMap,
-      }}
-    >
-      {children}
-    </LayoutContext.Provider>
-  );
-};
-
-export const useLayoutContext = () => {
-  const context = useContext(LayoutContext);
-
-  return {
-    documentTitle: context.documentTitle,
-    setDocumentTitle: context.setDocumentTitle,
-    menuItemIdToFirstFloorIdxMap: context.menuItemIdToFirstFloorIdxMap,
-    updateMenuItemIdToFirstFloorIdxMap:
-      context.updateMenuItemIdToFirstFloorIdxMap,
-  };
-};
+import React, { createContext, ReactNode, useContext, useState } from "react";
+import Units from "../units";
+import { MenuType } from "./type/layout.type";
+
+export type MenuItemIdToFirstFloorIdxMapType = { [key: string]: number };
+
+/**
+ * @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;
+};
+
+type LayoutContextType = {
+  menuItemIdToFirstFloorIdxMap: MenuItemIdToFirstFloorIdxMapType;
+  updateMenuItemIdToFirstFloorIdxMap: (menuList: MenuType[]) => void;
+  documentTitle: string;
+  setDocumentTitle: (title: string) => void;
+};
+
+const LayoutContext = createContext<LayoutContextType>({
+  menuItemIdToFirstFloorIdxMap: {},
+  updateMenuItemIdToFirstFloorIdxMap: (menuList: MenuType[]) => {},
+  documentTitle: "",
+  setDocumentTitle: (title: string) => {},
+});
+
+export const LayoutProvider = ({ children }: { children: ReactNode }) => {
+  const documentTitleSuffix = Units.programName()
+    ? Units.programName()
+    : "HYDROCARBON";
+
+  const [documentTitle, setDocumentTitle] = useState<string>();
+  const [
+    menuItemIdToFirstFloorIdxMap,
+    setMenuItemIdToFirstFloorIdxMap,
+  ] = useState<MenuItemIdToFirstFloorIdxMapType>({});
+
+  const setTitle = (title: string) => {
+    setDocumentTitle(`${title} - ${documentTitleSuffix}`);
+  };
+
+  const updateMenuItemIdToFirstFloorIdxMap = (menuList: MenuType[]) => {
+    setMenuItemIdToFirstFloorIdxMap(
+      getMenuItemIdToFirstFloorIdxMap(menuList, true)
+    );
+  };
+
+  return (
+    <LayoutContext.Provider
+      value={{
+        documentTitle,
+        setDocumentTitle: setTitle,
+        menuItemIdToFirstFloorIdxMap,
+        updateMenuItemIdToFirstFloorIdxMap,
+      }}
+    >
+      {children}
+    </LayoutContext.Provider>
+  );
+};
+
+export const useLayoutContext = () => {
+  const context = useContext(LayoutContext);
+
+  return {
+    documentTitle: context.documentTitle,
+    setDocumentTitle: context.setDocumentTitle,
+    menuItemIdToFirstFloorIdxMap: context.menuItemIdToFirstFloorIdxMap,
+    updateMenuItemIdToFirstFloorIdxMap:
+      context.updateMenuItemIdToFirstFloorIdxMap,
+  };
+};