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/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 2 +-
src/templates/zshare/verifycard/index.jsx | 2 +-
src/templates/calendarconfig/index.jsx | 23 ++++++++++-------------
src/views/mobdesign/index.jsx | 3 +++
src/templates/calendarconfig/calcomponent/index.jsx | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/templates/calendarconfig/calcomponent/index.jsx b/src/templates/calendarconfig/calcomponent/index.jsx
index d295d36..92d1a73 100644
--- a/src/templates/calendarconfig/calcomponent/index.jsx
+++ b/src/templates/calendarconfig/calcomponent/index.jsx
@@ -73,7 +73,7 @@
{/* 璁剧疆鍏ㄥ眬閰嶇疆鍙婂垪琛ㄦ暟鎹簮 */}
<Modal
wrapClassName="model-calendar-setting-modal"
- title={dict['model.edit']}
+ title="鏃ュ巻鍏宠仈瀛楁"
visible={visible}
width={700}
maskClosable={false}
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
}
diff --git a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
index 36a31c8..b4622fd 100644
--- a/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
@@ -313,7 +313,7 @@
</Radio.Group>)}
</Form.Item>
</Col>
- <Col span={12}>
+ <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
<QuestionCircleOutlined className="mk-form-tip" />
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index b96e7a0..94e8755 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1341,7 +1341,7 @@
duration: 5
})
return
- } else if (verify.invalid === 'true' && setting.maxScript && setting.maxScript >= 100) {
+ } else if (verify.invalid === 'true' && setting.maxScript && setting.maxScript >= 300) {
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑鑷畾涔夎剼鏈繃浜庡鏉傦紝涓嶈兘浣跨敤澶辨晥楠岃瘉锛�',
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index ff03285..dff1573 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -863,6 +863,9 @@
if (config.components.findIndex(item => item.type === 'login') > -1) {
roleParam.login = true
+ config.loginview = true
+ } else {
+ config.loginview = false
}
let param = {
--
Gitblit v1.8.0