From 6b699dc5a69457d76577d17903d54011a6561d97 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:48:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/mkSelect/index.jsx | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
index c46e4ed..c8af8d3 100644
--- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
@@ -18,12 +18,11 @@
value = []
}
} else if (value) {
- let option = null
- option= config.oriOptions[0]
- if (typeof(value) === 'string' && option && typeof(option.value) === 'number') {
- value = +value
- if (isNaN(value)) {
- value = config.initval
+ let option = config.oriOptions[0]
+
+ if (option && typeof(option.value) !== typeof(value)) {
+ if (typeof(option.value) === 'number' && !isNaN(value)) {
+ value = +value
}
}
}
@@ -57,20 +56,16 @@
options: fromJS(nextProps.config.options).toJS()
})
+ let option = nextProps.config.oriOptions[0]
if (config.$first) {
this.setState({
value: nextProps.config.initval,
})
- } else {
- let option = null
- option= nextProps.config.oriOptions[0]
- if (option && typeof(option.value) === 'number') {
- let val = +value
- if (!isNaN(val)) {
- this.setState({
- value: val
- })
- }
+ } else if (option && typeof(option.value) !== typeof(value)) {
+ if (typeof(option.value) === 'number' && !isNaN(value)) {
+ this.setState({
+ value: +value
+ })
}
}
}
--
Gitblit v1.8.0