From f3167f8371d19d0ea8fe7d0e7af5517ff0b08cd2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 四月 2021 23:25:29 +0800
Subject: [PATCH] 2021-04-07
---
src/tabviews/calendar/index.jsx | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 550326c..6141c25 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -124,14 +124,8 @@
let roleId = sessionStorage.getItem('role_id') || ''
config.search = config.search.map(item => {
item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param) {
- if (param.searchkey === item.field) {
- item.initval = param.searchval
- } else if (param.BID && item.field.toLowerCase() === 'bid') {
- item.initval = param.BID
- } else if (param.data && param.data[item.field]) {
- item.initval = param.data[item.field]
- }
+ if (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
if (item.required === 'true' && !item.initval) {
@@ -175,12 +169,21 @@
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
}
+ if (config.urlFields) {
+ let _param = param || {}
+ config.urlFields.forEach(field => {
+ let reg = new RegExp('@' + field + '@', 'ig')
+ let val = `'${_param[field] || ''}'`
+ config.setting.dataresource = config.setting.dataresource.replace(reg, val)
+ _customScript = _customScript.replace(reg, val)
+ })
+ }
config.setting.customScript = _customScript
}
this.setState({
- BID: param && param.BID ? param.BID : '',
+ BID: param && param.$BID ? param.$BID : '',
loadingview: false,
config: config,
userConfig: userConfig,
@@ -328,6 +331,7 @@
let regoptions = []
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
@@ -343,6 +347,9 @@
}
})
regoptions.push({
+ reg: new RegExp('@login_city@', 'ig'),
+ value: city
+ }, {
reg: new RegExp('@userName@', 'ig'),
value: userName
}, {
@@ -380,8 +387,8 @@
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
- param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${param.custom_script}
`
@@ -464,18 +471,6 @@
UNSAFE_componentWillMount () {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
this.loadconfig()
- }
-
- UNSAFE_componentWillReceiveProps(nextProps) {
- if (nextProps.param && !is(fromJS(this.props.param), fromJS(nextProps.param))) {
- let search = this.state.search.map(item => {
- if (item.type === 'text' && item.key === nextProps.param.searchkey) {
- item.value = nextProps.param.searchval
- }
- return item
- })
- this.refreshbysearch(search)
- }
}
shouldComponentUpdate (nextProps, nextState) {
--
Gitblit v1.8.0