From aa53227bc006816a30258c6390084aa74defb4d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 27 十一月 2023 18:05:55 +0800
Subject: [PATCH] 2023-11-27
---
src/components/normalform/modalform/mkSelect/index.jsx | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/components/normalform/modalform/mkSelect/index.jsx b/src/components/normalform/modalform/mkSelect/index.jsx
index 25c5984..a1b4479 100644
--- a/src/components/normalform/modalform/mkSelect/index.jsx
+++ b/src/components/normalform/modalform/mkSelect/index.jsx
@@ -31,6 +31,17 @@
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))
}
@@ -106,20 +117,40 @@
const { value, config, options } = this.state
if (config.type !== 'multiselect') {
- return (
- <Select
- showSearch
- allowClear
- value={value}
- filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onSelect={this.selectChange}
- onChange={(val) => val === undefined && this.selectChange('')}
- >
- {options.map(option =>
- <Select.Option key={option.value || option.field} disabled={option.disabled} value={option.value || option.field}>{option.label || option.text}</Select.Option>
- )}
- </Select>
- )
+ if (config.extendName) {
+ return (
+ <Select
+ showSearch
+ allowClear
+ value={value}
+ dropdownMatchSelectWidth={config.dropdown !== 'false'}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+ option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onSelect={this.selectChange}
+ onChange={(val) => val === undefined && this.selectChange('')}
+ >
+ {options.map((option, i) =>
+ <Select.Option key={i} disabled={option.disabled} title={option.label || option.text} extend={option[config.extendName] || ''} value={option.value || option.field || ''}>{option.label || option.text}</Select.Option>
+ )}
+ </Select>
+ )
+ } else {
+ return (
+ <Select
+ showSearch
+ allowClear
+ value={value}
+ dropdownMatchSelectWidth={config.dropdown !== 'false'}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onSelect={this.selectChange}
+ onChange={(val) => val === undefined && this.selectChange('')}
+ >
+ {options.map((option, i) =>
+ <Select.Option key={i} disabled={option.disabled} value={option.value || option.field || ''}>{option.label || option.text}</Select.Option>
+ )}
+ </Select>
+ )
+ }
} else {
return (<Select
showSearch
@@ -128,8 +159,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