Commit 395c6459 authored by zhangwenshuai's avatar zhangwenshuai

update edit select,search,assoSearch ui

parent ed000638
...@@ -5,5 +5,10 @@ ...@@ -5,5 +5,10 @@
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
border-radius: 0; border-radius: 0;
display: flex;
align-items: center;
}
:global(.ant-select-selection__rendered){
width: 100%;
} }
} }
...@@ -12,4 +12,7 @@ ...@@ -12,4 +12,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
:global(.ant-select-selection__rendered){
width: 100%;
}
} }
...@@ -2,7 +2,6 @@ import React from 'react'; ...@@ -2,7 +2,6 @@ import React from 'react';
import { Spin, Select } from 'antd'; import { Spin, Select } from 'antd';
import lodash from 'lodash'; import lodash from 'lodash';
import { Consumer } from '../../../context'; import { Consumer } from '../../../context';
import s from './index.less';
interface Props { interface Props {
initDataType?: undefined | 'onfocus'; // 初始化请求方式 initDataType?: undefined | 'onfocus'; // 初始化请求方式
...@@ -20,6 +19,12 @@ interface Props { ...@@ -20,6 +19,12 @@ interface Props {
}; };
} }
enum Loaded {
Init='init',
Has='has',
Empty='empty',
}
interface State { interface State {
value: any; value: any;
data: any[]; data: any[];
...@@ -28,6 +33,7 @@ interface State { ...@@ -28,6 +33,7 @@ interface State {
initData: any[]; initData: any[];
searchStr: string; searchStr: string;
canFocus: boolean; canFocus: boolean;
loaded: Loaded;
} }
class AssociationSearch extends React.Component<Props, State> { class AssociationSearch extends React.Component<Props, State> {
...@@ -42,6 +48,7 @@ class AssociationSearch extends React.Component<Props, State> { ...@@ -42,6 +48,7 @@ class AssociationSearch extends React.Component<Props, State> {
initData: [], initData: [],
searchStr: '', searchStr: '',
canFocus: true, canFocus: true,
loaded: Loaded.Init,
}; };
} }
...@@ -89,7 +96,7 @@ class AssociationSearch extends React.Component<Props, State> { ...@@ -89,7 +96,7 @@ class AssociationSearch extends React.Component<Props, State> {
} else { } else {
data = Array.isArray(dataSource) ? dataSource : []; data = Array.isArray(dataSource) ? dataSource : [];
} }
this.setState({ data, fetching: false }); this.setState({ data, loaded: data.length > 0 ? Loaded.Has : Loaded.Empty, fetching: false });
}; };
onSearch = (val: string) => { onSearch = (val: string) => {
...@@ -207,23 +214,23 @@ class AssociationSearch extends React.Component<Props, State> { ...@@ -207,23 +214,23 @@ class AssociationSearch extends React.Component<Props, State> {
} }
}; };
notFoundContent = (locale) => { notFoundContent = (locale:any) => {
const { data, fetching, value } = this.state; const { fetching, loaded } = this.state;
if (fetching) { if (fetching) {
return <Spin size="small" />; return <Spin size="small" />;
} }
if (!data || data.length === 0) { if (loaded === Loaded.Empty) {
return <span style={{ fontSize: '12px' }}>{locale.notFoundContent}</span>; return <span style={{ fontSize: '12px' }}>{locale.notFoundContent}</span>;
} }
return null; return null;
}; };
render() { render() {
const { data, fetching, value } = this.state; const { data, value } = this.state;
const { selfCom, autoFocus, onChange, ...rest } = this.props; const { selfCom, autoFocus, onChange, ...rest } = this.props;
return ( return (
<Consumer> <Consumer>
{({ locale }) => { {({ locale }:any) => {
return ( return (
<Select <Select
filterOption={false} filterOption={false}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment