From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 2a87811..cd13077 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -240,6 +240,10 @@
}
shows.push('linkField')
reRequired.linkField = false
+ } else if (type === 'daterange' || type === 'datemonth') {
+ if (this.record.initval) {
+ shows.push('dateShift')
+ }
}
if (dateOptions.hasOwnProperty(type)) { // 鏍规嵁鎼滅储鏉′欢绫诲瀷锛岄�夋嫨鍒濆鍊肩殑绫诲瀷鍙婃暟鎹�
@@ -509,7 +513,7 @@
rules = [
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
- if (item.key === 'field' || item.key === 'datefield') {
+ if (item.key === 'field' || item.key === 'datefield' || item.key === 'dateShift') {
rules.push({
pattern: (type === 'text' || type === 'select' || type === 'daterange') ? formRule.field.multipattern : formRule.field.pattern,
message: formRule.field.message
--
Gitblit v1.8.0