From 6d61c46fd0a9a2e967a604519d9a6361694280dc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 四月 2021 17:09:16 +0800
Subject: [PATCH] 2021-04-01
---
src/templates/zshare/modalform/index.jsx | 2
src/views/login/loginform.jsx | 3 +
src/tabviews/zshare/mutilform/index.scss | 13 ++++++
src/templates/zshare/formconfig.jsx | 4 +
src/templates/zshare/verifycard/index.jsx | 4 +-
src/templates/modalconfig/dragelement/index.scss | 3 +
src/tabviews/zshare/mutilform/index.jsx | 11 ++++-
src/templates/modalconfig/index.jsx | 2
src/templates/sharecomponent/tablecomponent/index.jsx | 6 ++
src/api/index.js | 17 +++++---
src/menu/modalconfig/index.jsx | 2
src/templates/modalconfig/dragelement/card.jsx | 14 +++++-
src/views/login/index.jsx | 39 +++++++++++++++----
13 files changed, 93 insertions(+), 27 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6e85dc6..a584f47 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -31,7 +31,7 @@
config.data = qs.stringify(config.data)
} else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post') {
+ } else if (config.method === 'post' && config.data) {
config.data = JSON.stringify(config.data)
}
@@ -106,11 +106,16 @@
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
- if (cross === 'true') {
+ if (cross === 'true' && param) {
return axios({
url,
method,
data: param
+ })
+ } else if (cross === 'true') {
+ return axios({
+ url,
+ method
})
}
@@ -409,10 +414,10 @@
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
getSystemConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
@@ -437,10 +442,10 @@
* @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
*/
getLocalConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 631bffc..1800ca9 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -278,7 +278,7 @@
let _this = this
confirm({
- content: `纭畾鍒犻櫎<<${card.label}>>鍚楋紵`,
+ content: `纭畾鍒犻櫎${card.label ? `<<${card.label}>>` : ''}鍚楋紵`,
onOk() {
let _config = fromJS(_this.state.config).toJS()
_config.fields = _config.fields.filter(item => !(item.uuid === card.uuid))
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 9d228e0..1efef2a 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -721,7 +721,7 @@
<Col span={item.span || 24} key={index}>
<Form.Item
colon={!!item.label}
- label={item.label || ' '}
+ label={item.label}
labelCol={item.labelCol}
wrapperCol={item.wrapperCol}
className="hint"
@@ -1443,8 +1443,15 @@
}
render() {
+ const { action } = this.props
+
+ let _align = 'left_right'
+ if (action.setting && action.setting.align) {
+ _align = action.setting.align
+ }
+
return (
- <Form className="main-form-field" id="main-form-box">
+ <Form className={'main-form-field ' + _align} id="main-form-box">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/tabviews/zshare/mutilform/index.scss b/src/tabviews/zshare/mutilform/index.scss
index 1020caf..829d2a9 100644
--- a/src/tabviews/zshare/mutilform/index.scss
+++ b/src/tabviews/zshare/mutilform/index.scss
@@ -109,4 +109,17 @@
color: rgba(0, 0, 0, 0.65)!important;
}
}
+}
+
+.main-form-field.up_down {
+ .ant-form-item {
+ display: block;
+ .ant-form-item-label {
+ width: 100%!important;
+ text-align: left;
+ }
+ .ant-form-item-control-wrapper {
+ width: 100%!important;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index f1eb64d..3ea4921 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -110,11 +110,19 @@
<Checkbox value="D">D</Checkbox>
</Checkbox.Group>)
} else if (card.type === 'hint') {
- formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)'}}>{card.message}</div>
+ formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5'}}>{card.message}</div>
} else if (card.type === 'split') {
formItem = <div className="split-line">{card.label}</div>
} else if (card.type === 'checkcard') {
formItem = <CheckCard width={card.width} ratio={card.ratio} display={card.display} fields={card.fields} options={card.options} />
+ }
+
+ let _label = card.label
+ if (card.tooltip) {
+ _label = <span><Icon type="question-circle" />{card.label}</span>
+ }
+ if (card.type === 'brafteditor' && card.hidelabel === 'true') {
+ _label = null
}
return (
@@ -129,8 +137,8 @@
<div ref={node => drag(drop(node))}>
{card.type === 'split' ? formItem : <Form.Item
className="ant-form-item"
- colon={!!card.label}
- label={card.tooltip ? <span><Icon type="question-circle" />{card.label}</span> : card.label}
+ colon={!!_label}
+ label={_label}
required={card.required === 'true'}
extra={card.extra || null}
labelCol={card.labelwidth ? {style: {width: card.labelwidth + '%'}} : null}
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index abe8176..ad41b4d 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -120,5 +120,8 @@
width: 100%!important;
text-align: left;
}
+ .ant-form-item-control-wrapper {
+ width: 100%!important;
+ }
}
}
\ No newline at end of file
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index c1b02f2..2f3be6d 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -387,7 +387,7 @@
let _this = this
confirm({
- content: `纭畾鍒犻櫎<<${card.label}>>鍚楋紵`,
+ content: `纭畾鍒犻櫎${card.label ? `<<${card.label}>>` : ''}鍚楋紵`,
onOk() {
let _config = fromJS(_this.state.config).toJS()
_config.fields = _config.fields.filter(item => !(item.uuid === card.uuid))
diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 4558e82..e52ef08 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -182,7 +182,11 @@
let _decimal = 0
let _length = 50
if (/^nvarchar/.test(_type)) {
- _length = +_type.match(/\d+/)[0] || 50
+ try { // 瀛樺湪max
+ _length = +_type.match(/\d+/)[0] || 50
+ } catch {
+ _length = 2048
+ }
_type = 'text'
} else if (/^int/.test(_type)) {
_type = 'number'
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d592fe9..759648c 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1934,8 +1934,10 @@
})
}
- if (['textarea', 'fileupload', 'multiselect', 'checkbox', 'brafteditor'].includes(card.type)) {
+ if (['fileupload', 'multiselect', 'checkbox'].includes(card.type)) {
_fieldlength = 512
+ } else if (['textarea', 'brafteditor'].includes(card.type)) {
+ _fieldlength = 8000
}
return [
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 7345e71..dd53a73 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -235,7 +235,7 @@
}
} else if (form.key === 'fieldlength') {
form.initVal = 50
- if (value === 'textarea') {
+ if (value === 'textarea' || value === 'brafteditor') {
form.initVal = 8000
} else if (value === 'fileupload' || value === 'multiselect' || value === 'checkbox') {
form.initVal = 512
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 9f5a944..f963206 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -906,7 +906,7 @@
{
obj_name: 'modularDetail',
arr_field: 'ModularDetailCode,CodeName,BID,Type',
- LText: window.btoa(window.encodeURIComponent(`select distinct ModularDetailCode,ModularDetailCode+ModularDetailName as CodeName,ModularCode as BID,Type from sModularDetail where Appkey= @Appkey@ and deleted=0 order by ModularDetailCode`))
+ LText: window.btoa(window.encodeURIComponent(`select distinct ModularDetailCode,ModularDetailCode+ModularDetailName as CodeName,ModularCode as BID,Type from sModularDetail where Appkey= @Appkey@ and deleted=0 order by ModularDetailCode desc`))
},
{
obj_name: 'voucher',
@@ -921,7 +921,7 @@
select distinct a.ModularDetailCode,a.ModularDetailCode+ModularDetailName as CodeName,ModularCode as BID, VoucherTypeTwo, IDefine1
from (select * from sModularDetail where Deleted=0 and VoucherTypeTwo!='' and Appkey='') a
left join (select distinct ModularDetailCode from sModularDetail where Deleted=0 and VoucherTypeTwo!=''
- and Appkey=@Appkey@) m on a.ModularDetailCode=m.ModularDetailCode where m.ModularDetailCode is null order by ModularDetailCode`
+ and Appkey=@Appkey@) m on a.ModularDetailCode=m.ModularDetailCode where m.ModularDetailCode is null order by ModularDetailCode desc`
))
},
{
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 1d232a8..4d1f7eb 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -100,6 +100,9 @@
localStorage.setItem(_url + 'lang', param.lang || 'zh-CN')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
+
+ sessionStorage.removeItem('visitorUserID')
+ sessionStorage.removeItem('visitorLoginUID')
if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage
localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password}))))
@@ -167,6 +170,9 @@
localStorage.setItem(_url + 'lang', param.lang || 'zh-CN')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
+
+ sessionStorage.removeItem('visitorUserID')
+ sessionStorage.removeItem('visitorLoginUID')
let _history = sessionStorage.getItem('history')
if (_history) {
@@ -267,12 +273,8 @@
Api.getTouristMsg().then(result => {
if (result.status) {
- if (result.UserID && !sessionStorage.getItem('UserID')) {
- sessionStorage.setItem('UserID', result.UserID)
- }
- if (result.LoginUID && !sessionStorage.getItem('LoginUID')) {
- sessionStorage.setItem('LoginUID', result.LoginUID)
- }
+ sessionStorage.setItem('visitorUserID', result.UserID || '')
+ sessionStorage.setItem('visitorLoginUID', result.LoginUID || '')
if (result.UserID && result.LoginUID) {
this.setState({touristLogin: true})
@@ -285,6 +287,8 @@
LText: `select '${window.GLOB.appkey}'`,
}
+ _param.userid = result.UserID
+ _param.LoginUID = result.LoginUID
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
@@ -379,11 +383,28 @@
}
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 => {
+ Api.getLocalConfig ({
+ func: 's_Get_local_u_deleted',
+ users_upt_date: res.users_upt_date,
+ userid: result.UserID,
+ LoginUID: result.LoginUID
+ }).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 => {
+ 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,
+ userid: result.UserID,
+ LoginUID: result.LoginUID
+ }).then(ssores => {
if (!ssores.status) return
- Api.getLocalConfig ({func: 's_get_local_u_create', user_ids_local: ssores.user_ids_local})
+ Api.getLocalConfig ({
+ func: 's_get_local_u_create',
+ user_ids_local: ssores.user_ids_local,
+ userid: result.UserID,
+ LoginUID: result.LoginUID
+ })
})
})
}
diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index d781667..fcf0a71 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -211,6 +211,9 @@
param.LText = md5(`${_phone}mingke${window.GLOB.appkey}${param.timestamp}`)
param.secretkey = md5(`${param.LText}mingke${param.timestamp}`)
+ param.userid = sessionStorage.getItem('visitorUserID') || ''
+ param.LoginUID = sessionStorage.getItem('visitorLoginUID') || ''
+
this.setState({
verdisabled: true,
delay: 60
--
Gitblit v1.8.0