|
@@ -52,50 +52,45 @@ function FlowModal(props) {
|
|
if (!id) return;
|
|
if (!id) return;
|
|
let node = graphData.nodes.find(item => item.id == id);
|
|
let node = graphData.nodes.find(item => item.id == id);
|
|
setNodeLoading(true);
|
|
setNodeLoading(true);
|
|
|
|
+ let node_type = node.name == "custom-rect" ? 0 : 1;
|
|
try {
|
|
try {
|
|
- res = await queryVserionByNode({ template_node_id: node.Id });
|
|
|
|
|
|
+ res = await queryVserionByNode({ template_node_id: node.Id, node_type });
|
|
let data = [];
|
|
let data = [];
|
|
- Object.values(res.data.excel_version).map(arr => {
|
|
|
|
|
|
+ res.data.excel_version_tree.map(arr => {
|
|
if (res.data.flow_id) {
|
|
if (res.data.flow_id) {
|
|
- data = [...data, {...arr[0], flow_id:res.data.flow_id}];
|
|
|
|
- console.log(data)
|
|
|
|
|
|
+ data = [...data, {...arr, flow_id:res.data.flow_id}];
|
|
} else {
|
|
} else {
|
|
- data = [...data, ...arr];
|
|
|
|
|
|
+ data = [...data, arr];
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
- const nameSet = new Set();
|
|
|
|
data.forEach((item, id)=>{
|
|
data.forEach((item, id)=>{
|
|
//解决key报错问题
|
|
//解决key报错问题
|
|
data[id].key=`${id}-${item.name}`;
|
|
data[id].key=`${id}-${item.name}`;
|
|
- nameSet.add(item.version_name);
|
|
|
|
|
|
+ item.isParent = true;
|
|
})
|
|
})
|
|
|
|
|
|
-
|
|
|
|
- const getDataParent = () => {
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- let dataNew = [...nameSet].map(name=>{
|
|
|
|
- let list = data.filter(item=>item.version_name == name)
|
|
|
|
- if(list.length == 1) {
|
|
|
|
- return list[0]
|
|
|
|
- }else if(list.filter(item=>!item.version_no).length > 0) {
|
|
|
|
- return list.filter(item=>!item.version_no)[0]
|
|
|
|
- }else {
|
|
|
|
- return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- // let dataNew = data.filter(item=>!item.version_no);
|
|
|
|
- dataNew.forEach(item=>{
|
|
|
|
- let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
|
|
|
|
- if(curItem) {
|
|
|
|
- curItem.isChild = true;
|
|
|
|
- item.children = [curItem]
|
|
|
|
- };
|
|
|
|
- })
|
|
|
|
- console.log("dataNew============" ,dataNew)
|
|
|
|
- setData(dataNew);
|
|
|
|
- // setData(data);
|
|
|
|
|
|
+ // let dataNew = [...nameSet].map(name=>{
|
|
|
|
+ // let list = data.filter(item=>item.version_name == name)
|
|
|
|
+ // if(list.length == 1) {
|
|
|
|
+ // return list[0]
|
|
|
|
+ // }else if(list.filter(item=>!item.version_no).length > 0) {
|
|
|
|
+ // return list.filter(item=>!item.version_no)[0]
|
|
|
|
+ // }else {
|
|
|
|
+ // return list.reduce((a, b)=> a.version_no > b.version_no ? b : a)
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // // let dataNew = data.filter(item=>!item.version_no);
|
|
|
|
+ // dataNew.forEach(item=>{
|
|
|
|
+ // let curItem = data.find(node => node.version_name == item.version_name && node.version_id != item.version_id)
|
|
|
|
+ // if(curItem) {
|
|
|
|
+ // curItem.isChild = true;
|
|
|
|
+ // item.children = [curItem]
|
|
|
|
+ // };
|
|
|
|
+ // })
|
|
|
|
+ console.log("dataNew============" ,data)
|
|
|
|
+ // setData(dataNew);
|
|
|
|
+ setData(data);
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.log(error);
|
|
console.log(error);
|
|
}
|
|
}
|
|
@@ -157,8 +152,7 @@ function FlowModal(props) {
|
|
render: item => (
|
|
render: item => (
|
|
<span style={{ color: item.audit_status != 0 ? '#9b9b9b' : '' }}>
|
|
<span style={{ color: item.audit_status != 0 ? '#9b9b9b' : '' }}>
|
|
{item.id == version.id && <CheckOutlined style={{ marginRight: 10 }} />}
|
|
{item.id == version.id && <CheckOutlined style={{ marginRight: 10 }} />}
|
|
- {/* {item.version_name} */}
|
|
|
|
- {item.version_no && item.isChild ? `${item.version_name}.${item.version_no}` : item.version_name}
|
|
|
|
|
|
+ {item.version_no && !item.isParent ? `${item.version_name}.${item.version_no}` : item.version_name}
|
|
</span>
|
|
</span>
|
|
),
|
|
),
|
|
},
|
|
},
|