From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/normalform/modalform/mkSelect/index.jsx | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/components/normalform/modalform/mkSelect/index.jsx b/src/components/normalform/modalform/mkSelect/index.jsx
index 840dd4a..39b5546 100644
--- a/src/components/normalform/modalform/mkSelect/index.jsx
+++ b/src/components/normalform/modalform/mkSelect/index.jsx
@@ -31,17 +31,6 @@
MKEmitter.addListener('mkFC', this.mkFormControl)
}
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { config } = this.state
-
- if (!is(fromJS(config.oriOptions), fromJS(nextProps.config.oriOptions))) {
- this.setState({
- config: fromJS(nextProps.config).toJS(),
- options: fromJS(nextProps.config.options).toJS()
- })
- }
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -159,8 +148,8 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={this.mutilselectChange}
>
- {options.map(option =>
- <Select.Option key={option.value} disabled={option.disabled} value={option.value}>{option.label || option.text}</Select.Option>
+ {options.map((option, i) =>
+ <Select.Option key={i} disabled={option.disabled} value={option.value || option.field}>{option.label || option.text}</Select.Option>
)}
</Select>)
}
--
Gitblit v1.8.0