aldehyde 0.2.196 → 0.2.198

package/src/aldehyde/layout2/components/userButton.tsx

@@ -1,171 +1,171 @@
-import React, { ReactNode, useEffect, useState } from "react";
-import {
-  CaretDownOutlined,
-  ClearOutlined,
-  LoginOutlined,
-  LogoutOutlined,
-  SettingOutlined,
-  UnlockOutlined,
-  UserOutlined,
-} from "@ant-design/icons";
-import { Button, ButtonProps, Dropdown, GetProp, MenuProps } from "antd";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import { UserInfo } from "../../tmpl/interface";
-import UserInfoBar from "../../layout/menu/userinfo-bar";
-import { useLocale } from "../../locale/useLocale";
-import { NavLink, useNavigate } from "react-router-dom";
-import ResetPassword from "../../layout/menu/reset-password";
-import HCDataSource from "../../tmpl/hc-data-source";
-
-type DropDownMenuType = {
-  label: string | number | ReactNode;
-  key: string;
-  icon?: ReactNode;
-  show?: () => boolean;
-};
-
-const UserButton: React.FC<ButtonProps> = (props) => {
-  // translate
-  const { translate } = useLocale();
-
-  // navigation
-  const navigate = useNavigate();
-
-  // 用户配置信息
-  const [userConfig, setUserConfig] = useState<UserInfo>({
-    id: undefined,
-    name: undefined,
-  });
-  const initUserConfig = async () => {
-    const userInfo: UserInfo = await HcserviceV3.getUser();
-    setUserConfig(userInfo);
-  };
-  useEffect(() => {}, [userConfig]);
-
-  // 上下文配置信息
-  const [globalContext, setGlobalContext] = useState<any[]>();
-  const initContext = async () => {
-    let context = await HcserviceV3.getContextSourceValue();
-    setGlobalContext(context);
-  };
-  useEffect(() => {
-    initContext();
-  }, []);
-
-  // 用户是否登录
-  const [isLogin, setIsLogin] = useState<boolean>(false);
-  useEffect(() => {
-    if (userConfig.name !== undefined && userConfig.name !== null)
-      setIsLogin(true);
-    else setIsLogin(false);
-  }, [userConfig]);
-  useEffect(() => {
-    initUserConfig();
-  }, []);
-
-  // logout
-  const logout = async () => {
-    await HcserviceV3.logout2();
-    navigate("/login2");
-  };
-
-  // dropdown menu
-  const onClick: MenuProps["onClick"] = ({ key }) => {};
-  const dropdownMenuList: DropDownMenuType[] = [
-    {
-      label: <NavLink to="/login2">{translate("${登录}")}</NavLink>,
-      key: "login",
-      icon: <LoginOutlined />,
-      show: () => {
-        return !isLogin;
-      },
-    },
-    {
-      label: (
-        <UserInfoBar
-          gtmplSourceId={userConfig.gtmplSourceId}
-          editable={userConfig.changePersonalInfoable}
-          userCode={userConfig.id}
-        />
-      ),
-      key: "userInfo",
-      icon: <UserOutlined />,
-      show: () => {
-        return isLogin && userConfig.viewPersonalInfoable;
-      },
-    },
-    {
-      label: <NavLink to="/context-setter">{translate("${全局配置}")}</NavLink>,
-      key: "globalContext",
-      icon: <SettingOutlined />,
-      show: () => {
-        return (
-          isLogin && Array.isArray(globalContext) && globalContext.length > 0
-        );
-      },
-    },
-    {
-      label: <ResetPassword></ResetPassword>,
-      key: "resetPwd",
-      icon: <UnlockOutlined />,
-      show: () => {
-        return isLogin && userConfig.changePasswordable;
-      },
-    },
-    {
-      label: (
-        <span onClick={() => HCDataSource.reload([])}>
-          {translate("${清空缓存}")}
-        </span>
-      ),
-      key: "cleanCache",
-      icon: <ClearOutlined />,
-      show: () => {
-        return isLogin && userConfig.cleanCachable;
-      },
-    },
-    {
-      label: <span onClick={logout}>{translate("${退出}")}</span>,
-      key: "logout",
-      icon: <LogoutOutlined />,
-      show: () => {
-        return isLogin;
-      },
-    },
-  ];
-  const cleanDropdownMenuList: GetProp<MenuProps, "items"> = dropdownMenuList
-    .filter((item) => {
-      if (!item.show) return true;
-      return item.show();
-    })
-    .map(({ label, key, icon }) => {
-      return {
-        label,
-        key,
-        icon,
-      };
-    });
-
-  return (
-    <Dropdown
-      overlayClassName="localeButton"
-      menu={{ items: cleanDropdownMenuList, onClick }}
-    >
-      <Button
-        type="text"
-        icon={<CaretDownOutlined />}
-        style={{
-          width: "100%",
-          height: "100%",
-          borderRadius: 0,
-          color: "#fff",
-        }}
-        {...props}
-      >
-        {isLogin ? userConfig.name : translate("${请登录}")}
-      </Button>
-    </Dropdown>
-  );
-};
-
-export default UserButton;
+import React, { ReactNode, useEffect, useState } from "react";
+import {
+  CaretDownOutlined,
+  ClearOutlined,
+  LoginOutlined,
+  LogoutOutlined,
+  SettingOutlined,
+  UnlockOutlined,
+  UserOutlined,
+} from "@ant-design/icons";
+import { Button, ButtonProps, Dropdown, GetProp, MenuProps } from "antd";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import { UserInfo } from "../../tmpl/interface";
+import UserInfoBar from "../../layout/menu/userinfo-bar";
+import { useLocale } from "../../locale/useLocale";
+import { NavLink, useNavigate } from "react-router-dom";
+import ResetPassword from "../../layout/menu/reset-password";
+import HCDataSource from "../../tmpl/hc-data-source";
+
+type DropDownMenuType = {
+  label: string | number | ReactNode;
+  key: string;
+  icon?: ReactNode;
+  show?: () => boolean;
+};
+
+const UserButton: React.FC<ButtonProps> = (props) => {
+  // translate
+  const { translate } = useLocale();
+
+  // navigation
+  const navigate = useNavigate();
+
+  // 用户配置信息
+  const [userConfig, setUserConfig] = useState<UserInfo>({
+    id: undefined,
+    name: undefined,
+  });
+  const initUserConfig = async () => {
+    const userInfo: UserInfo = await HcserviceV3.getUser();
+    setUserConfig(userInfo);
+  };
+  useEffect(() => {}, [userConfig]);
+
+  // 上下文配置信息
+  const [globalContext, setGlobalContext] = useState<any[]>();
+  const initContext = async () => {
+    let context = await HcserviceV3.getContextSourceValue();
+    setGlobalContext(context);
+  };
+  useEffect(() => {
+    initContext();
+  }, []);
+
+  // 用户是否登录
+  const [isLogin, setIsLogin] = useState<boolean>(false);
+  useEffect(() => {
+    if (userConfig.name !== undefined && userConfig.name !== null)
+      setIsLogin(true);
+    else setIsLogin(false);
+  }, [userConfig]);
+  useEffect(() => {
+    initUserConfig();
+  }, []);
+
+  // logout
+  const logout = async () => {
+    await HcserviceV3.logout2();
+    navigate("/login2");
+  };
+
+  // dropdown menu
+  const onClick: MenuProps["onClick"] = ({ key }) => {};
+  const dropdownMenuList: DropDownMenuType[] = [
+    {
+      label: <NavLink to="/login2">{translate("${登录}")}</NavLink>,
+      key: "login",
+      icon: <LoginOutlined />,
+      show: () => {
+        return !isLogin;
+      },
+    },
+    {
+      label: (
+        <UserInfoBar
+          gtmplSourceId={userConfig.gtmplSourceId}
+          editable={userConfig.changePersonalInfoable}
+          userCode={userConfig.id}
+        />
+      ),
+      key: "userInfo",
+      icon: <UserOutlined />,
+      show: () => {
+        return isLogin && userConfig.viewPersonalInfoable;
+      },
+    },
+    {
+      label: <NavLink to="/context-setter">{translate("${全局配置}")}</NavLink>,
+      key: "globalContext",
+      icon: <SettingOutlined />,
+      show: () => {
+        return (
+          isLogin && Array.isArray(globalContext) && globalContext.length > 0
+        );
+      },
+    },
+    {
+      label: <ResetPassword></ResetPassword>,
+      key: "resetPwd",
+      icon: <UnlockOutlined />,
+      show: () => {
+        return isLogin && userConfig.changePasswordable;
+      },
+    },
+    {
+      label: (
+        <span onClick={() => HCDataSource.reload([])}>
+          {translate("${清空缓存}")}
+        </span>
+      ),
+      key: "cleanCache",
+      icon: <ClearOutlined />,
+      show: () => {
+        return isLogin && userConfig.cleanCachable;
+      },
+    },
+    {
+      label: <span onClick={logout}>{translate("${退出}")}</span>,
+      key: "logout",
+      icon: <LogoutOutlined />,
+      show: () => {
+        return isLogin;
+      },
+    },
+  ];
+  const cleanDropdownMenuList: GetProp<MenuProps, "items"> = dropdownMenuList
+    .filter((item) => {
+      if (!item.show) return true;
+      return item.show();
+    })
+    .map(({ label, key, icon }) => {
+      return {
+        label,
+        key,
+        icon,
+      };
+    });
+
+  return (
+    <Dropdown
+      overlayClassName="localeButton"
+      menu={{ items: cleanDropdownMenuList, onClick }}
+    >
+      <Button
+        type="text"
+        icon={<CaretDownOutlined />}
+        style={{
+          width: "100%",
+          height: "100%",
+          borderRadius: 0,
+          color: "#fff",
+        }}
+        {...props}
+      >
+        {isLogin ? userConfig.name : translate("${请登录}")}
+      </Button>
+    </Dropdown>
+  );
+};
+
+export default UserButton;

