From 81c3fd3ac5017591d987d9c9fe42042fae5c7d7d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 十一月 2021 14:30:47 +0800
Subject: [PATCH] 2021-11-30
---
src/tabviews/zshare/mutilform/mkSelect/index.jsx | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
index 3e73927..86ff5c5 100644
--- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
@@ -17,6 +17,19 @@
} else {
value = []
}
+ } else if (value) {
+ let option = null
+ if (config.setAll === 'true') {
+ option= config.oriOptions[1]
+ } else {
+ option= config.oriOptions[0]
+ }
+ if (typeof(value) === 'string' && option && typeof(option.value) === 'number') {
+ value = +value
+ if (isNaN(value)) {
+ value = config.initval
+ }
+ }
}
this.state = {
@@ -40,7 +53,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,6 +65,21 @@
this.setState({
value: nextProps.config.initval,
})
+ } else {
+ let option = null
+ if (config.setAll === 'true') {
+ option= nextProps.config.oriOptions[1]
+ } else {
+ option= nextProps.config.oriOptions[0]
+ }
+ if (option && typeof(option.value) === 'number') {
+ let val = +value
+ if (!isNaN(val)) {
+ this.setState({
+ value: val
+ })
+ }
+ }
}
}
}
@@ -78,7 +106,7 @@
const { config } = this.state
let options = config.oriOptions.filter(option => option.ParentID === parentId || option.value === '')
- let _option = options[0] || null
+ let _option = options[0] && !options[0].$disabled ? options[0] : null
let val = _option ? _option.value : ''
this.setState({
--
Gitblit v1.8.0