Commit 087e03eb by zhaochengxiang

bug fix

parent 51f3911a
......@@ -207,6 +207,8 @@ const AssetAction = (props) => {
}
];
const [cols, setCols] = useState(columns)
useEffect(() => {
getSystems();
getUsers();
......@@ -516,6 +518,22 @@ const AssetAction = (props) => {
}
setMetadataColumnList(newData);
const haveCode = (newData??[]).some(item => item.code)
//字段有编号才显示
if (haveCode) {
setCols(prevCols => {
const newCols = [...prevCols]
newCols.splice(2, 0, {
title: '编号',
dataIndex: 'code',
width: 100,
ellipsis: true,
render: (text, _) => highlightSearchContentByTerms(text||'', terms)
});
return newCols
})
}
},
error: () => {
setLoadingMetadataColumnList(false);
......@@ -886,8 +904,10 @@ const AssetAction = (props) => {
}
const shareAsset = () => {
copy(`${window.location.origin}/center-home/asset-detail?id=${id}&dirId=${dirId}`);
showMessage('success', '已复制到剪贴板');
if ((assets?.dirIds??[]).length > 0) {
copy(`${window.location.origin}/center-home/asset-detail?id=${id}&dirId=${assets?.dirIds[0]}`);
showMessage('success', '已复制到剪贴板');
}
}
const onValuesChange = (changedValues, allValues) => {
......@@ -922,29 +942,7 @@ const AssetAction = (props) => {
flexDirection: 'column',
}}
>
{/* {
(!readonly && (reference===AssetManageReference||canEdit)) && <div className='flex' style={{ justifyContent: 'right' }}>
<Space>
{
currentAction==='detail' ? <Button type='primary' onClick={onActionButtonClick}>编辑</Button> : <React.Fragment>
<Button type='primary' onClick={onCancelButtonClick}>取消</Button>
<Button type='primary' onClick={onActionButtonClick}>保存</Button>
</React.Fragment>
}
<Button type='primary' onClick={onAuthorizationButtonClick}>授权</Button>
{
currentAction === 'detail' && <Button type='primary' onClick={() => {
copy(`/center-home/asset-detail?id=${id}&dirId=${dirId}`);
showMessage('success', '已复制到剪贴板');
}}>分享</Button>
}
</Space>
</div>
} */}
<Spin
spinning={loading}
>
<Spin spinning={loading}>
<div className='flex' style={{ justifyContent: 'right' }}>
{
(reference===AssetManageReference||canEdit) ? <Space>
......@@ -1174,7 +1172,7 @@ const AssetAction = (props) => {
<Table
className='mt-3'
loading={loadingMetadataColumnList}
columns={permissionId?columns:columns.filter(item => item.dataIndex !== 'permission')}
columns={permissionId?cols:cols.filter(item => item.dataIndex !== 'permission')}
rowKey='_id'
dataSource={tableData||[]}
pagination={{
......
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