aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/layout2/type/layout.type.ts

@@ -1,10 +1,10 @@
-import { HTMLAttributeAnchorTarget } from "react";
-
-export type MenuType = {
-  id: string;
-  label: string; // 菜单标题
-  disabled: boolean; // 是否禁用
-  url: string | null; // 菜单链接
-  linkTarget?: HTMLAttributeAnchorTarget;
-  children?: MenuType[]; // 子菜单
-};
+import { HTMLAttributeAnchorTarget } from "react";
+
+export type MenuType = {
+  id: string;
+  label: string; // 菜单标题
+  disabled: boolean; // 是否禁用
+  url: string | null; // 菜单链接
+  linkTarget?: HTMLAttributeAnchorTarget;
+  children?: MenuType[]; // 子菜单
+};

package/src/aldehyde/layout2/util/menu.util.tsx

@@ -1,122 +1,122 @@
-import { ReactNode } from "react";
-import { MenuProps } from "antd";
-import { MenuType } from "../type/layout.type";
-
-type AntdMenuItemType = Required<MenuProps>["items"][number];
-
-/**
- * @param menu 自定义的 menu 树
- * @returns 最左子节点的路由信息: 链接跳转方式和路由路径
- * @desc 获取最左子节点的路由信息
- */
-export const getLeftMostRouteInfo = (
-  menu: MenuType
-): {
-  target: MenuType["linkTarget"];
-  path: string | null;
-} => {
-  if (Array.isArray(menu.children) && menu.children.length) {
-    for (const menuChild of menu.children) {
-      if (!menuChild.disabled)  return getLeftMostRouteInfo(menuChild);
-    }
-  }
-
-  if (!menu.disabled && (!Array.isArray(menu.children) || (Array.isArray(menu.children) && menu.children.length === 0))) 
-    return {
-      target: menu.linkTarget,
-      path: menu.url,
-    };
-
-  return {
-    target: '_self',
-    path: null
-  }
-};
-
-/**
- * @param menuList 自定义的 menuList
- * @returns antd 可以使用的 menuList
- * @desc 将自定义的 menuList 处理成 antd 可以使用的 menuList
- */
-export const handlePropsMenuToAntdMenu = (
-  menuList: MenuType[],
-  customLabelFn: (
-    menuItem: MenuType,
-    floor: number
-  ) => string | number | ReactNode,
-  className?: string,
-  floor: number = 0
-): AntdMenuItemType[] => {
-  try {
-    const retList: AntdMenuItemType[] = [];
-
-    for (const item of menuList) {
-      const { id, label, disabled, url, linkTarget, children } = item;
-
-      const menu: AntdMenuItemType = {
-        label: customLabelFn(item, floor),
-        key: id,
-        disabled,
-        className,
-        children:
-          Array.isArray(children) && children.length
-            ? handlePropsMenuToAntdMenu(
-                children,
-                customLabelFn,
-                className,
-                floor + 1
-              )
-            : null,
-      };
-      retList.push(menu);
-    }
-
-    return retList;
-  } catch (err) {
-    console.log("handlePropsMenuToAntdMenu", err, `menu: ${menuList}`);
-  }
-};
-
-/**
- * @param menuList 自定义的 menuList
- * @param targetMenuId 目标 menu id
- * @returns 从根节点到目标节点路径
- * @desc 寻找从 menu 根节点到目标节点的路径
- */
-export const getTargetMenuItemIdRouteList = (
-  menuList: MenuType[],
-  targetMenuId: string
-): string[] => {
-  const routeList: string[] = [];
-
-  const root: MenuType = {
-    id: "",
-    label: "",
-    disabled: false,
-    url: "",
-    children: menuList,
-  };
-
-  const dfs = (menuItem: MenuType): boolean => {
-    routeList.push(menuItem.id);
-
-    if (menuItem.id === targetMenuId) return true;
-
-    let flag = false;
-
-    for (const menuItemChild of menuItem.children) {
-      if (!flag) flag = dfs(menuItemChild);
-      else break;
-    }
-
-    if (flag) return true;
-
-    routeList.pop();
-    return false;
-  };
-
-  dfs(root);
-
-  routeList.shift();
-  return routeList;
-};
+import { ReactNode } from "react";
+import { MenuProps } from "antd";
+import { MenuType } from "../type/layout.type";
+
+type AntdMenuItemType = Required<MenuProps>["items"][number];
+
+/**
+ * @param menu 自定义的 menu 树
+ * @returns 最左子节点的路由信息: 链接跳转方式和路由路径
+ * @desc 获取最左子节点的路由信息
+ */
+export const getLeftMostRouteInfo = (
+  menu: MenuType
+): {
+  target: MenuType["linkTarget"];
+  path: string | null;
+} => {
+  if (Array.isArray(menu.children) && menu.children.length) {
+    for (const menuChild of menu.children) {
+      if (!menuChild.disabled)  return getLeftMostRouteInfo(menuChild);
+    }
+  }
+
+  if (!menu.disabled && (!Array.isArray(menu.children) || (Array.isArray(menu.children) && menu.children.length === 0))) 
+    return {
+      target: menu.linkTarget,
+      path: menu.url,
+    };
+
+  return {
+    target: '_self',
+    path: null
+  }
+};
+
+/**
+ * @param menuList 自定义的 menuList
+ * @returns antd 可以使用的 menuList
+ * @desc 将自定义的 menuList 处理成 antd 可以使用的 menuList
+ */
+export const handlePropsMenuToAntdMenu = (
+  menuList: MenuType[],
+  customLabelFn: (
+    menuItem: MenuType,
+    floor: number
+  ) => string | number | ReactNode,
+  className?: string,
+  floor: number = 0
+): AntdMenuItemType[] => {
+  try {
+    const retList: AntdMenuItemType[] = [];
+
+    for (const item of menuList) {
+      const { id, label, disabled, url, linkTarget, children } = item;
+
+      const menu: AntdMenuItemType = {
+        label: customLabelFn(item, floor),
+        key: id,
+        disabled,
+        className,
+        children:
+          Array.isArray(children) && children.length
+            ? handlePropsMenuToAntdMenu(
+                children,
+                customLabelFn,
+                className,
+                floor + 1
+              )
+            : null,
+      };
+      retList.push(menu);
+    }
+
+    return retList;
+  } catch (err) {
+    console.log("handlePropsMenuToAntdMenu", err, `menu: ${menuList}`);
+  }
+};
+
+/**
+ * @param menuList 自定义的 menuList
+ * @param targetMenuId 目标 menu id
+ * @returns 从根节点到目标节点路径
+ * @desc 寻找从 menu 根节点到目标节点的路径
+ */
+export const getTargetMenuItemIdRouteList = (
+  menuList: MenuType[],
+  targetMenuId: string
+): string[] => {
+  const routeList: string[] = [];
+
+  const root: MenuType = {
+    id: "",
+    label: "",
+    disabled: false,
+    url: "",
+    children: menuList,
+  };
+
+  const dfs = (menuItem: MenuType): boolean => {
+    routeList.push(menuItem.id);
+
+    if (menuItem.id === targetMenuId) return true;
+
+    let flag = false;
+
+    for (const menuItemChild of menuItem.children) {
+      if (!flag) flag = dfs(menuItemChild);
+      else break;
+    }
+
+    if (flag) return true;
+
+    routeList.pop();
+    return false;
+  };
+
+  dfs(root);
+
+  routeList.shift();
+  return routeList;
+};

