Commit 04a50dc0 by zhaochengxiang

目录等级控制

parent ce05a28b
...@@ -78,6 +78,6 @@ ...@@ -78,6 +78,6 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "http://139.198.126.96:18221", "proxy": "http://139.198.127.28:18189",
"homepage": "http://myhost/data-govern" "homepage": "http://myhost/data-govern"
} }
...@@ -11,7 +11,7 @@ import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from ...@@ -11,7 +11,7 @@ import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from
//内网深交所环境 isSzseEnv true //内网深交所环境 isSzseEnv true
//元曜公网环境 isSzseEnv false //元曜公网环境 isSzseEnv false
export const isSzseEnv = true; export const isSzseEnv = false;
export const inputWidth = isSzseEnv?180:240; export const inputWidth = isSzseEnv?180:240;
......
...@@ -726,12 +726,12 @@ const AssetManageTree = (props) => { ...@@ -726,12 +726,12 @@ const AssetManageTree = (props) => {
} }
if (currentRightClickDir?.type==='custom' if (currentRightClickDir?.type==='custom'
|| getAssetCatalogAuths(app?.dataRoles).indexOf(`L${currentRightClickDir?.level}`) === -1) { || (currentRightClickDir?.resourceType!=='custom'&&getAssetCatalogAuths(app?.dataRoles).indexOf(`L${currentRightClickDir?.level}`) === -1)) {
updateAble = false; updateAble = false;
} }
if ((currentRightClickDir.type==='custom'&&currentRightClickDir.level!==2) if ((currentRightClickDir.type==='custom'&&currentRightClickDir.level!==2)
|| getAssetCatalogAuths(app?.dataRoles).indexOf(`L${currentRightClickDir?.level}`) === -1) { || (currentRightClickDir?.resourceType!=='custom'&&currentRightClickDir.type!=='custom'&&getAssetCatalogAuths(app?.dataRoles).indexOf(`L${currentRightClickDir?.level}`) === -1)) {
deleteAble = false; deleteAble = false;
} }
...@@ -826,7 +826,7 @@ const AssetManageTree = (props) => { ...@@ -826,7 +826,7 @@ const AssetManageTree = (props) => {
onCancel={ onUpdateDirectoryCancel } onCancel={ onUpdateDirectoryCancel }
action={ updateDirectoryAction } action={ updateDirectoryAction }
dirId={ (updateDirectoryAction==='add')?currentDirId:currentRightClickDir.nodeId } dirId={ (updateDirectoryAction==='add')?currentDirId:currentRightClickDir.nodeId }
level={currentRightClickDir?.level} level={(updateDirectoryAction==='add')?currentDir?.level:currentRightClickDir?.level}
/> />
<ImportDirectory <ImportDirectory
visible={ importDirectoryVisible } visible={ importDirectoryVisible }
......
...@@ -52,7 +52,7 @@ const UpdateDirectoryModal = (props) => { ...@@ -52,7 +52,7 @@ const UpdateDirectoryModal = (props) => {
setDir(data); setDir(data);
if (action !== 'add') { if (action !== 'add') {
form.setFieldsValue({ code: data?.code, name: data?.name||'', desc: data?.desc||'', remarks: data?.remarks||'', resourceType: data?.resourceType }); form.setFieldsValue({ code: data?.code, name: data?.name||'', desc: data?.desc||'', remarks: `L${data?.level}`, resourceType: data?.resourceType });
} }
} }
}) })
...@@ -139,7 +139,7 @@ const UpdateDirectoryModal = (props) => { ...@@ -139,7 +139,7 @@ const UpdateDirectoryModal = (props) => {
form.setFieldsValue({ remarks: 'L1' }); form.setFieldsValue({ remarks: 'L1' });
setIsThemeAdd(true); setIsThemeAdd(true);
} else if (changedValues.type === 'directory') { } else if (changedValues.type === 'directory') {
form.setFieldsValue({ remarks: `L${++level}` }); form.setFieldsValue({ remarks: `L${level+1}` });
setIsThemeAdd(false); setIsThemeAdd(false);
} }
} }
...@@ -161,7 +161,7 @@ const UpdateDirectoryModal = (props) => { ...@@ -161,7 +161,7 @@ const UpdateDirectoryModal = (props) => {
themeAble = false; themeAble = false;
} }
if (dirId===null || getAssetCatalogAuths(app?.dataRoles).indexOf(`L${++level}`) === -1) { if (dirId===null || getAssetCatalogAuths(app?.dataRoles).indexOf(`L${level+1}`) === -1 || level === 4) {
catalogAble = false; catalogAble = false;
} }
......
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