Commit 0767abb2 by zhaochengxiang

资产挂载样式调整

parent 13ddd590
...@@ -138,8 +138,8 @@ const AssetEdit = (props) => { ...@@ -138,8 +138,8 @@ const AssetEdit = (props) => {
onCancel={() => { onCancel && onCancel(); } } onCancel={() => { onCancel && onCancel(); } }
footer={ footer={
<Space> <Space>
<Button type="primary" onClick={ onOk } loading={ confirmLoading }>提交</Button> <Button onClick={() => onCancel && onCancel() }>取消</Button>
<Button onClick={() => onCancel && onCancel() }>返回</Button> <Button type="primary" onClick={ onOk } loading={ confirmLoading }>确定</Button>
</Space> </Space>
} }
> >
......
...@@ -433,7 +433,8 @@ const AssetTree = (props) => { ...@@ -433,7 +433,8 @@ const AssetTree = (props) => {
const classes = classNames('asset-tree', className, { const classes = classNames('asset-tree', className, {
'asset-tree-read-only': readOnly, 'asset-tree-read-only': readOnly,
'asset-tree-metadata-reference': reference==='metadata' 'asset-tree-metadata-reference': reference==='metadata',
'asset-tree-asset-mount-reference': reference==='mount',
}); });
return ( return (
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
} }
} }
.asset-tree-metadata-reference { .asset-tree-metadata-reference, .asset-tree-asset-mount-reference {
.yy-tree { .yy-tree {
height: 400px !important; height: 400px !important;
overflow: auto !important; overflow: auto !important;
......
...@@ -63,6 +63,7 @@ const AssetMount = (props) => { ...@@ -63,6 +63,7 @@ const AssetMount = (props) => {
checkable={true} checkable={true}
onCheck={onCheck} onCheck={onCheck}
tableId={refrence==='asset-manage'?id:''} tableId={refrence==='asset-manage'?id:''}
reference='mount'
{...props} {...props}
/> />
</Modal> </Modal>
......
...@@ -72,7 +72,7 @@ const ModelTree = (props) => { ...@@ -72,7 +72,7 @@ const ModelTree = (props) => {
useEffect(() => { useEffect(() => {
if (keyword!=='') { if (keyword!=='') {
if (item) { if (item && !prevItem) {
setPrevItem(item); setPrevItem(item);
} }
...@@ -81,6 +81,7 @@ const ModelTree = (props) => { ...@@ -81,6 +81,7 @@ const ModelTree = (props) => {
if (prevItem && !item) { if (prevItem && !item) {
setItem(prevItem); setItem(prevItem);
onSelect && onSelect(prevItem?.key||''); onSelect && onSelect(prevItem?.key||'');
setPrevItem(null);
} }
} }
......
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