Commit b445d700 by zhaochengxiang

bug fix

parent f6468e93
......@@ -23,11 +23,13 @@ const AssetBrowse = (props) => {
const [ assetCount, setAssetCount ] = useState(0);
const [ resizeRelation, setResizeRelation ] = useState(false);
const [ assetFullScreen, setAssetFullScreen ] = useState(false);
const [ nodeAllowdLoadDataAsset, setNodeAllowdLoadDataAsset ] = useState(false);
const { centerId, expandId } = nodeParams;
const onTreeSelect = (value, type) => {
const onTreeSelect = (value, type, allowdLoadDataAsset) => {
setNodeParams({ centerId: value, expandId: '', nodeType: type });
setNodeAllowdLoadDataAsset(allowdLoadDataAsset);
}
const treeToggleClick = () => {
......@@ -88,7 +90,7 @@ const AssetBrowse = (props) => {
// </React.Fragment>
}
<div style={{ flex: 1, overflow: 'hidden' }}>
<AssetTable nodeId={centerId} nodeType={nodeParams.nodeType} reference={reference} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} />
<AssetTable nodeId={centerId} nodeType={nodeParams.nodeType} nodeAllowdLoadDataAsset={nodeAllowdLoadDataAsset} reference={reference} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} />
</div>
</div>
<div className='tree-toggle' onClick={treeToggleClick}>
......
......@@ -1030,7 +1030,7 @@ const AssetTable = (props) => {
>
<Space size={15}>
{
(reference===AssetManageReference && isPostAsset(getTemplateType()) && nodeAllowdLoadDataAsset) && <Button onClick={addAsset}>新增</Button>
((reference===AssetManageReference||isAdmin) && isPostAsset(getTemplateType()) && nodeAllowdLoadDataAsset) && <Button onClick={addAsset}>新增</Button>
}
{
......
......@@ -141,7 +141,7 @@ const AssetTree = (props) => {
if (_dirId) {
getAllDirectoryAsTree(true, _dirId)
} else {
onSelect?.('', '')
onSelect?.('', '', false)
getAllDirectoryAsTree(false)
}
}
......@@ -260,7 +260,7 @@ const AssetTree = (props) => {
setAutoExpandParent(true);
setCurrentDirId(defaultItem.nodeId);
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.allowdLoadDataAsset);
}
......@@ -308,7 +308,7 @@ const AssetTree = (props) => {
setAutoExpandParent(true);
setCurrentDirId(defaultItem.nodeId);
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.allowdLoadDataAsset);
}
}
......@@ -455,11 +455,11 @@ const AssetTree = (props) => {
setCustomDirectoryModalVisible(true);
}
const onTreeSelect = (keys, _) => {
const onTreeSelect = (keys, { node }) => {
if ((keys||[]).length === 0) {
setCurrentDirId();
onSelect?.('', '');
onSelect?.('', '', false);
return;
}
......@@ -467,7 +467,7 @@ const AssetTree = (props) => {
const _currentDirType = getCurrentType(keys[0], treeData);
onSelect && onSelect(keys[0], _currentDirType);
onSelect && onSelect(keys[0], _currentDirType, node.allowdLoadDataAsset);
}
const onExpand = (expandedKeys) => {
......@@ -595,9 +595,9 @@ const AssetTree = (props) => {
LocalStorage.set(`templateType-${appId}`, val);
listSubject.next({ msg: 'templateChange' });
setCurrentDirId();
onSelect?.(null, null);
onSelect?.(null, null, false);
setTimeout(() => {
onSelect?.('', '');
onSelect?.('', '', false);
getAllDirectoryAsTree(false)
}, 100)
}}
......
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