项目上下移动

src/model/datamodel.js

@@ -688,6 +688,10 @@ export function* getAllBranches() {
   return yield call(datamodelerService.getAllBranches)
 }
 
+export function* upDownBranch(payload) {
+  return yield call(datamodelerService.upDownBranch, payload)
+}
+
 export function* saveBranch(payload) {
   return yield call(datamodelerService.saveBranch, payload)
 }

src/service/datamodeler.js

@@ -640,6 +640,10 @@ export function getAllBranches() {
   return GetJSON("/datamodeler/easyDataModelerBranching/getAllBranches")
 }
 
+export function upDownBranch(payload) {
+  return GetJSON("/datamodeler/easyDataModelerBranching/moveBranchUpOrDown", payload)
+}
+
 export function saveBranch(payload) {
   return PostJSON("/datamodeler/easyDataModelerBranching/saveBranch", payload)
 }

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

@@ -426,20 +426,37 @@ const ModelTree = (props) => {
 
   const moveNode = (steps) => {
     setLoading(true);
-    dispatch({
-      type: 'datamodel.upDownModelCatalog',
-      payload: {
-        modelCatalogId: currentRightClickDir.id,
-        steps
-      },
-      callback: () => {
-        showMessage('success', (steps===-1)?'上移目录成功':'下移目录成功');
-        getDirTreeData(item.id);
-      }, 
-      error: () => {
-        setLoading(false);
-      }
-    });
+    if (viewSelectedKey === 'dir') {
+      dispatch({
+        type: 'datamodel.upDownModelCatalog',
+        payload: {
+          modelCatalogId: currentRightClickDir.id,
+          steps
+        },
+        callback: () => {
+          showMessage('success', (steps===-1)?'上移目录成功':'下移目录成功');
+          getDirTreeData(item.id);
+        }, 
+        error: () => {
+          setLoading(false);
+        }
+      });
+    } else if (viewSelectedKey === 'branch') {
+      dispatch({
+        type: 'datamodel.upDownBranch',
+        payload: {
+          id: currentRightClickDir.id,
+          steps
+        },
+        callback: () => {
+          showMessage('success', (steps===-1)?'上移项目成功':'下移项目成功');
+          getBranchTreeData(item.id)
+        }, 
+        error: () => {
+          setLoading(false);
+        }
+      });
+    }
   }
 
   const deleteNode = () => {
@@ -753,13 +770,13 @@ const ModelTree = (props) => {
             </RcItem>
           }
           {
-            viewSelectedKey === 'dir' && <RcItem id="up" onClick={() => { moveNode(-1); }}>
-              上移目录
+            (viewSelectedKey==='dir'||viewSelectedKey==='branch') && <RcItem id="up" onClick={() => { moveNode(-1); }}>
+              { viewSelectedKey==='branch' ? '上移项目' : '上移目录'}
             </RcItem>
           } 
           {
-            viewSelectedKey === 'dir' && <RcItem id="down" onClick={() => { moveNode(1); }}>
-              下移目录
+            (viewSelectedKey==='dir'||viewSelectedKey==='branch') && <RcItem id="down" onClick={() => { moveNode(1); }}>
+              { viewSelectedKey==='branch' ? '下移项目' : '下移目录'}
             </RcItem>
           } 
           {