Commit e8e1c80f by zhaochengxiang

修改bug

parent 52c48223
......@@ -228,7 +228,7 @@ const AssetManageTree = (props) => {
setAutoExpandParent(true);
setCurrentDirId(defaultItem.nodeId);
setCurrentDirType(defaultItem.resourceType||'');
setCurrentDirType(defaultItem.type||'');
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level);
}
}
......@@ -275,7 +275,7 @@ const AssetManageTree = (props) => {
setAutoExpandParent(true);
setCurrentDirId(defaultItem.nodeId);
setCurrentDirType(defaultItem.resourceType||'');
setCurrentDirType(defaultItem.type||'');
onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level);
}
}
......@@ -350,7 +350,7 @@ const AssetManageTree = (props) => {
(tree||[]).forEach(node => {
if (node.nodeId === key) {
type = node.resourceType||'';
type = node.type||'';
} else if (node.children) {
if (getCurrentType(key, node.children)) {
type = getCurrentType(key, node.children);
......@@ -747,7 +747,7 @@ const AssetManageTree = (props) => {
onRightClick={({event, node}) => {
if (reference === AssetManageReference) {
setCurrentRightClickDir(node);
setCurrentDirType(node.resourceType||'');
setCurrentDirType(node.type||'');
displayMenu(event);
}
}}
......
......@@ -25,6 +25,10 @@ const UpdateDirectoryModal = (props) => {
if (visible) {
setDir(null);
form.resetFields();
if (action === 'add') {
form.setFieldsValue({ resourceType: 'dataAsset' });
}
if ((dirId||'')!=='') {
getDirectory();
......@@ -63,7 +67,7 @@ const UpdateDirectoryModal = (props) => {
name: row.name,
desc: row.desc,
remarks: row.remarks,
resourceType: row.resourceType
resourceType: row.resourceType,
}
};
......@@ -181,7 +185,10 @@ const UpdateDirectoryModal = (props) => {
name="resourceType"
rules={[{ required: false }]}
>
<Select allowClear>
<Select
allowClear
disabled={action!=='add'}
>
{
resourceTypes.map((item,index) => {
return <Select.Option key={item.key}>{item.name}</Select.Option>
......
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