From b6c7f588b831d6fa4eb23b50ec08ea0b263a0717 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 六月 2024 20:27:56 +0800
Subject: [PATCH] 2024-06-17
---
src/menu/components/form/formaction/formconfig.jsx | 28 +++++++-------
src/views/login/loginform.jsx | 14 +++----
src/menu/components/form/formaction/actionform/index.jsx | 14 ++++--
src/views/login/index.jsx | 8 ---
4 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index ff0fa6f..a46a9ca 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -105,9 +105,9 @@
shows.push('innerFunc')
} else {
shows.push('sql', 'sqlType')
- if (this.record.execSuccess === 'never' && this.record.resetForms && this.record.resetForms[0]) {
- shows.push('returnValue')
- }
+ // if (this.record.execSuccess === 'never' && this.record.resetForms && this.record.resetForms[0]) {
+ // shows.push('returnValue')
+ // }
}
if (this.record.linkmenu && this.record.linkmenu !== 'goback') {
@@ -372,8 +372,12 @@
if (values.outerBlacklist) {
values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
}
- if (values.resetForms && values.resetForms.length === 0) {
- values.resetForms = null
+ if (values.resetForms) {
+ if (values.resetForms.length === 0) {
+ values.resetForms = null
+ } else {
+ values.returnValue = 'true'
+ }
}
resolve(values)
} else {
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index dcf4304..ef22b50 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -533,20 +533,20 @@
mode: 'multiple',
options: resets
},
- {
- type: 'radio',
- key: 'returnValue',
- label: '鏇存柊琛ㄥ崟',
- initVal: card.returnValue || 'false',
- tooltip: '涓庨噸缃〃鍗曢厤鍚堜娇鐢紝寮�鍚椂锛屽繀椤诲湪鑷畾涔夎剼鏈腑杩斿洖鏁版嵁锛岀敤浜庢浛鎹㈠瓧娈甸泦鍜屽～鍏呰〃鍗曘��',
- options: [{
- value: 'false',
- text: '绂佺敤'
- }, {
- value: 'true',
- text: '鍚敤'
- }]
- },
+ // {
+ // type: 'radio',
+ // key: 'returnValue',
+ // label: '鏇存柊琛ㄥ崟',
+ // initVal: card.returnValue || 'false',
+ // tooltip: '涓庨噸缃〃鍗曢厤鍚堜娇鐢紝寮�鍚椂锛屽繀椤诲湪鑷畾涔夎剼鏈腑杩斿洖鏁版嵁锛岀敤浜庢浛鎹㈠瓧娈甸泦鍜屽～鍏呰〃鍗曘��',
+ // options: [{
+ // value: 'false',
+ // text: '绂佺敤'
+ // }, {
+ // value: 'true',
+ // text: '鍚敤'
+ // }]
+ // },
{
type: 'radio',
key: 'reload',
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 1dc310a..91d7ff8 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -34,7 +34,6 @@
langList: [],
syncApp: false,
loginWays: null,
- touristLogin: false,
syncing: false,
}
@@ -561,10 +560,6 @@
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',
@@ -902,7 +897,7 @@
}
render () {
- const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state
+ const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays } = this.state
return (
<div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
@@ -914,7 +909,6 @@
{loginWays ? <LoginForm
auth={this.state.auth}
authError={this.state.authError}
- touristLogin={touristLogin}
loginWays={loginWays}
lang={this.state.selectedlang}
langList={this.state.langList}
diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index e4ebcfc..3d6cb01 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -23,7 +23,6 @@
authLogin: PropTypes.func,
auth: PropTypes.bool,
authError: PropTypes.string,
- touristLogin: PropTypes.bool,
lang: PropTypes.string,
langList: PropTypes.array,
loginWays: PropTypes.array
@@ -196,8 +195,7 @@
if (!this.props.auth) {
warning({
title: this.props.authError || dict['auth_tip'] || '绯荤粺鏈巿鏉冿紝璇疯仈绯荤鐞嗗憳銆�',
- okText: dict['ok'] || '纭畾',
- cancelText: dict['cancel'] || '鍙栨秷',
+ okText: dict['got_it'] || '鐭ラ亾浜�',
onOk() {},
onCancel() {}
})
@@ -277,16 +275,16 @@
}
getvercode = () => {
- const { smsId } = this.state
+ const { smsId, dict } = this.state
let _phone = this.props.form.getFieldValue('phone')
if (!_phone) {
- message.warning('璇疯緭鍏ユ墜鏈哄彿锛�')
+ message.warning(dict['phone_no_required'] || '璇疯緭鍏ユ墜鏈哄彿锛�')
return
} else if (!/^1[3456789]\d{9}$/.test(_phone)) {
- message.warning('鎵嬫満鍙锋牸寮忛敊璇紝璇烽噸濉紒')
+ message.warning(dict['phone_error'] || '鎵嬫満鍙锋牸寮忛敊璇紝璇烽噸濉紒')
return
- } else if (!this.props.touristLogin) {
- message.warning('鏈幏鍙栭獙璇佺爜璁剧疆锛岃绋嶅悗鎴栧埛鏂伴噸璇曪紒')
+ } else if (!sessionStorage.getItem('visitorUserID') || !sessionStorage.getItem('visitorLoginUID')) {
+ message.warning(dict['vercode_error'] || '鏈幏鍙栭獙璇佺爜璁剧疆锛岃绋嶅悗鎴栧埛鏂伴噸璇曪紒')
return
}
--
Gitblit v1.8.0