From df565b506ddb2bed918befceefddcd529eb58782 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 八月 2020 00:18:17 +0800
Subject: [PATCH] 2020-08-17
---
src/templates/calendarconfig/index.jsx | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/templates/calendarconfig/index.jsx b/src/templates/calendarconfig/index.jsx
index dd221d5..7edfa86 100644
--- a/src/templates/calendarconfig/index.jsx
+++ b/src/templates/calendarconfig/index.jsx
@@ -94,6 +94,12 @@
})
}
+ if (_config.type === 'user') {
+ if (_config.tab) {
+ _config.tab.linkTab = ''
+ }
+ }
+
this.setState({
openEdition: menu.open_edition || '',
optionLibs: optionLibs,
@@ -120,10 +126,10 @@
{color: 'orange', remark: '绯荤粺寮傚父锛岃鍙婃椂澶勭悊锛�'},
{color: 'yellow', remark: '鎮ㄧ殑璁㈠崟寮傚父锛岃鑱旂郴瀹㈡湇锛�'},
{color: 'green', remark: '鎮ㄧ殑璁㈠崟宸插畬鎴愩��'},
- {color: 'lightgreen', remark: '娑堟伅宸插彂閫侊紝璇峰強鏃舵煡鏀躲��'},
{color: 'cyan', remark: '鎮ㄦ湁涓�鏉℃柊鐨勬秷鎭��'},
{color: 'blue', remark: '浠诲姟鏈畬鎴愶紝璇锋敞鎰忓悗缁伐浣溿��'},
- {color: 'purple', remark: '鎮ㄦ湁鏂扮殑浠诲姟绛夊緟澶勭悊锛�'}
+ {color: 'purple', remark: '鎮ㄦ湁鏂扮殑浠诲姟绛夊緟澶勭悊锛�'},
+ {color: 'gray', remark: '鎮ㄦ湁涓�灏佹湭璇婚偖浠躲��'}
]
let mockdata = []
@@ -269,6 +275,12 @@
this.menuformRef.handleConfirm().then(res => {
if (config.isAdd) {
config.search = config.search.filter(item => !item.origin)
+ }
+
+ if (config.type === 'user') { // 浣跨敤宸叉湁鑿滃崟鏃讹紝榛樿娣诲姞鍏宠仈鏍囩id
+ if (config.tab && !config.tab.linkTab) {
+ config.tab.linkTab = Utils.getuuid()
+ }
}
let _LongParam = ''
@@ -682,15 +694,26 @@
*/
verifyconfig = (config) => {
let hasKey = false
- let chartcols = []
+ let cols = []
config.columns.forEach(col => {
if (col.field) {
- chartcols.push(col.field)
+ cols.push(col.field)
}
if (config.setting.primaryKey === col.field) {
hasKey = true
}
})
+
+ let calvaild = true
+ if (!cols.includes(config.calendar.startfield)) {
+ calvaild = false
+ } else if (!cols.includes(config.calendar.endfield)) {
+ calvaild = false
+ } else if (!cols.includes(config.calendar.colorfield)) {
+ calvaild = false
+ } else if (!cols.includes(config.calendar.remarkfield)) {
+ calvaild = false
+ }
if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
@@ -698,6 +721,8 @@
return '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
} else if (!hasKey) {
return '鏄剧ず鍒椾腑涓嶅瓨鍦ㄤ富閿瓧娈碉紝涓嶅彲鍚敤锛�'
+ } else if (!calvaild) {
+ return '鏃ュ巻鍏宠仈瀛楁鏈缃紝涓嶅彲鍚敤锛�'
} else {
return true
}
@@ -778,7 +803,7 @@
const { activeKey, config, tabviews, mockdata, mockloading } = this.state
return (
- <div className="model-subtable-board">
+ <div className="model-calendar-board">
<DndProvider backend={HTML5Backend}>
{/* 宸ュ叿鏍� */}
<div className="tools">
--
Gitblit v1.8.0