分支管理员

src/model/datamodel.js

@@ -346,6 +346,10 @@ export function* getPrivilegeAdmin() {
   return yield call(datamodelerService.getPrivilegeAdmin);
 }
 
+export function* getPrivilegeBranchAdmin() {
+  return yield call(datamodelerService.getPrivilegeBranchAdmin);
+}
+
 export function* getModelPrivilege(payload) {
   return yield call(datamodelerService.getModelPrivilege, payload)
 }

src/service/datamodeler.js

@@ -297,6 +297,10 @@ export function getPrivilegeAdmin() {
   return Get("/datamodeler/easyDataModelerPrivilegeProvider/getAdmin");
 }
 
+export function getPrivilegeBranchAdmin() {
+  return Get("/datamodeler/easyDataModelerPrivilegeProvider/getBranchAdmin");
+}
+
 export function getModelPrivilege(payload) {
   return GetJSON("/datamodeler/easyDataModelerPrivilegeProvider/getModelFullPrivilege", payload);
 }

src/view/Manage/Model/Component/ModelTree.jsx

@@ -61,7 +61,8 @@ const ModelTree = (props) => {
   const [ searchKeyword, setSearchKeyword ] = useState('');
   const [ dataList, setDataList ] = useState([]);
   const [options, setOptions] = useState([]);
-  const [ isAdmin, setAdmin ] = useState(false);
+  const [isAdmin, setAdmin] = useState(false);
+  const [isBranchAdmin, setBranchAdmin] = useState(false);
   const [loadingRoot, setLoadingRoot] = useState(false);
 
   const [modal, contextHolder] = Modal.useModal();
@@ -73,6 +74,7 @@ const ModelTree = (props) => {
   useEffect(() => {
     getShowSyncAndDomains();
     getPrivilegeAdmin();
+    getPrivilegeBranchAdmin();
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -147,6 +149,15 @@ const ModelTree = (props) => {
     });
   }
 
+  const getPrivilegeBranchAdmin = () => {
+    dispatch({
+      type: 'datamodel.getPrivilegeBranchAdmin',
+      callback: data => {
+        setBranchAdmin(data==='true'?true:false);
+      }
+    });
+  }
+
   const getDataModelLocationThenGetDirTreeData = () => {
     setLoading(true);
     dispatch({
@@ -633,7 +644,7 @@ const ModelTree = (props) => {
         </Dropdown>
 
         {
-          ((viewSelectedKey==='dir'||viewSelectedKey==='branch')&&isAdmin) && ( 
+          ((viewSelectedKey==='dir'&&isAdmin) || (viewSelectedKey==='branch'&&(isAdmin||isBranchAdmin))) && ( 
             <Tooltip title={(viewSelectedKey==='dir')?"新增目录":'新增项目'}>
               <PlusOutlined className='default' onClick={add} style={{ fontSize:16,cursor:'pointer' }} />
             </Tooltip>