diff --git a/react-ui/config/config.ts b/react-ui/config/config.ts index 759d7c56..2e9ebf64 100644 --- a/react-ui/config/config.ts +++ b/react-ui/config/config.ts @@ -78,7 +78,6 @@ export default defineConfig({ */ title: '智能材料科研平台', layout: { - locale: false, ...defaultSettings, }, // keepalive: [/./], diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts index b2794f7b..c4c59d2f 100644 --- a/react-ui/config/defaultSettings.ts +++ b/react-ui/config/defaultSettings.ts @@ -7,6 +7,7 @@ const Settings: ProLayoutProps & { pwa?: boolean; logo?: string; } = { + locale: 'zh-CN', navTheme: 'light', // 拂晓蓝 colorPrimary: '#1664ff', @@ -18,7 +19,6 @@ const Settings: ProLayoutProps & { colorWeak: false, title: '智能材料科研平台', pwa: true, - logo: '/assets/images/left-top-logo.png', token: { // 参见ts声明,demo 见文档,通过token 修改样式 //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F diff --git a/react-ui/public/assets/images/delete-icon.png b/react-ui/public/assets/images/delete-icon.png deleted file mode 100644 index 310f8bb8..00000000 Binary files a/react-ui/public/assets/images/delete-icon.png and /dev/null differ diff --git a/react-ui/public/assets/images/fail-icon.png b/react-ui/public/assets/images/experiment-status/fail-icon.png similarity index 100% rename from react-ui/public/assets/images/fail-icon.png rename to react-ui/public/assets/images/experiment-status/fail-icon.png diff --git a/react-ui/public/assets/images/omitted-icon.png b/react-ui/public/assets/images/experiment-status/omitted-icon.png similarity index 100% rename from react-ui/public/assets/images/omitted-icon.png rename to react-ui/public/assets/images/experiment-status/omitted-icon.png diff --git a/react-ui/public/assets/images/pending-icon.png b/react-ui/public/assets/images/experiment-status/pending-icon.png similarity index 100% rename from react-ui/public/assets/images/pending-icon.png rename to react-ui/public/assets/images/experiment-status/pending-icon.png diff --git a/react-ui/public/assets/images/running-icon.png b/react-ui/public/assets/images/experiment-status/running-icon.png similarity index 100% rename from react-ui/public/assets/images/running-icon.png rename to react-ui/public/assets/images/experiment-status/running-icon.png diff --git a/react-ui/public/assets/images/success-icon.png b/react-ui/public/assets/images/experiment-status/success-icon.png similarity index 100% rename from react-ui/public/assets/images/success-icon.png rename to react-ui/public/assets/images/experiment-status/success-icon.png diff --git a/react-ui/public/assets/images/left-top-logo-1.png b/react-ui/public/assets/images/left-top-logo-1.png deleted file mode 100644 index 64bdaf2c..00000000 Binary files a/react-ui/public/assets/images/left-top-logo-1.png and /dev/null differ diff --git a/react-ui/public/assets/images/pipeline-back.png b/react-ui/public/assets/images/pipeline-back.png deleted file mode 100644 index ce00f428..00000000 Binary files a/react-ui/public/assets/images/pipeline-back.png and /dev/null differ diff --git a/react-ui/public/assets/images/upload-icon.png b/react-ui/public/assets/images/upload-icon.png deleted file mode 100644 index 74be5489..00000000 Binary files a/react-ui/public/assets/images/upload-icon.png and /dev/null differ diff --git a/react-ui/public/favicon.ico b/react-ui/public/favicon.ico index e2e93252..408b8a23 100644 Binary files a/react-ui/public/favicon.ico and b/react-ui/public/favicon.ico differ diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 62aa9a4f..9f6db9b9 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -146,6 +146,7 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => { }, }, ...initialState?.settings, + logo: require('@/assets/img/logo.png'), token: { sider: { colorTextMenu: themes['textColor'], diff --git a/react-ui/public/assets/images/dataset-back.png b/react-ui/src/assets/img/dataset-intro-top.png similarity index 100% rename from react-ui/public/assets/images/dataset-back.png rename to react-ui/src/assets/img/dataset-intro-top.png diff --git a/react-ui/src/assets/img/delete-icon.png b/react-ui/src/assets/img/delete-icon.png index 335b2c7f..310f8bb8 100644 Binary files a/react-ui/src/assets/img/delete-icon.png and b/react-ui/src/assets/img/delete-icon.png differ diff --git a/react-ui/public/assets/images/duty-message.png b/react-ui/src/assets/img/duty-message.png similarity index 100% rename from react-ui/public/assets/images/duty-message.png rename to react-ui/src/assets/img/duty-message.png diff --git a/react-ui/public/assets/images/ai-logo.png b/react-ui/src/assets/img/login-ai-logo.png similarity index 100% rename from react-ui/public/assets/images/ai-logo.png rename to react-ui/src/assets/img/login-ai-logo.png diff --git a/react-ui/src/assets/img/login-captcha.png b/react-ui/src/assets/img/login-captcha.png new file mode 100644 index 00000000..fa21e9b7 Binary files /dev/null and b/react-ui/src/assets/img/login-captcha.png differ diff --git a/react-ui/public/assets/images/left-back-logo.png b/react-ui/src/assets/img/login-left-image.png similarity index 100% rename from react-ui/public/assets/images/left-back-logo.png rename to react-ui/src/assets/img/login-left-image.png diff --git a/react-ui/src/assets/img/login-password.png b/react-ui/src/assets/img/login-password.png new file mode 100644 index 00000000..5afc6d99 Binary files /dev/null and b/react-ui/src/assets/img/login-password.png differ diff --git a/react-ui/src/assets/img/login-user.png b/react-ui/src/assets/img/login-user.png new file mode 100644 index 00000000..ee84ebe9 Binary files /dev/null and b/react-ui/src/assets/img/login-user.png differ diff --git a/react-ui/public/assets/images/left-top-logo.png b/react-ui/src/assets/img/logo.png similarity index 100% rename from react-ui/public/assets/images/left-top-logo.png rename to react-ui/src/assets/img/logo.png diff --git a/react-ui/public/assets/images/modal-back.png b/react-ui/src/assets/img/modal-back.png similarity index 100% rename from react-ui/public/assets/images/modal-back.png rename to react-ui/src/assets/img/modal-back.png diff --git a/react-ui/public/assets/images/pipeline-canvas-back.png b/react-ui/src/assets/img/pipeline-canvas-bg.png similarity index 100% rename from react-ui/public/assets/images/pipeline-canvas-back.png rename to react-ui/src/assets/img/pipeline-canvas-bg.png diff --git a/react-ui/public/assets/images/static-message.png b/react-ui/src/assets/img/static-message.png similarity index 100% rename from react-ui/public/assets/images/static-message.png rename to react-ui/src/assets/img/static-message.png diff --git a/react-ui/src/components/KFModal/index.less b/react-ui/src/components/KFModal/index.less index 5e1f1239..b034672d 100644 --- a/react-ui/src/components/KFModal/index.less +++ b/react-ui/src/components/KFModal/index.less @@ -1,7 +1,7 @@ .kf-modal { .ant-modal-content { padding: 40px 67px; - background-image: url(/assets/images/modal-back.png); + background-image: url(@/assets/img/modal-back.png); background-repeat: no-repeat; background-position: top center; background-size: 100%; diff --git a/react-ui/src/global.less b/react-ui/src/global.less index e7b03e25..7471b78c 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -148,3 +148,7 @@ ol { left: 0; z-index: 999; } + +input:-webkit-autofill { + transition: background-color 5000s ease-in-out 0s; +} diff --git a/react-ui/src/overrides.less b/react-ui/src/overrides.less index 9aabb133..a3080072 100644 --- a/react-ui/src/overrides.less +++ b/react-ui/src/overrides.less @@ -126,7 +126,7 @@ .ant-modal-confirm { .ant-modal-content { padding: 40px 67px; - background-image: url(/assets/images/modal-back.png); + background-image: url(@/assets/img/modal-back.png); background-repeat: no-repeat; background-position: top center; background-size: 100%; diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.less b/react-ui/src/pages/Dataset/components/ResourceIntro/index.less index 3c4fcae4..9b9c84dc 100644 --- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.less +++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.less @@ -6,7 +6,7 @@ height: 110px; margin-bottom: 10px; padding: 20px 30px 0; - background-image: url(/assets/images/dataset-back.png); + background-image: url(@/assets/img/dataset-intro-top.png); background-repeat: no-repeat; background-position: top center; background-size: 100% 100%; diff --git a/react-ui/src/pages/DevelopmentEnvironment/Create/index.tsx b/react-ui/src/pages/DevelopmentEnvironment/Create/index.tsx index e59e9698..a9c43aad 100644 --- a/react-ui/src/pages/DevelopmentEnvironment/Create/index.tsx +++ b/react-ui/src/pages/DevelopmentEnvironment/Create/index.tsx @@ -84,7 +84,7 @@ function EditorCreate() { return (
- +
} onClick={() => startEditor(record.id)} > - 再次调试 + 启动 )} } > - 创建编辑器 + 创建开发环境 + + +
diff --git a/react-ui/src/pages/User/Login/login.less b/react-ui/src/pages/User/Login/login.less index 88fa4035..956cd6dc 100644 --- a/react-ui/src/pages/User/Login/login.less +++ b/react-ui/src/pages/User/Login/login.less @@ -1,31 +1,160 @@ -.loginForm { - :global { - .ant-pro-form-login-main { - width: auto !important; - max-width: auto !important; - margin: unset; +.user-login { + display: flex; + height: 100vh; + background-color: #fff; + + &__left { + position: relative; + width: 43%; + height: 100%; + padding-top: 56px; + background: linear-gradient(180deg, #e2ecff 0%, #f6fafe 100%); + + &__top { + display: flex; + align-items: center; + margin-left: 50px; + color: @text-color; + font-size: 30px; + font-family: Alibaba; } - .ant-input-affix-wrapper-lg { - padding: 19px 11px; - color: rgba(29, 29, 32, 0.6); - font-size: 18px; - font-family: 'Alibaba'; - border-radius: 13px; + + &__title { + position: relative; + display: flex; + justify-content: center; + margin-top: 70px; + margin-left: 85px; + color: #111111; + font-weight: 500; + font-size: 45px; + font-family: Alibaba; + + &__img { + position: relative; + top: -10px; + width: 85px; + height: 47px; + } } - .ant-input-affix-wrapper { - padding: 19px 11px; - color: rgba(29, 29, 32, 0.6); - font-size: 18px; - font-family: 'Alibaba'; - border-radius: 13px; + + &__message { + display: flex; + justify-content: center; + margin-top: 18px; + color: #606b7a; + font-size: 26px; + font-family: Alibaba; } - .ant-btn.ant-btn-lg { - height: 76px; - color: #ffffff; - font-size: 20px; - font-family: 'Alibaba'; - background: @primary-color; - border-radius: 41px; + + &__bottom-img { + width: 100%; + margin-top: 50px; } } + + &__right { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 57%; + height: 100%; + background: #fff; + + &__title { + margin-bottom: 24px; + color: @primary-color; + font-size: 36px; + font-family: Alibaba; + } + + &__content { + width: 640px; + padding: 60px 60px 45px; + background-color: white; + border-radius: 10px; + box-shadow: 0px 3px 20px rgba(153, 153, 153, 0.16); + + &__title { + margin-bottom: 40px; + color: @text-color; + font-size: 22px; + font-family: Alibaba; + } + + &__form { + &__captcha { + width: 170px; + height: 66px; + padding-left: 22px; + cursor: pointer; + } + :global { + .ant-form-item { + margin-bottom: 32px; + + &:last-child { + margin-bottom: 0; + } + } + .ant-input-affix-wrapper { + padding: 10px 11px; + color: @text-color; + font-size: 18px !important; + background-color: white; + border: 1px solid #caced8; + border-radius: 13px; + + .ant-input { + height: 44px; + font-size: 18px !important; + } + } + + .ant-btn { + width: 100%; + height: 76px; + font-size: 20px; + border-radius: 38px; + } + } + } + } + } + + input { + font-size: 18px !important; + } + + input:-webkit-autofill { + font-size: 18px !important; + transition: background-color 5000s ease-in-out 0s; + -webkit-text-fill-color: @text-color !important; + } + + input:-webkit-autofill::first-line { + font-size: 18px !important; + } +} + +.login-input-prefix { + display: flex; + align-items: center; + height: 44px; + margin-right: 15px; + + &__icon { + width: 24px; + height: 26px; + margin-right: 18px; + margin-left: 14px; + } + + &__line { + width: 1px; + height: 30px; + background-color: #caced8; + } } diff --git a/react-ui/src/utils/localStorage.ts b/react-ui/src/utils/localStorage.ts new file mode 100644 index 00000000..b69f466d --- /dev/null +++ b/react-ui/src/utils/localStorage.ts @@ -0,0 +1,6 @@ +// 登录的用户名 +export const loginUserKey = 'login-user'; +// 登录的密码 +export const loginPasswordKey = 'login-password'; +// 记住密码 +export const rememberPasswordKey = 'login-remember-password'; diff --git a/react-ui/src/utils/ui.tsx b/react-ui/src/utils/ui.tsx index 85d5234a..af27f1cc 100644 --- a/react-ui/src/utils/ui.tsx +++ b/react-ui/src/utils/ui.tsx @@ -19,7 +19,7 @@ export function modalConfirm({ title, content, onOk, ...rest }: ModalFuncProps) title: (