Commit bb959123 by zhaochengxiang

bug fix

parent 6cf7b27a
...@@ -117,7 +117,7 @@ const FilterElementModal = (props) => { ...@@ -117,7 +117,7 @@ const FilterElementModal = (props) => {
}); });
} else { } else {
(elements||[]).forEach(element => { (elements||[]).forEach(element => {
if (element.selectAble === '否') { if (element.defaultSelected === '是') {
_selectedKeys.push(element.id||''); _selectedKeys.push(element.id||'');
} }
}); });
...@@ -213,7 +213,7 @@ const FilterElementModal = (props) => { ...@@ -213,7 +213,7 @@ const FilterElementModal = (props) => {
return ( return (
<Col className='mb-3' key={_index} md={6}> <Col className='mb-3' key={_index} md={6}>
<div className='d-flex'> <div className='d-flex'>
<Checkbox checked={ selectedKeys.indexOf(element.id||'')!==-1 } value={element.id||''} onChange={onCheckChange} disabled={element.selectAble==='否'} > <Checkbox checked={ selectedKeys.indexOf(element.id||'')!==-1 } value={element.id||''} onChange={onCheckChange} disabled={element.defaultSelected==='是'} >
</Checkbox> </Checkbox>
<Typography.Paragraph className='ml-1' title={element.name||''} ellipsis> <Typography.Paragraph className='ml-1' title={element.name||''} ellipsis>
{element.name||''} {element.name||''}
......
...@@ -684,11 +684,11 @@ const FC = (props) => { ...@@ -684,11 +684,11 @@ const FC = (props) => {
title: '提示', title: '提示',
content: '是否导出选中目录下的所有资产?', content: '是否导出选中目录下的所有资产?',
onOk: () => { onOk: () => {
window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dirId=${node?.nodeId}&recursive=${args.params.catalogType === 'currentRecursive'}&dataAsset=${getAssetRange(ResourceManageReference)}`); window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dirId=${node?.nodeId}&recursive=${args.params.catalogType === 'currentRecursive'}&dataAssetType=${getAssetType(ResourceManageReference)}`);
} }
}) })
} else { } else {
window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dataAssetIds=${selectedRows.map(item => item.id).join(',')}&dataAsset=${getAssetRange(ResourceManageReference)}`); window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?dataAssetIds=${selectedRows.map(item => item.id).join(',')}&dataAssetType=${getAssetType(ResourceManageReference)}`);
} }
} }
......
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