From 31bb94859846652781c9c9795b567fde5ca0ddb6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 十一月 2021 11:59:54 +0800
Subject: [PATCH] 2021-11-25
---
src/templates/calendarconfig/index.jsx | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/templates/calendarconfig/index.jsx b/src/templates/calendarconfig/index.jsx
index e63eef9..828cef0 100644
--- a/src/templates/calendarconfig/index.jsx
+++ b/src/templates/calendarconfig/index.jsx
@@ -662,23 +662,20 @@
}
})
- 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 === 'system' && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (config.columns.length === 0) {
- return '鑿滃崟灏氭湭璁剧疆鏁版嵁瀛楁锛屼笉鍙惎鐢紒'
- } else if (!calvaild) {
+ return '鑿滃崟灏氭湭璁剧疆瀛楁闆嗭紝涓嶅彲鍚敤锛�'
+ } else if (!config.calendar.startfield) {
return '鏃ュ巻鍏宠仈瀛楁鏈缃紝涓嶅彲鍚敤锛�'
+ } else if (!cols.includes(config.calendar.startfield)) {
+ return '寮�濮嬫椂闂村瓧娈靛凡鍒犻櫎锛屼笉鍙惎鐢紒'
+ } else if (!cols.includes(config.calendar.endfield)) {
+ return '缁撴潫鏃堕棿瀛楁宸插垹闄わ紝涓嶅彲鍚敤锛�'
+ } else if (config.calendar.colorfield && !cols.includes(config.calendar.colorfield)) {
+ return '棰滆壊瀛楁宸插垹闄わ紝涓嶅彲鍚敤锛�'
+ } else if (!cols.includes(config.calendar.remarkfield)) {
+ return '淇℃伅瀛楁宸插垹闄わ紝涓嶅彲鍚敤锛�'
} else {
return true
}
--
Gitblit v1.8.0