Commit 38dd0094 by zhaochengxiang

bug

parent 87fe3060
...@@ -182,20 +182,20 @@ const ModelTable = (props) => { ...@@ -182,20 +182,20 @@ const ModelTable = (props) => {
} }
const fixedCols = [ const fixedCols = [
{ // {
title: '路径', // title: '路径',
dataIndex: 'path', // dataIndex: 'path',
width: 120, // width: 120,
ellipsis: true, // ellipsis: true,
filter: false, // filter: false,
render: (text, _, __) => { // render: (text, _, __) => {
return ( // return (
<Tooltip title={text||''}> // <Tooltip title={text||''}>
<Text ellipsis={true}>{text||''}</Text> // <Text ellipsis={true}>{text||''}</Text>
</Tooltip> // </Tooltip>
) // )
} // }
}, // },
{ {
title: '状态', title: '状态',
dataIndex: 'state', dataIndex: 'state',
...@@ -228,11 +228,13 @@ const ModelTable = (props) => { ...@@ -228,11 +228,13 @@ const ModelTable = (props) => {
ellipsis: true, ellipsis: true,
filter: false, filter: false,
render: (editor, record) => { render: (editor, record) => {
return <SelectUser const user = users?.filter((user)=>user.pernr===editor);
type='detail' if (user && user.length > 0) {
users={users} return <Tooltip title={user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr}>
value={editor} <Text ellipsis={true}>{user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr}</Text>
/>; </Tooltip>
}
return editor;
} }
}, },
] ]
...@@ -561,11 +563,13 @@ const ModelTable = (props) => { ...@@ -561,11 +563,13 @@ const ModelTable = (props) => {
if (item.userSelected === true) { if (item.userSelected === true) {
col.render = (_, record) => { col.render = (_, record) => {
return <SelectUser const user = users?.filter((user)=>(user.pernr===record.basicInfo?.[item.key]));
type='detail' if (user && user.length > 0) {
users={users} return <Tooltip title={user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr}>
value={record.basicInfo?.[item.key]} <Text ellipsis={true}>{user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr}</Text>
/>; </Tooltip>
}
return record.basicInfo?.[item.key];
}; };
} }
......
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