package/src/aldehyde/locale/LocaleButton.tsx

@@ -1,47 +1,47 @@
-import { GlobalOutlined } from "@ant-design/icons";
-import { Button, ButtonProps, Dropdown, MenuProps, theme } from "antd";
-import { useLocale } from "./useLocale";
-import { LocaleType } from "./langMp";
-import React from "react";
-
-const { useToken } = theme;
-
-const LocaleButton = (props: ButtonProps) => {
-  const { token } = useToken();
-  const { getLocale, setLocale, availableLang } = useLocale();
-
-  const onClick: MenuProps["onClick"] = ({ key }) => {
-    setLocale(key as LocaleType);
-  };
-
-  console.log(availableLang);
-  const items: MenuProps["items"] = availableLang.map((lang) => ({
-    label: (
-      <span style={getLocale() === lang ? { color: token.colorPrimary } : {}}>
-        { lang }
-      </span>
-    ),
-    key: lang,
-  }))
-
-  items.unshift({
-    label: (
-      <span style={getLocale() === "zh" ? { color: token.colorPrimary } : {}}>
-        中文
-      </span>
-    ),
-    key: "zh",
-  });
-  return (
-    <Dropdown overlayClassName="localeButton" menu={{ items, onClick }}>
-      <Button
-        type="primary"
-        shape="circle"
-        icon={<GlobalOutlined />}
-        {...props}
-      />
-    </Dropdown>
-  );
-};
-
-export default LocaleButton;
+import { GlobalOutlined } from "@ant-design/icons";
+import { Button, ButtonProps, Dropdown, MenuProps, theme } from "antd";
+import { useLocale } from "./useLocale";
+import { LocaleType } from "./langMp";
+import React from "react";
+
+const { useToken } = theme;
+
+const LocaleButton = (props: ButtonProps) => {
+  const { token } = useToken();
+  const { getLocale, setLocale, availableLang } = useLocale();
+
+  const onClick: MenuProps["onClick"] = ({ key }) => {
+    setLocale(key as LocaleType);
+  };
+
+  console.log(availableLang);
+  const items: MenuProps["items"] = availableLang.map((lang) => ({
+    label: (
+      <span style={getLocale() === lang ? { color: token.colorPrimary } : {}}>
+        { lang }
+      </span>
+    ),
+    key: lang,
+  }))
+
+  items.unshift({
+    label: (
+      <span style={getLocale() === "zh" ? { color: token.colorPrimary } : {}}>
+        中文
+      </span>
+    ),
+    key: "zh",
+  });
+  return (
+    <Dropdown overlayClassName="localeButton" menu={{ items, onClick }}>
+      <Button
+        type="primary"
+        shape="circle"
+        icon={<GlobalOutlined />}
+        {...props}
+      />
+    </Dropdown>
+  );
+};
+
+export default LocaleButton;