From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 6588635..95350b6 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -87,6 +87,8 @@
{value: '[7, -7]', label: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', label: '鍓嶅悗30澶�'},
{value: '[90, -90]', label: '鍓嶅悗90澶�'},
+ {value: '[180, -180]', label: '鍓嶅悗180澶�'},
+ {value: '[365, -365]', label: '鍓嶅悗365澶�'},
{value: '[-1, -1]', label: '鏄庡ぉ'},
{value: '[-2, -2]', label: '鍚庡ぉ'}
]
@@ -104,6 +106,8 @@
datemonth: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
daterange: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'precision', 'labelwidth'],
group: ['label', 'type', 'field', 'datefield', 'initval', 'blacklist', 'ratio', 'items', 'required', 'labelShow', 'query', 'labelwidth'],
+ switch: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'openText', 'closeText', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
+ check: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'checkTip', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
range: ['label', 'type', 'field', 'initval', 'match', 'blacklist', 'Hide', 'required', 'maxValue', 'minValue', 'step', 'labelShow', 'query', 'labelwidth']
}
@@ -226,22 +230,24 @@
}
if (type === 'text') {
- reOptions.match = matchReg.text
+ reOptions.match = matchReg.class1
} else if (type === 'multiselect') {
- reOptions.match = matchReg.multiselect
+ reOptions.match = matchReg.class3
} else if (type === 'select' || type === 'link') {
- reOptions.match = matchReg.select
+ reOptions.match = matchReg.class1
+ } else if (type === 'switch' || type === 'check') {
+ reOptions.match = matchReg.class2
} else if (type === 'date') {
- reOptions.match = matchReg.date
+ reOptions.match = matchReg.class4
} else if (type === 'datemonth') {
- reOptions.match = matchReg.datemonth
+ reOptions.match = matchReg.class5
} else if (type === 'dateweek' || type === 'daterange' || type === 'range') {
- reOptions.match = matchReg.daterange
+ reOptions.match = matchReg.class5
} else if (type === 'checkcard') {
if (this.record.multiple === 'false') {
- reOptions.match = matchReg.select
+ reOptions.match = matchReg.class1
} else if (this.record.multiple === 'true') {
- reOptions.match = matchReg.multiselect
+ reOptions.match = matchReg.class3
}
}
@@ -738,6 +744,8 @@
})
return
}
+ } else if (values.type === 'switch' || values.type === 'check') {
+ values.initval = values.initval === values.openVal ? values.openVal : values.closeVal
}
['linkField', 'valueField', 'valueText', 'orderBy'].forEach(item => {
--
Gitblit v1.8.0