diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue index e816175..35b2dc0 100644 --- a/src/views/boardGenerate/index.vue +++ b/src/views/boardGenerate/index.vue @@ -495,16 +495,17 @@ onMounted(async () => { .then((res) => { let data = res.data; boardData.value = data; - nodes.value = data.designPagePointList.map(e => { + nodes.value = data.designPagePointList?.length !== 0 ? data.designPagePointList.map(e => { let data = {}; let savaField = ['customData', 'options']; - Object.keys(e.data).forEach((key) => { + let dataContent = JSON.parse(e.dataContent) || {}; + Object.keys(dataContent).forEach((key) => { if (savaField.includes(key)) { - data[key] = e.data[key]; + data[key] = dataContent[key]; } else { - if (Array.isArray(e.data[key])) { + if (Array.isArray(dataContent[key])) { data[key] = []; - } else if (e.data[key] && typeof e.data[key] === 'object' && !Array.isArray(e.data[key])) { + } else if (dataContent[key] && typeof dataContent[key] === 'object' && !Array.isArray(dataContent[key])) { data[key] = {}; } else { data[key] = null; @@ -516,17 +517,17 @@ onMounted(async () => { id: e.pagePointId, name: e.pagePointName, dimensions: { - width: e.dimensions.width, - height: e.dimensions.height + width: e.width, + height: e.height }, position: { - x: e.position.x, - y: e.position.y + x: e.posX, + y: e.posY }, type: e.pointType, data: JSON.parse(e.dataContent) }; - }) || [{ + }) : [{ id: `area_${uuidv4().replaceAll('-', '_')}`, name: 'area', type: 'area', @@ -629,7 +630,7 @@ const save = () => { editBoardApi({ ...boardData.value, - designPageEdgesList: nodes.value.map(e => { + designPagePointList: nodes.value.map(e => { let data = {}; let savaField = ['customData', 'options']; Object.keys(e.data).forEach((key) => { @@ -648,6 +649,7 @@ const save = () => { }); return { activeFlag: '1', + pageConfigId: boardData.value.pageConfigId, pagePointId: e.id, pagePointName: e.name, width: e.dimensions.width, @@ -658,9 +660,11 @@ const save = () => { dataContent: JSON.stringify(data) }; }), - designPagePointList: edges.value.map(e => { + designPageEdgesList: edges.value.map(e => { + console.log(e); return { activeFlag: '1', + pageConfigId: boardData.value.pageConfigId, pageEdgesId: e.id, sourceNodeId: e.source, targetNodeId: e.target, diff --git a/src/views/boardGenerate/view.vue b/src/views/boardGenerate/view.vue index d294c41..d098bdb 100644 --- a/src/views/boardGenerate/view.vue +++ b/src/views/boardGenerate/view.vue @@ -4,7 +4,7 @@