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/mkRadio/index.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/mkRadio/index.jsx b/src/tabviews/zshare/mutilform/mkRadio/index.jsx
index a541852..ac79bbf 100644
--- a/src/tabviews/zshare/mutilform/mkRadio/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkRadio/index.jsx
@@ -20,15 +20,11 @@
UNSAFE_componentWillMount () {
const { config } = this.props
let value = config.initval
+ let option = config.oriOptions[0]
- if (value) {
- let option = null
- option= config.oriOptions[0]
- if (typeof(value) === 'string' && option && typeof(option.value) === 'number') {
+ if (value && option && typeof(option.value) !== typeof(value)) {
+ if (typeof(option.value) === 'number' && !isNaN(value)) {
value = +value
- if (isNaN(value)) {
- value = config.initval
- }
}
}
@@ -44,7 +40,7 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { config } = this.state
+ const { config, value } = this.state
if (!is(fromJS(config.oriOptions), fromJS(nextProps.config.oriOptions))) {
this.setState({
@@ -52,10 +48,18 @@
options: fromJS(nextProps.config.options).toJS()
})
+ let option = nextProps.config.oriOptions[0]
+
if (config.$first) {
this.setState({
value: nextProps.config.initval,
})
+ } else if (option && typeof(option.value) !== typeof(value)) {
+ if (typeof(option.value) === 'number' && !isNaN(value)) {
+ this.setState({
+ value: +value
+ })
+ }
}
}
}
--
Gitblit v1.8.0