package/src/aldehyde/layout2/css/header.css

@@ -1,38 +1,38 @@
-/* .header-menu > li,
-.header-menu > li > div {
-  color: #ffffff !important;
-}
-
-.ant-menu-item-active::after,
-.ant-menu-item-selected::after {
-  border-color: #ffffff !important;
-} */
-
-.ant-menu-submenu > .ant-menu-submenu-selected {
-  /* background: #fff !important; */
-  /* color: #53b572; */
-  /* width: calc(100% - 8px); */
-}
-
-.ant-menu-submenu-selected > .ant-menu-submenu-title {
-  /* color: #fff !important; */
-}
-
-/* .ant-menu-item-group-list > .ant-menu-item-selected,
-.ant-menu-sub > .ant-menu-item-selected {
-  color: var(--ant-color-primary) !important;
-} */
-
-.layout2-header-menu-item::after {
-  width: 0;
-}
-
-.layout2-header-menu > li:nth-last-child(1)::after {
-  width: 0;
-}
-
-.ant-menu-sub:has(.layout2-header-menu-item)
-  > .ant-menu-submenu-selected
-  > .ant-menu-submenu-title {
-  background-color: var(--color-3) !important;
-}
+/* .header-menu > li,
+.header-menu > li > div {
+  color: #ffffff !important;
+}
+
+.ant-menu-item-active::after,
+.ant-menu-item-selected::after {
+  border-color: #ffffff !important;
+} */
+
+.ant-menu-submenu > .ant-menu-submenu-selected {
+  /* background: #fff !important; */
+  /* color: #53b572; */
+  /* width: calc(100% - 8px); */
+}
+
+.ant-menu-submenu-selected > .ant-menu-submenu-title {
+  /* color: #fff !important; */
+}
+
+/* .ant-menu-item-group-list > .ant-menu-item-selected,
+.ant-menu-sub > .ant-menu-item-selected {
+  color: var(--ant-color-primary) !important;
+} */
+
+.layout2-header-menu-item::after {
+  width: 0;
+}
+
+.layout2-header-menu > li:nth-last-child(1)::after {
+  width: 0;
+}
+
+.ant-menu-sub:has(.layout2-header-menu-item)
+  > .ant-menu-submenu-selected
+  > .ant-menu-submenu-title {
+  background-color: var(--color-3) !important;
+}