feats

src/pages/property/building/index.jsx

@@ -24,54 +24,51 @@ export default props => {
   const [treeData, setTreeData] = useState()
 
   const updateTreeData = (origin, parent, nodes) => {
+    const pid = parent ? `${[parent.pid, parent.id].filter(Boolean).join('-')}` : '0'
+    const newDatas = Array.isArray(nodes) ? (nodes || []).map(x => ({...x, pid})) : [{...nodes, pid}]
+
+    console.log(pid, newDatas)
     if (!parent) {
-      const newData = [
+      return [
         ...(origin || []),
-        ...(Array.isArray(nodes) ? nodes : [nodes])
+        ...newDatas
       ]
-      return newData
     }
 
-    const newData = (origin || []).map(x => {
-      if (x.id === parent) {
-        if (Array.isArray(nodes)) {
-          x.children = [
-            ...(x.children || []),
-            ...nodes
-          ]
-        } else {
+    return (origin || []).map(x => {
+      if (x.id === parent.id && x.pid === parent.pid) {
           x.children = [
             ...(x.children || []),
-            nodes
+            ...newDatas
           ]
-        }
       } else {
         if (x.children && x.children.length) {
-          x.children = updateTreeData(x.children, parent, nodes)
+          x.children = updateTreeData(x.children, parent, newDatas)
         }
       }
 
       return x
     })
-
-    return newData
   }
 
   const getTreeData = (nodeData, refresh) => {
 
-    const query = nodeData ? {
-      id: nodeData.props.dataRef.id,
-      name: nodeData.props.dataRef.name,
-      treeType: nodeData.props.dataRef.type,
-      nodeNumber: nodeData.props.dataRef.nodeNumber,
-    } : { treeType: 'phase' }
+    const parent = nodeData ? nodeData.props.dataRef : { type: 'phase', pid: 0 }
+
+    const query = {
+      id: parent.id,
+      name: parent.name,
+      treeType: parent.type,
+      nodeNumber: parent.nodeNumber,
+    }
 
     return new Promise((resolve, reject) => {
       getTrees({ params: query }).then(res => {
         if (refresh) {
-          setTreeData(res)
+          setTreeData((res || []).map(x => ({...x, pid: 0})))
         } else {
-          const data = updateTreeData(treeData, query.id, res)
+          const data = updateTreeData(treeData, parent, res)
+          console.log(data)
           setTreeData(data)
         }
         resolve()
@@ -126,7 +123,7 @@ export default props => {
     return (      
       <Tree.TreeNode
         {...node}
-        key={node.id}
+        key={`${node.pid}-${node.id}`}
         dataRef={node}
         isLeaf={node.type === 'end'}
         title={(<NodeLabel data={node} onAdd={showPrompt} onDelete={handleNodeDelete} />)}