|
@@ -66,7 +66,21 @@ function CommitAuditModal(props) {
|
|
let Id = version.template_node_id;
|
|
let Id = version.template_node_id;
|
|
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) setAuditId(currentId);
|
|
|
|
|
|
+ if (data.length <= 0) {
|
|
|
|
+ setAuditId(currentId)
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ let defaultValues = {}
|
|
|
|
+ data.forEach((item, index) => {
|
|
|
|
+ let value = getDataValue(item)
|
|
|
|
+ defaultValues[`circle${index}`] = value
|
|
|
|
+ })
|
|
|
|
+ // 设置延迟,等待组件渲染
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ form.setFieldsValue(defaultValues)
|
|
|
|
+ Object.values(defaultValues).forEach(value => onChange(value))
|
|
|
|
+ }, 200)
|
|
|
|
+ }
|
|
setData(data);
|
|
setData(data);
|
|
}, [auditId, version.template_node_id, visible]);
|
|
}, [auditId, version.template_node_id, visible]);
|
|
|
|
|
|
@@ -489,6 +503,7 @@ function CommitAuditModal(props) {
|
|
wrapperCol={{ span: 15 }}
|
|
wrapperCol={{ span: 15 }}
|
|
label="业务节点"
|
|
label="业务节点"
|
|
name="next_template_node_id"
|
|
name="next_template_node_id"
|
|
|
|
+ // rules={[{ required: true, message: '请选择业务节点' }]}
|
|
>
|
|
>
|
|
<Select style={{ width: '100%' }}>
|
|
<Select style={{ width: '100%' }}>
|
|
{getNextNodes(data.length < 0 ? currentNodeId : auditId, 'custom-rect').map(item => (
|
|
{getNextNodes(data.length < 0 ? currentNodeId : auditId, 'custom-rect').map(item => (
|
|
@@ -528,6 +543,16 @@ function CommitAuditModal(props) {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+function getDataValue(item) {
|
|
|
|
+ let arr = []
|
|
|
|
+ arr.push(item.value)
|
|
|
|
+ if (item.children?.length > 0) {
|
|
|
|
+ let res = getDataValue(item.children[0])
|
|
|
|
+ arr = arr.concat(res)
|
|
|
|
+ }
|
|
|
|
+ return arr
|
|
|
|
+}
|
|
|
|
+
|
|
export default connect(({ xflow, detail, user }) => ({
|
|
export default connect(({ xflow, detail, user }) => ({
|
|
flowDetail: xflow.flowDetail,
|
|
flowDetail: xflow.flowDetail,
|
|
versionList: detail.versionList,
|
|
versionList: detail.versionList,
|