|
@@ -19,16 +19,16 @@ const TeamMembers: React.FC<Props> = (props) => {
|
|
|
const [userAll, setUserAll] = useState([])
|
|
|
|
|
|
const userInfo = useModel('@@initialState', model => model.initialState?.currentUser)
|
|
|
- const [userId, setUserId] = useState<any>(userInfo?.userId?.toString())
|
|
|
+ const [userId, setUserId] = useState<number | undefined>(userInfo?.userId ? Number(userInfo?.userId) : undefined)
|
|
|
/*************************/
|
|
|
|
|
|
- useEffect(() => {
|
|
|
- onChange?.(userId)
|
|
|
- }, [userId])
|
|
|
+ // useEffect(() => {
|
|
|
+ // onChange?.(userId)
|
|
|
+ // }, [userId])
|
|
|
|
|
|
useEffect(() => {
|
|
|
if (value) {
|
|
|
- setUserId(value.toString())
|
|
|
+ setUserId(value)
|
|
|
}
|
|
|
}, [value])
|
|
|
|
|
@@ -38,7 +38,7 @@ const TeamMembers: React.FC<Props> = (props) => {
|
|
|
let res = allOfMember?.data || await allOfMember.run()
|
|
|
if (res?.data) {
|
|
|
let useAll: any = []
|
|
|
- res?.data?.forEach((item: { key: { userId: any; nickName: any; }; value: any[]; }) => {
|
|
|
+ res?.data?.forEach((item: { key: { userId: number; nickName: any; }; value: any[]; }) => {
|
|
|
let obj = {
|
|
|
key: item.key.userId,
|
|
|
label: item.key.nickName,
|
|
@@ -71,19 +71,20 @@ const TeamMembers: React.FC<Props> = (props) => {
|
|
|
placeholder='名称搜索'
|
|
|
style={{ width: '100%' }}
|
|
|
showSearch
|
|
|
+ value={userId ? Number(userId) : undefined}
|
|
|
filterOption={(input: any, option: any) => {
|
|
|
return (option!?.children as unknown as string)?.toLowerCase()?.includes(input?.toLowerCase())
|
|
|
}}
|
|
|
loading={allOfMember.loading}
|
|
|
- allowClear
|
|
|
onChange={(value: any) => {
|
|
|
if (value) {
|
|
|
- setUserId(value.toString())
|
|
|
+ setUserId(value)
|
|
|
}
|
|
|
+ onChange?.(value ? value : undefined)
|
|
|
}}
|
|
|
>
|
|
|
{userAll.map((item: any) => {
|
|
|
- return <Select.Option value={item.key} key={item.key}>{item.label}</Select.Option>
|
|
|
+ return <Select.Option value={Number(item.key)} key={item.key}>{item.label}</Select.Option>
|
|
|
})}
|
|
|
</Select>
|
|
|
<Spin className="menus" spinning={allOfMember.loading}>
|
|
@@ -91,11 +92,11 @@ const TeamMembers: React.FC<Props> = (props) => {
|
|
|
id='myMenus'
|
|
|
theme='light'
|
|
|
onClick={(e: any) => {
|
|
|
- setUserId(e.key)
|
|
|
+ setUserId(e.key ? Number(e.key) : undefined)
|
|
|
+ onChange?.(e.key)
|
|
|
}}
|
|
|
- selectedKeys={userId}
|
|
|
+ selectedKeys={userId ? [userId.toString()] : undefined}
|
|
|
mode="inline"
|
|
|
- multiple={false}
|
|
|
items={userAll}
|
|
|
style={{
|
|
|
overflowY: 'auto',
|