Commit 5b49f214 by zhaochengxiang

资产自定义增加isCustomDir

parent 9cbd9102
...@@ -92,7 +92,7 @@ const AssetBrowse = (props) => { ...@@ -92,7 +92,7 @@ const AssetBrowse = (props) => {
</React.Fragment> </React.Fragment>
} }
<div style={{ flex: 1, overflow: 'hidden' }}> <div style={{ flex: 1, overflow: 'hidden' }}>
<AssetTable node={{ nodeId }} onFullScreenChange={onFullScreenChange} {...props} /> <AssetTable node={{ nodeId, type: nodeParams.nodeType }} onFullScreenChange={onFullScreenChange} {...props} />
</div> </div>
</div> </div>
<div className='tree-toggle' onClick={treeToggleClick}> <div className='tree-toggle' onClick={treeToggleClick}>
......
...@@ -272,6 +272,7 @@ const FC = (props) => { ...@@ -272,6 +272,7 @@ const FC = (props) => {
keyword: args.params.keyword, keyword: args.params.keyword,
range: getAssetRange(AssetBrowseReference), range: getAssetRange(AssetBrowseReference),
recursive, recursive,
isCustomDir: (node?.resourceType==='custom'||node?.type==='custom')
} }
}, },
callback: data => { callback: data => {
......
...@@ -417,6 +417,7 @@ const FC = (props) => { ...@@ -417,6 +417,7 @@ const FC = (props) => {
range: getAssetRange(AssetManageReference), range: getAssetRange(AssetManageReference),
publishStatus: args.params.publishStatus, publishStatus: args.params.publishStatus,
recursive, recursive,
isCustomDir: (node?.resourceType==='custom'||node?.type==='custom')
} }
}, },
callback: data => { callback: data => {
......
...@@ -83,7 +83,7 @@ const FC = (props) => { ...@@ -83,7 +83,7 @@ const FC = (props) => {
{g.text} {g.text}
{ {
//自定义类型栏目不统计资产数 //自定义类型栏目不统计资产数
(g.level === 1 && g.resourceType === 'custom') ? null : <span>{` (${g.dataAssetAndSubDirCount})`}</span> (g.level === 1 && (g.resourceType === 'custom') || g.type === 'custom') ? null : <span>{` (${g.dataAssetAndSubDirCount})`}</span>
} }
</span> </span>
) )
......
...@@ -91,7 +91,7 @@ const FC = (props) => { ...@@ -91,7 +91,7 @@ const FC = (props) => {
</React.Fragment> </React.Fragment>
} }
<div style={{ flex: 1, overflow: 'hidden' }}> <div style={{ flex: 1, overflow: 'hidden' }}>
<AssetTable node={{ nodeId }} onFullScreenChange={onFullScreenChange} {...props} /> <AssetTable node={{ nodeId, type: nodeParams.nodeType }} onFullScreenChange={onFullScreenChange} {...props} />
</div> </div>
</div> </div>
<div className='tree-toggle' onClick={treeToggleClick}> <div className='tree-toggle' onClick={treeToggleClick}>
......
...@@ -272,6 +272,7 @@ const FC = (props) => { ...@@ -272,6 +272,7 @@ const FC = (props) => {
keyword: args.params.keyword, keyword: args.params.keyword,
range: getAssetRange(ResourceBrowseReference), range: getAssetRange(ResourceBrowseReference),
recursive, recursive,
isCustomDir: (node?.resourceType==='custom'||node?.type==='custom')
} }
}, },
callback: data => { callback: data => {
......
...@@ -519,6 +519,7 @@ const FC = (props) => { ...@@ -519,6 +519,7 @@ const FC = (props) => {
sortingStatus: args.params.sortingStatus, sortingStatus: args.params.sortingStatus,
recursive, recursive,
filterTodo: args.params.onlyPending, filterTodo: args.params.onlyPending,
isCustomDir: (node?.resourceType==='custom'||node?.type==='custom')
} }
}, },
callback: data => { callback: data => {
......
...@@ -112,7 +112,7 @@ const FC = (props) => { ...@@ -112,7 +112,7 @@ const FC = (props) => {
{g.text} {g.text}
{ {
//自定义类型栏目不统计资源数 //自定义类型栏目不统计资源数
(g.level === 1 && g.resourceType === 'custom') ? null : <span>{` (${g.dataAssetAndSubDirCount})`}</span> (g.level === 1 && (g.resourceType === 'custom') || g.type === 'custom') ? null : <span>{` (${g.dataAssetAndSubDirCount})`}</span>
} }
</span> </span>
) )
......
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