From 145c4b6ec2ea4f1dd7986b3179ca505a79bc0598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 八月 2020 17:47:44 +0800
Subject: [PATCH] 2020-08-18
---
src/tabviews/calendar/index.jsx | 42 +++++++++++++++---------------------------
1 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 6c7a7d7..f16d051 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -26,7 +26,7 @@
class NormalTable extends Component {
static propTpyes = {
- param: PropTypes.any, // 鍏朵粬椤甸潰浼犻�掔殑鎼滅储鏉′欢绛夊弬鏁�
+ param: PropTypes.any, // 鍏朵粬椤甸潰浼犻�掔殑鍙傛暟
MenuID: PropTypes.string, // 鑿滃崟Id
MenuNo: PropTypes.string, // 鑿滃崟鍙傛暟
MenuName: PropTypes.string // 鑿滃崟鍚嶇О
@@ -114,15 +114,27 @@
}
}
- // 瀛楁鏉冮檺榛戝悕鍗�
+ if (_curUserConfig) {
+ config.setting = {...config.setting, ..._curUserConfig.setting}
+ config.easyCode = _curUserConfig.easyCode || config.easyCode || ''
+ }
+
+ // 瀛楁鏉冮檺榛戝悕鍗曘�佸繀濉�佸瓧娈甸�忚
+ let valid = true
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 === 'BID') {
+ } 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 (item.required === 'true' && !item.initval) {
+ valid = false
}
if (!item.blacklist || item.blacklist.length === 0) return item
@@ -133,30 +145,6 @@
if (_black.length > 0) {
item.Hide = 'true'
- }
-
- return item
- })
-
- if (_curUserConfig) {
- config.setting = {...config.setting, ..._curUserConfig.setting}
- config.easyCode = _curUserConfig.easyCode || config.easyCode || ''
- }
-
- // 閫忚瀛楁澶勭悊锛屽垵濮嬪寲澶勭悊
- let valid = true
- 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 === 'BID') {
- item.initval = param.BID
- }
- }
-
- if (item.required === 'true' && !item.initval) {
- valid = false
}
return item
--
Gitblit v1.8.0