|
@@ -67,22 +67,26 @@ function CommitAuditModal(props) {
|
|
const currentId = flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
|
|
const currentId = flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
|
|
const data = treeData(currentId);
|
|
const data = treeData(currentId);
|
|
if (data.length <= 0) {
|
|
if (data.length <= 0) {
|
|
- setAuditId(currentId)
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- let defaultValues = {}
|
|
|
|
- data.forEach((item, index) => {
|
|
|
|
- let value = getDataValue(item)
|
|
|
|
- defaultValues[`circle${index}`] = value
|
|
|
|
- })
|
|
|
|
|
|
+ setAuditId(currentId);
|
|
|
|
+ } else {
|
|
|
|
+ let defaultValues = {};
|
|
|
|
+ if (data.length == 1) {
|
|
|
|
+ let value = getDataValue(data[0]);
|
|
|
|
+ defaultValues[`circle`] = value;
|
|
|
|
+ } else {
|
|
|
|
+ data.forEach((item, index) => {
|
|
|
|
+ let value = getDataValue(item);
|
|
|
|
+ defaultValues[`circle${index}`] = value;
|
|
|
|
+ });
|
|
|
|
+ }
|
|
// 设置延迟,等待组件渲染
|
|
// 设置延迟,等待组件渲染
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- form.setFieldsValue(defaultValues)
|
|
|
|
- Object.values(defaultValues).forEach(value => onChange(value))
|
|
|
|
- }, 200)
|
|
|
|
|
|
+ form.setFieldsValue(defaultValues);
|
|
|
|
+ Object.values(defaultValues).forEach(value => onChange(value));
|
|
|
|
+ }, 200);
|
|
}
|
|
}
|
|
setData(data);
|
|
setData(data);
|
|
- }, [auditId, version.template_node_id, visible]);
|
|
|
|
|
|
+ }, [version.template_node_id, visible]);
|
|
|
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
form.resetFields();
|
|
form.resetFields();
|
|
@@ -124,6 +128,7 @@ function CommitAuditModal(props) {
|
|
|
|
|
|
const currentNodeId = useMemo(() => {
|
|
const currentNodeId = useMemo(() => {
|
|
let Id = version.template_node_id;
|
|
let Id = version.template_node_id;
|
|
|
|
+ console.log('==============================9999=====', currentNodeId);
|
|
setAuditId(currentNodeId);
|
|
setAuditId(currentNodeId);
|
|
return flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
|
|
return flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
|
|
}, [flowDetail, version]);
|
|
}, [flowDetail, version]);
|
|
@@ -219,7 +224,6 @@ function CommitAuditModal(props) {
|
|
if (data) {
|
|
if (data) {
|
|
setApprovalProcess(data);
|
|
setApprovalProcess(data);
|
|
}
|
|
}
|
|
- console.log('=======================================', data);
|
|
|
|
},
|
|
},
|
|
});
|
|
});
|
|
};
|
|
};
|
|
@@ -249,7 +253,7 @@ function CommitAuditModal(props) {
|
|
nodeId: node.Id,
|
|
nodeId: node.Id,
|
|
items: JSON.parse(curData.form_json || '[]'),
|
|
items: JSON.parse(curData.form_json || '[]'),
|
|
};
|
|
};
|
|
-
|
|
|
|
|
|
+
|
|
return newItem;
|
|
return newItem;
|
|
});
|
|
});
|
|
addAuditList = [...addAuditList, ...newlist];
|
|
addAuditList = [...addAuditList, ...newlist];
|
|
@@ -545,13 +549,13 @@ function CommitAuditModal(props) {
|
|
}
|
|
}
|
|
|
|
|
|
function getDataValue(item) {
|
|
function getDataValue(item) {
|
|
- let arr = []
|
|
|
|
- arr.push(item.value)
|
|
|
|
|
|
+ let arr = [];
|
|
|
|
+ arr.push(item.value);
|
|
if (item.children?.length > 0) {
|
|
if (item.children?.length > 0) {
|
|
- let res = getDataValue(item.children[0])
|
|
|
|
- arr = arr.concat(res)
|
|
|
|
|
|
+ let res = getDataValue(item.children[0]);
|
|
|
|
+ arr = arr.concat(res);
|
|
}
|
|
}
|
|
- return arr
|
|
|
|
|
|
+ return arr;
|
|
}
|
|
}
|
|
|
|
|
|
export default connect(({ xflow, detail, user }) => ({
|
|
export default connect(({ xflow, detail, user }) => ({
|