From 1779677cece5864b62a65df4b01a4a69496e149a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:51:15 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/login/index.jsx | 271 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 190 insertions(+), 81 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 3f68301..c6ad6c2 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -7,8 +7,6 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import { styles } from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/login.js'
-import enUS from '@/locales/en-US/login.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import './index.scss'
@@ -17,14 +15,9 @@
const Resetpwd = asyncLoadComponent(() => import('@/components/resetPassword'))
const LoginCloudForm = asyncComponent(() => import('./logincloudform'))
const LoginCodeForm = asyncComponent(() => import('./logincodeform'))
-const iszhCN = sessionStorage.getItem('lang') !== 'en-US'
-
-const _href = window.location.href.split('#')[0]
class Login extends Component {
state = {
- selectedlang: iszhCN ? 'zh-CN' : 'en-US',
- dict: iszhCN ? zhCN : enUS,
isDisabled: false,
auth: false,
authError: '',
@@ -35,18 +28,12 @@
ICP: window.GLOB.ICP || '',
lineColor: window.GLOB.lineColor || '',
webSite: window.GLOB.webSite || '',
+ prolType: window.GLOB.prolType || '',
+ prolCont: window.GLOB.prolCont || '',
langList: [],
syncApp: false,
loginWays: null,
- touristLogin: false,
syncing: false,
- }
-
- changelang (item) {
- // 鍒囨崲璇█
- this.setState({
- dict: item === 'zh-CN' ? zhCN : enUS
- })
}
handleSubmit = () => {
@@ -103,13 +90,10 @@
window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..`
}
- localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
-
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let users = localStorage.getItem(_href + 'users')
+ let users = localStorage.getItem(window.GLOB.sysSign + 'users')
if (users) {
try {
@@ -140,9 +124,9 @@
users.unshift({username: param.username, password: param.remember ? param.password : ''})
- localStorage.setItem(_href + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users))))
+ localStorage.setItem(window.GLOB.sysSign + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users))))
- let level = localStorage.getItem(_href + 'pwdlevel')
+ let level = localStorage.getItem(window.GLOB.sysSign + 'pwdlevel')
if (level && process.env.NODE_ENV === 'production') {
let visible = false
@@ -177,12 +161,31 @@
}
}
- let iframe = sessionStorage.getItem('iframe')
- if (iframe) {
- sessionStorage.removeItem('iframe')
- this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
+ if (['20210626201522493D7AD7591D7A547278685', '20210626201956190740F1DF384914A3CA9EF'].includes(window.GLOB.appkey) && process.env.NODE_ENV === 'production' && param.username !== 'IF_DMS_APP') {
+ let _param = {
+ UserName: param.username,
+ Password: param.password,
+ BasePath: '/'
+ }
+ Api.loginAndRedirect(_param).then(result => {
+ if (result.IsError) {
+ this.setState({
+ isDisabled: false
+ })
+ message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!')
+ } else {
+ let lang = sessionStorage.getItem('lang') !== 'en-US' ? '/zh-CN' : '/en-US'
+ window.location.replace(document.location.origin + lang + '/Home/Index')
+ }
+ })
} else {
- this.props.history.replace('/main')
+ let iframe = sessionStorage.getItem('iframe')
+ if (iframe) {
+ sessionStorage.removeItem('iframe')
+ this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID))
+ } else {
+ this.props.history.replace('/main')
+ }
}
} else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
@@ -231,9 +234,6 @@
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..`
}
-
- localStorage.setItem(_href + 'lang', param.lang || 'zh-CN')
- sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
@@ -328,6 +328,8 @@
// md5("/ws/location/v1/ip?callback=callbackFunction&key=key&output=jsonp secret key")
// md5("/ws/location/v1/ip?callback=callbackFunction&key=BA7BZ-4QB65-LFCIA-QPDA6-4G6O7-MJB4Q&output=jsonpuThL4ZM3XOj642ksEQh76tyHFjh4")
+ sessionStorage.removeItem('langList')
+
setTimeout(() => {
Api.delCacheConfig()
}, 50)
@@ -340,20 +342,21 @@
}
}
- const _addressUrl = _href + 'queryAddress'
+ const _addressUrl = window.location.href.split('#')[0] + 'queryAddress'
if (localStorage.getItem(_addressUrl) === 'true') {
this.queryAddress()
}
const timeStamp = new Date().getTime()
- const _authUrl = _href + 'AuthCode'
+ const _authUrl = window.location.href.split('#')[0] + 'AuthCode'
let authCode = localStorage.getItem(_authUrl)
let _s = md5('mksoft' + moment().format('YYYYMMDD'))
authCode = authCode ? authCode.split(',') : []
let index = authCode.findIndex(key => key === _s)
let license = false
+ let appkey = window.GLOB.localkey || window.GLOB.appkey
if (window.GLOB.licenseKey) {
if (window.GLOB.licenseKey.length !== 20) {
@@ -362,7 +365,7 @@
okText: '鐭ラ亾浜�'
})
} else {
- let key = md5(window.GLOB.appId + 'minke_software' + window.GLOB.appkey).toUpperCase().substr(-6)
+ let key = md5(window.GLOB.appId + 'minke_software' + appkey).toUpperCase().substr(-6)
let key1 = window.GLOB.licenseKey.substring(0, 6)
let key2 = window.GLOB.licenseKey.substring(6, 14)
@@ -370,7 +373,7 @@
let key4 = md5(key1 + key2).toUpperCase().substr(-6)
if (key === key1 && key3 === key4) {
- let last = window.GLOB.appkey[window.GLOB.appkey.length - 1]
+ let last = appkey[appkey.length - 1]
let offset = 0
let keys = {}
@@ -393,7 +396,7 @@
lictime = Math.floor(new Date(lictime).getTime() / 86400000)
let curtime = Math.floor(new Date().getTime() / 86400000)
let licday = lictime - curtime
- let _mindUrl = _href + 'notMind'
+ let _mindUrl = window.location.href.split('#')[0] + 'notMind'
if (licday < 0 || isNaN(licday)) {
Modal.warning({
@@ -443,7 +446,7 @@
func: _func,
AppID: window.GLOB.appId,
TimeStamp: timeStamp,
- appkey: window.GLOB.appkey,
+ appkey: appkey,
SessionUid: localStorage.getItem('SessionUid') || '',
userid: _id,
LoginUID: _id,
@@ -481,6 +484,16 @@
}
box = box.join(',')
localStorage.setItem(_authUrl, box)
+
+ if (res.e_files === 'true') {
+ localStorage.setItem(window.GLOB.sysSign + 'files', md5(window.GLOB.sysSign + 'files'))
+ localStorage.setItem(window.GLOB.sysSign + 'filesDate', res.e_files_end_date)
+ window.GLOB.storeFiles = true
+ window.GLOB.storeDate = Math.ceil((new Date(res.e_files_end_date).getTime() - new Date().getTime()) / 86400000)
+ } else {
+ localStorage.removeItem(window.GLOB.sysSign + 'files')
+ window.GLOB.storeFiles = false
+ }
this.setState({
auth: true
@@ -494,16 +507,24 @@
}
} else {
localStorage.removeItem(_authUrl)
+ localStorage.removeItem(window.GLOB.sysSign + 'files')
+ window.GLOB.storeFiles = false
+
this.setState({
auth: false
})
}
if (res.query_address !== 'true') {
- localStorage.setItem(_addressUrl, 'false')
+ localStorage.removeItem(_addressUrl)
} else {
localStorage.setItem(_addressUrl, 'true')
this.queryAddress()
+ }
+ if (res.deekseek !== 'true') {
+ localStorage.removeItem(window.GLOB.sysSign + 'ds')
+ } else {
+ localStorage.setItem(window.GLOB.sysSign + 'ds', 'true')
}
} else if (res.ErrCode === 'N') {
localStorage.removeItem(_authUrl)
@@ -565,15 +586,16 @@
sessionStorage.setItem('visitorUserID', result.UserID || '')
sessionStorage.setItem('visitorLoginUID', result.LoginUID || '')
- if (result.UserID && result.LoginUID) {
- this.setState({touristLogin: true})
- }
-
// 鑾峰彇绯荤粺淇℃伅
let _param = {
func: 's_Get_style',
TypeCharOne: 'PC',
- LText: `select '${window.GLOB.appkey}'`,
+ LText: `select '${appkey}'`,
+ appkey: appkey
+ }
+
+ if (window.GLOB.style_appkey) {
+ _param.style_appkey = window.GLOB.style_appkey
}
_param.userid = result.UserID
@@ -586,7 +608,7 @@
if (res.status) {
// positecgroup
- // if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ // if (res.member_type && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
// if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
// Modal.warning({
// title: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒',
@@ -609,29 +631,59 @@
if (!['shutter', 'linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(res.menu_type)) {
res.menu_type = 'shutter'
}
+
+ let loginOtop = ''
+ let loginOleft = ''
+ let windowWidth = window.innerWidth
+ let fix = null
+ res.login_screen_offset && res.login_screen_offset.forEach(item => {
+ if (!item.offset_x && !item.offset_y) return
- let _url = _href + 'system'
+ if (fix === null || Math.abs(windowWidth - item.resolution_width) < fix) {
+ fix = Math.abs(windowWidth - item.resolution_width)
+ loginOtop = item.offset_y + item.y_unit
+ loginOleft = item.offset_x + item.x_unit
+ }
+ })
+
let systemMsg = {
favicon: res.titlelogo || '',
platTitle: res.titleName || '',
platName: res.SysName || '',
bgImage: res.Banner || '',
loginlogo: res.loginlogo || '',
- copyRight: res.CopyRightYear && res.CopyRightOrg ? `Copyright漏${res.CopyRightYear} 鎵�鏈夌浉鍏崇増鏉冨綊 ${res.CopyRightOrg}` : '',
+ copyRight: res.CopyRightYear && res.CopyRightOrg ? `Copyright漏${res.CopyRightYear} ${window.GLOB.dict['copyrights_by'] || '鎵�鏈夌浉鍏崇増鏉冨綊'} ${res.CopyRightOrg}` : '',
ICP: res.ICP || '',
mainlogo: res.indexlogo || '',
doclogo: res.doclogo || '',
style: res.CSS || '',
showline: res.split_line_show || 'true',
webSite: res.WebSite || '',
+ prolType: '',
+ prolCont: '',
navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤�
app_version: res.app_version,
Member_Level: 0,
- appname: res.appname || ''
+ appname: res.appname || '',
+ loginOtop: loginOtop,
+ loginOleft: loginOleft
+ }
+
+ if (['every_time', 'once', 'not_required'].includes(res.require_legal_consent) && res.legal_documents) {
+ systemMsg.prolCont = res.legal_documents
+ try {
+ systemMsg.prolCont = window.decodeURIComponent(window.atob(systemMsg.prolCont))
+ if (res.require_legal_consent !== 'not_required') {
+ systemMsg.prolType = res.require_legal_consent
+ }
+ } catch(e) {
+ systemMsg.prolType = ''
+ systemMsg.prolCont = ''
+ }
}
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
- systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
+ systemMsg.Member_Level = md5('mksoft' + appkey + res.member_level)
if (!window.GLOB.memberLevel) {
Object.defineProperty(window.GLOB, 'memberLevel', {
writable: false,
@@ -646,15 +698,9 @@
level = ''
}
- localStorage.setItem(_href + 'pwdlevel', level)
+ localStorage.setItem(window.GLOB.sysSign + 'pwdlevel', level)
- if (res.srcid) {
- localStorage.setItem(_href + 'srcId', res.srcid)
- } else {
- localStorage.removeItem(_href + 'srcId')
- }
-
- sessionStorage.setItem('home_background', res.index_background_color || '')
+ res.index_background_color && sessionStorage.setItem('home_background', res.index_background_color)
let seconds = 0
if (res.sys_datetime) {
@@ -666,21 +712,41 @@
document.title = systemMsg.platTitle
try {
- localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg))))
+ localStorage.setItem(window.GLOB.sysSign + 'system', window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg))))
} catch (e) {
- localStorage.removeItem(_url)
+ localStorage.removeItem(window.GLOB.sysSign + 'system')
}
- let _loginurl = _href + 'loginways'
+ if (res.lang_translation_js && res.lang_data && res.lang_data[0] && (res.lang_data.length > 1 || res.lang_data[0].Lang !== 'zh-CN')) {
+ let lang = sessionStorage.getItem('lang')
+ let js_trans = res.lang_translation_js.map(item => {
+ if (['not_empty', 'not_zero', 'max_limit', 'less_limit'].includes(item.msn_code)) {
+ item.translation = ' ' + item.translation
+ }
+ if (['input_tip', 'select_tip', 'max_limit', 'less_limit'].includes(item.msn_code)) {
+ item.translation = item.translation + ' '
+ }
+ if (lang === item.lang) {
+ window.GLOB.dict[item.msn_code] = item.translation
+ }
+
+ return {
+ lang: item.lang,
+ key: item.msn_code,
+ val: item.translation
+ }
+ })
+
+ localStorage.setItem(window.GLOB.sysSign + 'js_trans', JSON.stringify(js_trans))
+ }
+
+ let _loginurl = window.GLOB.sysSign + 'loginways'
let login_ways = []
- let login_types = []
if (res.login_ways && res.login_ways.length > 0) {
res.login_ways.forEach(item => {
// 鐭俊楠岃瘉鐮佺櫥褰曪紝蹇呴』璁剧疆鐭俊Id
if (item.way_no === 'sms_vcode' && !item.sms_id) return
- if (login_types.includes(item.way_no)) return
-
- login_types.push(item.way_no)
+ if (!['sms_vcode', 'uname_pwd', 'app_scan', 'weixin_scan'].includes(item.way_no)) return
login_ways.push({
type: item.way_no,
@@ -703,10 +769,29 @@
} catch (e) {
localStorage.removeItem(_loginurl)
}
+
+ if (res.lang_data && res.lang_data.length > 1 && window.GLOB.systemType !== 'production') {
+ let list = res.lang_data.map(item => item.Lang).filter(n => n !== 'zh-CN')
+ sessionStorage.setItem('langList', JSON.stringify(list))
+ }
+
+ if (res.lang_data.length === 1 && res.lang_data[0].Lang !== sessionStorage.getItem('lang')) {
+ localStorage.setItem(window.location.href.split('#')[0] + 'lang', res.lang_data[0].Lang)
+ sessionStorage.setItem('lang', res.lang_data[0].Lang)
+ window.location.reload()
+ return
+ }
+
+ let langList = res.lang_data.map(item => ({Lang: item.Lang, LangName: item.LangName}))
+
+ localStorage.setItem(window.GLOB.sysSign + 'langList', JSON.stringify(langList))
+
+ window.GLOB.loginOtop = systemMsg.loginOtop
+ window.GLOB.loginOleft = systemMsg.loginOleft
this.setState({
loginWays: login_ways,
- langList: res.lang_data || [],
+ langList: langList,
...systemMsg
})
@@ -729,7 +814,7 @@
}
// positecgroup
- if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
+ if (['20210626201522493D7AD7591D7A547278685', '20210626201956190740F1DF384914A3CA9EF'].includes(window.GLOB.appkey) && res.users_upt === 'true' && window.GLOB.systemType === 'production') {
Api.genericInterface({
func: 's_Get_local_u_deleted',
users_upt_date: res.users_upt_date,
@@ -764,7 +849,7 @@
}
})
- let loginWays = localStorage.getItem(_href + 'loginways')
+ let loginWays = localStorage.getItem(window.GLOB.sysSign + 'loginways')
if (loginWays) {
try {
loginWays = JSON.parse(window.decodeURIComponent(window.atob(loginWays)))
@@ -774,6 +859,19 @@
this.setState({
loginWays: loginWays
+ })
+ }
+
+ let langs = localStorage.getItem(window.GLOB.sysSign + 'langList')
+ if (langs) {
+ try {
+ langs = JSON.parse(langs)
+ } catch (e) {
+ langs = []
+ }
+
+ this.setState({
+ langList: langs
})
}
}
@@ -877,7 +975,7 @@
})
if (result.verifyResult === 'success') {
- let level = localStorage.getItem(_href + 'pwdlevel')
+ let level = localStorage.getItem(window.GLOB.sysSign + 'pwdlevel')
if (level) {
let visible = false
let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
@@ -927,42 +1025,53 @@
}
render () {
- const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state
+ const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, prolType, prolCont } = this.state
+
+ let wrapStyle = {}
+
+ if (bgImage) {
+ wrapStyle.backgroundImage = `url(${bgImage})`
+ }
+ if (window.GLOB.loginOtop) {
+ wrapStyle['--mk-login-offset-top'] = window.GLOB.loginOtop
+ }
+ if (window.GLOB.loginOleft) {
+ wrapStyle['--mk-login-offset-left'] = window.GLOB.loginOleft
+ }
return (
- <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
+ <div className="login-container" id="mk-login-view" style={wrapStyle}>
<div className="logo" style={lineColor ? {borderColor: lineColor} : {}}>
{loginlogo ? <img src={loginlogo} alt=""/> : null}
{this.state.platName ? <p className="plat-name">{this.state.platName}</p> : null}
</div>
<div className="login-middle" style={lineColor ? {borderColor: lineColor} : {}}>
{loginWays ? <LoginForm
- dict={this.state.dict}
auth={this.state.auth}
authError={this.state.authError}
- touristLogin={touristLogin}
loginWays={loginWays}
- lang={this.state.selectedlang}
+ prolType={prolType}
+ prolCont={prolCont}
langList={this.state.langList}
isDisabled={this.state.isDisabled}
- changelang={(value) => this.changelang(value)}
handleSubmit={() => this.handleSubmit()}
authLogin={this.authLogin}
wrappedComponentRef={(inst) => this.loginformRef = inst}
/> : null}
</div>
<div className="login-bottom">
- {webSite && copyRight ?
- <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}
+ <p>
+ {webSite && copyRight ?
+ <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> :
+ <span dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></span>
+ }
+ {prolCont && !prolType ? <span style={{marginLeft: '15px'}} dangerouslySetInnerHTML={{ __html: prolCont }}></span> : null}
+ </p>
+ {ICP ? <a target="_blank" rel="noopener noreferrer" href="https://beian.miit.gov.cn/#/Integrated/index" dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></a> : null}
</div>
{/* 缂栬緫鐘舵�佺櫥褰� */}
<Modal
- title={this.state.dict['login.sync.cloud']}
- okText={this.state.dict['login.ok']}
- cancelText={this.state.dict['login.cancel']}
+ title="鍚屾浜戠搴旂敤"
visible={this.state.syncApp}
onOk={this.syncSubmit}
maskClosable={false}
@@ -979,8 +1088,8 @@
{/* 浜屾楠岃瘉 */}
<Modal
title="浜屾楠岃瘉"
- okText={this.state.dict['login.ok']}
- cancelText={this.state.dict['login.cancel']}
+ okText={window.GLOB.dict['ok'] || '纭畾'}
+ cancelText={window.GLOB.dict['cancel'] || '鍙栨秷'}
visible={this.state.codeVisible}
onOk={this.codeSubmit}
maskClosable={false}
--
Gitblit v1.8.0