From 4623dfd2eec9ba848072353bcff7aa77f9307b87 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sun, 3 Dec 2023 00:20:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=B4=D1=8B=20=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=B0=20=D0=BF=D0=BE=20=D0=BA=D0=BB=D0=B8?= =?UTF-8?q?=D0=BA=D1=83=20=D0=BF=D0=BE=20=D0=BD=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Questions/BranchingMap/CsComponent.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx index 33cbcf3d..873c5b1f 100644 --- a/src/pages/Questions/BranchingMap/CsComponent.tsx +++ b/src/pages/Questions/BranchingMap/CsComponent.tsx @@ -125,15 +125,17 @@ export const CsComponent = ({ useEffect(() => { if (modalQuestionTargetContentId.length !== 0 && modalQuestionParentContentId.length !== 0) { console.log("был выбран вопрос " + modalQuestionTargetContentId) + addNode({ parentNodeContentId:modalQuestionParentContentId, targetNodeContentId:modalQuestionTargetContentId }) } }, [modalQuestionTargetContentId]) - const addNode = ({ parentNodeContentId }: { parentNodeContentId: string }) => { + const addNode = ({ parentNodeContentId, targetNodeContentId }: { parentNodeContentId: string, targetNodeContentId?: string }) => { console.log("dragQuestionContentId " + dragQuestionContentId) const cy = cyRef?.current const parentNodeChildren = cy?.$('edge[source = "' + parentNodeContentId + '"]')?.length - const targetQuestion = { ...getQuestionByContentId(dragQuestionContentId) } as AnyQuizQuestion + //если есть инфо о выбранном вопросе из модалки - берём родителя из инфо модалки. Иначе из значения дропа + const targetQuestion = { ...getQuestionByContentId(targetNodeContentId || dragQuestionContentId) } as AnyQuizQuestion if (Object.keys(targetQuestion).length !== 0 && Object.keys(targetQuestion).length !== 0 && parentNodeContentId && parentNodeChildren !== undefined) { clearDataAfterAddNode({ parentNodeContentId, targetQuestion, parentNodeChildren }) @@ -274,8 +276,6 @@ export const CsComponent = ({ }, [startRemove]); - - const readyLO = (e) => { e.cy.data('changed', false) //удаляем иконки @@ -473,10 +473,10 @@ export const CsComponent = ({ layoutElement.classList.add("popper-layout"); layoutElement.setAttribute("data-id", item.id()); layoutElement.addEventListener("mouseup", () => { - alert("layout") - } - // setStartCreate(node.id()) - ); + //Узнаём грани, идущие от этой ноды + setModalQuestionParentContentId(item.id()) + setOpenedModalQuestions(true) + }); layoutsContainer.current?.appendChild(layoutElement); return layoutElement; @@ -504,6 +504,7 @@ export const CsComponent = ({ plusElement.addEventListener("mouseup", () => { setStartCreate(node.id()); }); + plusesContainer.current?.appendChild(plusElement); return plusElement;