- {links && (
-
- );
-};
-
-export default GlobalFooter;
diff --git a/src/components/GlobalHeader/AvatarDropdown.tsx b/src/components/GlobalHeader/AvatarDropdown.tsx
deleted file mode 100644
index 75e51b5..0000000
--- a/src/components/GlobalHeader/AvatarDropdown.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { LogoutOutlined, UserOutlined } from "@ant-design/icons";
-import { Trans } from "@lingui/macro";
-import { Avatar, Menu } from "antd";
-import React from "react";
-import { useNavigate } from "react-router-dom";
-import { useRecoilState } from "recoil";
-
-import { accessAtom } from "@/atoms/access";
-import { loginStateAtom } from "@/atoms/login";
-
-import HeaderDropdown from "../HeaderDropdown";
-import styles from "./index.less";
-
-const newConfig = [
- {
- name: "测试1",
- path: "/a-new-address", // 解析为/ab/a
- component: "test1", // page 建议使用小写，内部会转换成大写,对应到组件上。权限配置中与此保持一致
- access: "test1Open",
- },
- {
- name: "测试4",
- path: "/counter", // 解析为/c
- component: "test4",
- access: "test4Open",
- },
- {
- name: "微前端",
- path: "/micro",
- icon: "PaperClipOutlined",
- children: [
- {
- name: "vue2测试",
- path: "vue2/*",
- access: "microOpen",
- component: "http://localhost:8001", // 微前端配置
- },
- ],
- },
-];
-
-const AvatarDropdown: React.FC = () => {
- // const { menu } = props;
- const [login, setLogin] = useRecoilState(loginStateAtom);
-
- const [, setAccess] = useRecoilState(accessAtom);
- const navigate = useNavigate();
- const handleChangeRole = () => {
- setAccess({
- microOpen: true,
- test1Open: true,
- test4Open: true,
- logionPermit: true,
- // 'example': role === 'admin',
- // 'example2': some => some.prop === 'test'
- });
- setLogin({
- ...login,
- route:newConfig
- })
- navigate(newConfig[0].path, { replace: true });
- };
-
- const logout = () => {
- setLogin({
- ...login,
- isLogin: false,
- });
- };
-
- const menuHeaderDropdown = (
-
- );
-
- return (
-
- {links.map((link) => (
-
- {link.title}
-
- ))}
-
- )}
- {copyRight && {copyRight}
}
-
+
+ );
+};
+export default GlobalHeaderRight;
diff --git a/src/components/SelectLang/index.less b/src/components/SelectLang/index.less
deleted file mode 100644
index c0da9b4..0000000
--- a/src/components/SelectLang/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.menu {
- :global(.anticon) {
- margin-right: 8px;
- }
- :global(.ant-dropdown-menu-item) {
- min-width: 160px;
- }
-}
-
-.dropDown {
- line-height: @layout-header-height;
- vertical-align: top;
- cursor: pointer;
- > span {
- font-size: 16px !important;
- transform: none !important;
- svg {
- position: relative;
- top: -1px;
- }
- }
-}
diff --git a/src/components/SelectLang/index.tsx b/src/components/SelectLang/index.tsx
index df98a01..fb3fffc 100644
--- a/src/components/SelectLang/index.tsx
+++ b/src/components/SelectLang/index.tsx
@@ -1,4 +1,4 @@
-import { Menu } from "antd";
+
import React from "react";
import { useRecoilState } from "recoil";
@@ -20,6 +20,7 @@ import HeaderDropdown from "../HeaderDropdown";
// }
const SelectLang: React.FC
+
+ Antd Front
} + title="Antd Front" menuFooterRender={(props) => { if (props?.collapsed) return undefined; return (- Power by Ant Design + 技术支持-XXX技术社区
); }} @@ -125,7 +150,26 @@ const BasicLayout: React.FC = () => { actionsRender={(props) => { if (props.isMobile) return []; return [ -
+
,
+
-
+ = (props) => {
navigate("/", { replace: true });
};
return (
-
+
);
};
diff --git a/src/pages/user/login/index.less b/src/pages/user/login/index.less
deleted file mode 100644
index 4e708a6..0000000
--- a/src/pages/user/login/index.less
+++ /dev/null
@@ -1,51 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.main {
- width: 328px;
- margin: 0 auto;
- @media screen and (max-width: @screen-sm) {
- width: 95%;
- max-width: 328px;
- }
-
- :global {
- .@{ant-prefix}-tabs-nav-list {
- margin: auto;
- font-size: 16px;
- }
- }
-
- .icon {
- margin-left: 16px;
- color: rgba(0, 0, 0, 0.2);
- font-size: 24px;
- vertical-align: middle;
- cursor: pointer;
- transition: color 0.3s;
- float: left;
-
- &:hover {
- color: @primary-color;
- }
- }
-
- .p {
- float: left;
- }
-
- .other {
- margin-top: 24px;
- line-height: 22px;
- text-align: left;
- display: block;
-
- .register {
- float: right;
- }
- }
-
- .prefixIcon {
- color: @primary-color;
- font-size: @font-size-base;
- }
-}
diff --git a/src/pages/user/login/index.tsx b/src/pages/user/login/index.tsx
index 7be3e43..40ab8b4 100644
--- a/src/pages/user/login/index.tsx
+++ b/src/pages/user/login/index.tsx
@@ -1,9 +1,10 @@
import {
- AlipayCircleOutlined,
- LockTwoTone,
+ AlipayOutlined,
+ WeiboOutlined,
+ LockOutlined,
MailTwoTone,
MobileTwoTone,
- TaobaoCircleOutlined,
+ TaobaoOutlined,
UserOutlined,
} from "@ant-design/icons";
import ProForm, {
@@ -16,12 +17,19 @@ import { t, Trans } from "@lingui/macro";
import { useSafeState } from "ahooks";
import { Alert, message, Space, Tabs } from "antd";
import React from "react";
+import type { CSSProperties } from "react";
import { Link, useNavigate } from "react-router-dom";
import { useRecoilState } from "recoil";
import { loginStateAtom } from "@/atoms/login";
-import styles from "./index.less";
+const iconStyles: CSSProperties = {
+ color: "rgba(0, 0, 0, 0.2)",
+ fontSize: "18px",
+ verticalAlign: "middle",
+ cursor: "pointer",
+};
+
export const LoginMessage: React.FC<{ content: string }> = ({ content }) => (
-
-
-
+ }
+ // activityConfig={{
+ // style: {
+ // boxShadow: "0px 0px 8px rgba(0, 0, 0, 0.2)",
+ // color: "#fff",
+ // borderRadius: 8,
+ // backgroundColor: "#1677FF",
+ // },
+ // title: "活动标题，可配置图片",
+ // subTitle: "活动介绍说明文字",
+ // action: (
+ //
+ // ),
+ // }}
+ >
-
- 
- Antd Front
-
-
-
- Antd Front 遵循 Ant Design 设计规范
+
+
+
+ 其他登录方式
+
+
+
+
-
+
+
+
+
+
+
+
= (props) => {
name="account"
fieldProps={{
size: "large",
- prefix: = (props) => {
name="password"
fieldProps={{
size: "large",
- prefix: = (props) => {
= (props) => {
= (props) => {
-
-
+
APP/账户注册
diff --git a/src/pages/user/register/index.less b/src/pages/user/register/index.less
deleted file mode 100644
index 675c712..0000000
--- a/src/pages/user/register/index.less
+++ /dev/null
@@ -1,73 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.main {
- width: 328px;
- margin: 0 auto;
- @media screen and (max-width: @screen-sm) {
- width: 95%;
- max-width: 328px;
- }
-
- :global {
- .@{ant-prefix}-tabs-nav-list {
- margin: auto;
- font-size: 16px;
- }
- }
-
- h3 {
- font-size: 16px;
- margin-bottom: 20px;
- }
-
- .getCaptcha {
- display: block;
- width: 100%;
- }
-
- .submit {
- width: 50%;
- }
-
- .login {
- float: right;
- line-height: @btn-height-lg;
- }
-}
-
-.other {
- margin-top: 24px;
- line-height: 22px;
- text-align: left;
- display: block;
-
- .tologin {
- float: right;
- }
-}
-
-.success,
-.warning,
-.error {
- transition: color 0.3s;
-}
-
-.success {
- color: @success-color;
-}
-
-.warning {
- color: @warning-color;
-}
-
-.error {
- color: @error-color;
-}
-
-.progress-pass > .progress {
- :global {
- .ant-progress-bg {
- background-color: @warning-color;
- }
- }
-}
diff --git a/src/pages/user/register/index.tsx b/src/pages/user/register/index.tsx
index 568cdb9..a3ecd11 100644
--- a/src/pages/user/register/index.tsx
+++ b/src/pages/user/register/index.tsx
@@ -1,6 +1,6 @@
import {
LockTwoTone,
- MailTwoTone,
+ LockOutlined,
MobileTwoTone,
UserOutlined,
} from "@ant-design/icons";
@@ -20,12 +20,23 @@ import { Link } from "react-router-dom";
import { userRegister } from "@/services/register";
import { LoginMessage } from "../login/index";
-import styles from "./index.less";
const passwordStatusMap = {
- ok: = (props) => {
const value = formRef.current?.getFieldValue("password");
const passwordStatus = getPasswordStatus();
return value && value.length ? (
-
-
强度：强
,
- pass: 强度：中
,
- poor: 强度：太短
,
+ ok: 强度：强
,
+ pass: 强度：中
,
+ poor: 强度：太短
,
};
type PasswordProgressType = "success" | "normal" | "exception";
@@ -120,10 +131,9 @@ const Register: React.FC
+