Merge pull request #72 from quick123official/hotfix/2.6.0

quick123official · web-flow · commit ff3560807c66 · 2021-12-03T12:34:28.000+08:00
Hotfix/2.6.0
diff --git a/src/pages/ResourceTree/index.js b/src/pages/ResourceTree/index.js
@@ -689,7 +689,6 @@ class ResourceTree extends Component {
                                 let sourceNode = info.dragNode;
                                 let targetNode = info.node;
                                 if (
-                                    sourceNode.isLeaf === true &&
                                     targetNode.isLeaf === false
                                 ) {
                                     this.props.modifyHostPosition(
diff --git a/src/redux/reducers/HostDataReducer.js b/src/redux/reducers/HostDataReducer.js
@@ -22,7 +22,7 @@ let initialState = {
 function delHostsByNodeName(nodeList = [], key = "") {
     if (Object.keys(nodeList).length === 0 || nodeList.length === 0) {
         // 空对象或者空串，直接返回
-        return 0;
+        return null;
     }
     let index = nodeList.findIndex((node) => node.key === key);
     if (index !== -1) {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ let initialState = {`
`22`	`22`	`function delHostsByNodeName(nodeList = [], key = "") {`
`23`	`23`	`if (Object.keys(nodeList).length === 0 \|\| nodeList.length === 0) {`
`24`	`24`	`// 空对象或者空串，直接返回`
`25`		`- return 0;`
	`25`	`+ return null;`
`26`	`26`	`}`
`27`	`27`	`let index = nodeList.findIndex((node) => node.key === key);`
`28`	`28`	`if (index !== -1) {`