From e2a0980e4a701a3dd07c339ff24ec4221dbed2dd Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 12 三月 2021 18:05:28 +0800 Subject: [PATCH] 2021-03-12 --- src/views/login/index.jsx | 64 +++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 17 deletions(-) diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index ddee480..6a0fcac 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -6,7 +6,7 @@ import Api from '@/api' import Utils from '@/utils/utils.js' -import options from '@/store/options.js' +import options, { styles } from '@/store/options.js' import zhCN from '@/locales/zh-CN/login.js' import enUS from '@/locales/en-US/login.js' import asyncLoadComponent from '@/utils/asyncLoadComponent' @@ -15,7 +15,7 @@ const LoginForm = asyncLoadComponent(() => import('./loginform')) const LoginCloudForm = asyncLoadComponent(() => import('./logincloudform')) -const iszhCN = localStorage.getItem('lang') !== 'en-US' +const iszhCN = sessionStorage.getItem('lang') !== 'en-US' const _href = window.location.href.split('#')[0] if (localStorage.getItem(_href + 'paramsmain')) { @@ -91,23 +91,21 @@ sessionStorage.setItem('Full_Name', res.FullName) sessionStorage.setItem('avatar', res.icon || '') sessionStorage.setItem('dataM', res.dataM ? 'true' : '') + sessionStorage.setItem('localDataM', res.dataM ? 'true' : '') sessionStorage.setItem('debug', res.debug || '') sessionStorage.setItem('role_id', res.role_id || '') - - localStorage.setItem('lang', param.lang || 'zh-CN') - + sessionStorage.setItem('localRole_id', res.role_id || '') + let _url = window.location.href.split('#')[0] + localStorage.setItem(_url + 'lang', param.lang || 'zh-CN') + sessionStorage.setItem('lang', param.lang || 'zh-CN') + if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password})))) } else { localStorage.removeItem(_url) } - - // if (this.props.location.state && this.props.location.state.from.pathname) { - // // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈� - // this.props.history.replace(this.props.location.state.from.pathname) - // } let _history = sessionStorage.getItem('history') if (_history) { @@ -126,6 +124,17 @@ }) } else { message.warning(res.message) + if (res.message.indexOf('瀵嗙爜閿欒') > -1) { + const input = document.getElementById('password') + if (input) { + input.select() + } + } else if (res.message.indexOf('鐧诲綍鏉冮檺') > -1) { + const input = document.getElementById('username') + if (input) { + input.select() + } + } this.setState({ isDisabled: false }) @@ -149,10 +158,15 @@ sessionStorage.setItem('Full_Name', res.FullName) sessionStorage.setItem('avatar', res.icon || '') sessionStorage.setItem('dataM', res.dataM ? 'true' : '') + sessionStorage.setItem('localDataM', res.dataM ? 'true' : '') sessionStorage.setItem('debug', res.debug || '') sessionStorage.setItem('role_id', res.role_id || '') + sessionStorage.setItem('localRole_id', res.role_id || '') - localStorage.setItem('lang', param.lang || 'zh-CN') + let _url = window.location.href.split('#')[0] + + localStorage.setItem(_url + 'lang', param.lang || 'zh-CN') + sessionStorage.setItem('lang', param.lang || 'zh-CN') let _history = sessionStorage.getItem('history') if (_history) { @@ -245,10 +259,10 @@ Api.getTouristMsg().then(result => { if (result.status) { - if (!sessionStorage.getItem('UserID') && result.UserID) { + if (result.UserID && !sessionStorage.getItem('UserID')) { sessionStorage.setItem('UserID', result.UserID) } - if (!sessionStorage.getItem('LoginUID') && result.LoginUID) { + if (result.LoginUID && !sessionStorage.getItem('LoginUID')) { sessionStorage.setItem('LoginUID', result.LoginUID) } @@ -280,8 +294,12 @@ mainlogo: res.indexlogo || '', doclogo: res.doclogo || '', style: res.CSS || '', - webSite: res.WebSite || '' + showline: res.split_line_show || 'true', + webSite: res.WebSite || '', + navBar: res.menu_type } + + sessionStorage.setItem('home_background', res.index_background_color) // url鏍囬 document.title = systemMsg.platTitle @@ -331,9 +349,10 @@ window.GLOB.mainlogo = systemMsg.mainlogo window.GLOB.style = systemMsg.style + window.GLOB.navBar = systemMsg.navBar - if (window.GLOB.style && options.styles[window.GLOB.style]) { - document.getElementById('root').className = options.styles[window.GLOB.style] + if (window.GLOB.style && styles[window.GLOB.style]) { + document.body.className = styles[window.GLOB.style] + ' ' + (res.split_line_show === 'false' ? 'hidden-split-line' : '') } if (res.titlelogo && window.GLOB.favicon !== res.titlelogo) { @@ -349,6 +368,16 @@ if (typeof(memberLevel) === 'number' && memberLevel > 10 && parseInt(memberLevel / 10) * 10 === memberLevel) { sessionStorage.setItem('Member_Level', md5('mksoft' + moment().format('YYYYMM') + memberLevel)) this.props.modifyMemberLevel(memberLevel) + } + + if (res.users_upt === 'true' && window.GLOB.systemType === 'production') { + Api.getLocalConfig ({func: 's_Get_local_u_deleted', users_upt_date: res.users_upt_date}).then(localres => { + if (!localres.status) return + Api.getSystemConfig({func: 's_get_sso_u_create', user_ids: localres.user_ids, user_ids_local: localres.user_ids_local, users_upt_date: localres.users_upt_date}).then(ssores => { + if (!ssores.status) return + Api.getLocalConfig ({func: 's_get_local_u_create', user_ids_local: ssores.user_ids_local}) + }) + }) } } else { message.warning(res.message) @@ -475,7 +504,7 @@ </div> <div className="login-bottom"> {webSite && copyRight ? - <a target="blank" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : + <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p> } {ICP ? <p dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></p> : null} @@ -487,6 +516,7 @@ cancelText={this.state.dict['login.auth.cancel']} visible={this.state.syncApp} onOk={this.syncSubmit} + maskClosable={false} className="sync-cloud-application" width={'430px'} confirmLoading={this.state.syncing} -- Gitblit v1.8.0