From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/normalform/modalform/mkSelect/index.jsx | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/src/components/normalform/modalform/mkSelect/index.jsx b/src/components/normalform/modalform/mkSelect/index.jsx
index 69439b4..840dd4a 100644
--- a/src/components/normalform/modalform/mkSelect/index.jsx
+++ b/src/components/normalform/modalform/mkSelect/index.jsx
@@ -3,7 +3,6 @@
import { Select } from 'antd'
import MKEmitter from '@/utils/events.js'
-import './index.scss'
class MKSelect extends Component {
constructor(props) {
@@ -30,6 +29,17 @@
MKEmitter.addListener('mkFP', this.mkFormHandle)
}
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) {
@@ -107,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 id={option.value} title={option.label} key={option.value} value={option.value}>{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
@@ -130,7 +160,7 @@
onChange={this.mutilselectChange}
>
{options.map(option =>
- <Select.Option id={option.value} title={option.label} key={option.value} value={option.value}>{option.label || option.text}</Select.Option>
+ <Select.Option key={option.value} disabled={option.disabled} value={option.value}>{option.label || option.text}</Select.Option>
)}
</Select>)
}
--
Gitblit v1.8.0