From 1e4a7720c748bc0206b02b30f4a2e0b3dafb54f3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 13:31:13 +0800
Subject: [PATCH] 2024-02-19
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 898ff9a..52ac1b9 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -110,7 +110,7 @@
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']
+ range: ['label', 'type', 'field', 'initval', 'match', 'ratio', 'blacklist', 'Hide', 'required', 'maxValue', 'minValue', 'step', 'labelShow', 'query', 'labelwidth', 'advanced']
}
class MainSearch extends Component {
@@ -831,35 +831,45 @@
if (values.type === 'range') {
let error = ''
- if (values.maxValue <= values.minValue) {
- error = '鏈�澶у�煎繀椤诲ぇ浜庢渶灏忓��'
- } else if (values.step <= 0) {
- error = '姝ラ暱蹇呴』澶т簬0'
- } else {
- let s = (values.maxValue - values.minValue) / values.step
- if (s !== parseInt(s)) {
- error = '姝ラ暱蹇呴』琚� (max - min) 鏁撮櫎'
+ if (sessionStorage.getItem('appType') === 'mob') {
+ if (values.maxValue <= values.minValue) {
+ error = '鏈�澶у�煎繀椤诲ぇ浜庢渶灏忓��'
+ } else if (values.step <= 0) {
+ error = '姝ラ暱蹇呴』澶т簬0'
+ } else {
+ let s = (values.maxValue - values.minValue) / values.step
+ if (s !== parseInt(s)) {
+ error = '姝ラ暱蹇呴』琚� (max - min) 鏁撮櫎'
+ }
}
- }
- if (!error && values.initval) {
+ if (!error && values.initval) {
+ let vals = values.initval.split(',')
+ if (vals.length !== 2) {
+ error = '鍒濆鍊艰缃敊璇紒'
+ } else if (isNaN(parseFloat(vals[0])) || isNaN(parseFloat(vals[1]))) {
+ error = '鍒濆鍊艰缃敊璇紒'
+ } else {
+ let start = parseFloat(vals[0])
+ let end = parseFloat(vals[1])
+ let s = (values.maxValue - start) / values.step
+ let e = (values.maxValue - end) / values.step
+ if (start > end || start < values.minValue || end > values.maxValue) {
+ error = '鍒濆鍊艰缃敊璇紒'
+ } else if (s !== parseInt(s) || e !== parseInt(e)) {
+ error = '鍒濆鍊艰缃敊璇紒'
+ }
+ }
+ }
+ } else if (values.initval) {
let vals = values.initval.split(',')
if (vals.length !== 2) {
error = '鍒濆鍊艰缃敊璇紒'
} else if (isNaN(parseFloat(vals[0])) || isNaN(parseFloat(vals[1]))) {
error = '鍒濆鍊艰缃敊璇紒'
- } else {
- let start = parseFloat(vals[0])
- let end = parseFloat(vals[1])
- let s = (values.maxValue - start) / values.step
- let e = (values.maxValue - end) / values.step
- if (start > end || start < values.minValue || end > values.maxValue) {
- error = '鍒濆鍊艰缃敊璇紒'
- } else if (s !== parseInt(s) || e !== parseInt(e)) {
- error = '鍒濆鍊艰缃敊璇紒'
- }
}
}
+
if (error) {
notification.warning({
top: 92,
--
Gitblit v1.8.0