Commit 38dd0094 by zhaochengxiang

bug

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