Skip to content

S
szse
Commit 3f1d16ff by zhaochengxiang
Options

bug fix

parent b182e525
Showing with 14 additions and 14 deletions
src/view/Manage/AssetManage/Component/AssetAction.jsx
......@@ -85,7 +85,7 @@ const AssetAction = (props) => {
width: 170,
fixed: 'right',
render: (_, record) => {
return (reference===AssetManageReference||canEdit) ? <Space>
return !readonly && (reference===AssetManageReference||canEdit) ? <Space>
<Button
size='small'
onClick={() => {
......@@ -825,26 +825,26 @@ const AssetAction = (props) => {
const timestamp = new Date().getTime();
if (item.resourceType==='innerSource'||item.resourceType==='outerSource') {
window.open(`/center-home/menu/asset-resource-browse?${AnchorId}=${item?.dataAssetId}&${AnchorDirId}=${item?.dirId}&timestamp=${timestamp}`);
window.open(`/center-home/menu/asset-resource-browse?${AnchorId}=${item?.dataAssetId??''}&${AnchorDirId}=${item?.dirId??''}&timestamp=${timestamp}`);
} else if (item.resourceType==='dataAsset') {
window.open(`/center-home/menu/asset-browse?${AnchorId}=${item?.dataAssetId}&${AnchorDirId}=${item?.dirId}&templateType=${assets?.templateType}&timestamp=${timestamp}`);
window.open(`/center-home/menu/asset-browse?${AnchorId}=${item?.dataAssetId??''}&${AnchorDirId}=${item?.dirId??''}&templateType=${assets?.templateType}&timestamp=${timestamp}`);
} else {
showMessage('warn', '资产目录类型不是资源也不是资产!');
}
}
const jumpToRelation = (relation) => {
const timestamp = new Date().getTime();
// const jumpToRelation = (relation) => {
// const timestamp = new Date().getTime();
if (relation.resourceType==='innerSource'||relation.resourceType==='outerSource') {
window.open(`/center-home/menu/asset-resource-browse?${AnchorId}=${relation?.dataAssetId}&${AnchorDirId}=${relation?.dirId}&timestamp=${timestamp}`);
} else if (relation.resourceType==='dataAsset') {
window.open(`/center-home/menu/asset-browse?${AnchorId}=${relation?.dataAssetId}&${AnchorDirId}=${relation?.dirId}&timestamp=${timestamp}`);
} else {
showMessage('warn', '资产目录类型不是资源也不是资产!');
}
}
// if (relation.resourceType==='innerSource'||relation.resourceType==='outerSource') {
// window.open(`/center-home/menu/asset-resource-browse?${AnchorId}=${relation?.dataAssetId}&${AnchorDirId}=${relation?.dirId}&timestamp=${timestamp}`);
// } else if (relation.resourceType==='dataAsset') {
// window.open(`/center-home/menu/asset-browse?${AnchorId}=${relation?.dataAssetId}&${AnchorDirId}=${relation?.dirId}&timestamp=${timestamp}`);
// } else {
// showMessage('warn', '资产目录类型不是资源也不是资产!');
// }
// }
const onOk = async() => {
try {
......@@ -1384,7 +1384,7 @@ const AssetAction = (props) => {
</div>
<Space style={{ marginLeft: 'auto' }}>
{
(reference===AssetManageReference||(reference!==AssetDraftReference&&canEdit)) && <React.Fragment>
!readonly && (reference===AssetManageReference||(reference!==AssetDraftReference&&canEdit)) && <React.Fragment>
{
isMetadataEdit ? <React.Fragment>
<Button onClick={() => {
......
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