From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/normalform/modalform/mkRadio/index.jsx | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/components/normalform/modalform/mkRadio/index.jsx b/src/components/normalform/modalform/mkRadio/index.jsx
index 587fef6..818824f 100644
--- a/src/components/normalform/modalform/mkRadio/index.jsx
+++ b/src/components/normalform/modalform/mkRadio/index.jsx
@@ -22,19 +22,17 @@
MKEmitter.addListener('mkFC', this.mkFormControl)
}
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { config } = this.state
-
- if (!is(fromJS(config.oriOptions), fromJS(nextProps.config.oriOptions))) {
+ UNSAFE_componentWillReceiveProps(nextProps) {
+ if (nextProps.config.timestamp && nextProps.config.timestamp !== this.state.config.timestamp) {
this.setState({
config: fromJS(nextProps.config).toJS(),
- options: fromJS(nextProps.config.options).toJS()
+ options: fromJS(nextProps.config.options).toJS(),
})
}
+ }
+
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.state), fromJS(nextState))
}
componentWillUnmount () {
@@ -59,7 +57,7 @@
if (field !== config.field) return
- let options = config.oriOptions ? config.oriOptions.filter(option => option.ParentID === parentId) : []
+ let options = config.oriOptions ? config.oriOptions.filter(option => option.ParentID === parentId || option.ParentID === '') : []
let val = options[0] ? options[0].value : ''
this.setState({
--
Gitblit v1.8.0