Merge branch 'main' into i18n
This commit is contained in:
commit
0371606829
@ -387,7 +387,7 @@ export default function Canvas() {
|
|||||||
delete newRelationship.startY;
|
delete newRelationship.startY;
|
||||||
delete newRelationship.endX;
|
delete newRelationship.endX;
|
||||||
delete newRelationship.endY;
|
delete newRelationship.endY;
|
||||||
addRelationship(newRelationship, true);
|
addRelationship(newRelationship);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleMouseWheel = (e) => {
|
const handleMouseWheel = (e) => {
|
||||||
|
@ -129,7 +129,7 @@ export default function ControlPanel({
|
|||||||
...prev,
|
...prev,
|
||||||
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
|
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
|
||||||
]);
|
]);
|
||||||
updateTable(a.id, { x: a.x, y: a.y }, true);
|
updateTable(a.id, { x: a.x, y: a.y });
|
||||||
} else if (a.element === ObjectType.AREA) {
|
} else if (a.element === ObjectType.AREA) {
|
||||||
setRedoStack((prev) => [
|
setRedoStack((prev) => [
|
||||||
...prev,
|
...prev,
|
||||||
@ -145,15 +145,15 @@ export default function ControlPanel({
|
|||||||
}
|
}
|
||||||
} else if (a.action === Action.DELETE) {
|
} else if (a.action === Action.DELETE) {
|
||||||
if (a.element === ObjectType.TABLE) {
|
if (a.element === ObjectType.TABLE) {
|
||||||
addTable(false, a.data);
|
addTable(a.data, false);
|
||||||
} else if (a.element === ObjectType.RELATIONSHIP) {
|
} else if (a.element === ObjectType.RELATIONSHIP) {
|
||||||
addRelationship(a.data, false);
|
addRelationship(a.data, false);
|
||||||
} else if (a.element === ObjectType.NOTE) {
|
} else if (a.element === ObjectType.NOTE) {
|
||||||
addNote(false, a.data);
|
addNote(a.data, false);
|
||||||
} else if (a.element === ObjectType.AREA) {
|
} else if (a.element === ObjectType.AREA) {
|
||||||
addArea(false, a.data);
|
addArea(a.data, false);
|
||||||
} else if (a.element === ObjectType.TYPE) {
|
} else if (a.element === ObjectType.TYPE) {
|
||||||
addType(false, { id: a.id, ...a.data });
|
addType({ id: a.id, ...a.data }, false);
|
||||||
}
|
}
|
||||||
setRedoStack((prev) => [...prev, a]);
|
setRedoStack((prev) => [...prev, a]);
|
||||||
} else if (a.action === Action.EDIT) {
|
} else if (a.action === Action.EDIT) {
|
||||||
@ -281,15 +281,15 @@ export default function ControlPanel({
|
|||||||
setRedoStack((prev) => prev.filter((e, i) => i !== prev.length - 1));
|
setRedoStack((prev) => prev.filter((e, i) => i !== prev.length - 1));
|
||||||
if (a.action === Action.ADD) {
|
if (a.action === Action.ADD) {
|
||||||
if (a.element === ObjectType.TABLE) {
|
if (a.element === ObjectType.TABLE) {
|
||||||
addTable(false);
|
addTable(null, false);
|
||||||
} else if (a.element === ObjectType.AREA) {
|
} else if (a.element === ObjectType.AREA) {
|
||||||
addArea(false);
|
addArea(null, false);
|
||||||
} else if (a.element === ObjectType.NOTE) {
|
} else if (a.element === ObjectType.NOTE) {
|
||||||
addNote(false);
|
addNote(null, false);
|
||||||
} else if (a.element === ObjectType.RELATIONSHIP) {
|
} else if (a.element === ObjectType.RELATIONSHIP) {
|
||||||
addRelationship(a.data, false);
|
addRelationship(a.data, false);
|
||||||
} else if (a.element === ObjectType.TYPE) {
|
} else if (a.element === ObjectType.TYPE) {
|
||||||
addType(false);
|
addType(null, false);
|
||||||
}
|
}
|
||||||
setUndoStack((prev) => [...prev, a]);
|
setUndoStack((prev) => [...prev, a]);
|
||||||
} else if (a.action === Action.MOVE) {
|
} else if (a.action === Action.MOVE) {
|
||||||
@ -298,7 +298,7 @@ export default function ControlPanel({
|
|||||||
...prev,
|
...prev,
|
||||||
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
|
{ ...a, x: tables[a.id].x, y: tables[a.id].y },
|
||||||
]);
|
]);
|
||||||
updateTable(a.id, { x: a.x, y: a.y }, true);
|
updateTable(a.id, { x: a.x, y: a.y });
|
||||||
} else if (a.element === ObjectType.AREA) {
|
} else if (a.element === ObjectType.AREA) {
|
||||||
setUndoStack((prev) => [
|
setUndoStack((prev) => [
|
||||||
...prev,
|
...prev,
|
||||||
@ -557,13 +557,13 @@ export default function ControlPanel({
|
|||||||
const del = () => {
|
const del = () => {
|
||||||
switch (selectedElement.element) {
|
switch (selectedElement.element) {
|
||||||
case ObjectType.TABLE:
|
case ObjectType.TABLE:
|
||||||
deleteTable(selectedElement.id, true);
|
deleteTable(selectedElement.id);
|
||||||
break;
|
break;
|
||||||
case ObjectType.NOTE:
|
case ObjectType.NOTE:
|
||||||
deleteNote(selectedElement.id, true);
|
deleteNote(selectedElement.id);
|
||||||
break;
|
break;
|
||||||
case ObjectType.AREA:
|
case ObjectType.AREA:
|
||||||
deleteArea(selectedElement.id, true);
|
deleteArea(selectedElement.id);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -572,7 +572,7 @@ export default function ControlPanel({
|
|||||||
const duplicate = () => {
|
const duplicate = () => {
|
||||||
switch (selectedElement.element) {
|
switch (selectedElement.element) {
|
||||||
case ObjectType.TABLE:
|
case ObjectType.TABLE:
|
||||||
addTable(true, {
|
addTable({
|
||||||
...tables[selectedElement.id],
|
...tables[selectedElement.id],
|
||||||
x: tables[selectedElement.id].x + 20,
|
x: tables[selectedElement.id].x + 20,
|
||||||
y: tables[selectedElement.id].y + 20,
|
y: tables[selectedElement.id].y + 20,
|
||||||
@ -580,7 +580,7 @@ export default function ControlPanel({
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case ObjectType.NOTE:
|
case ObjectType.NOTE:
|
||||||
addNote(true, {
|
addNote({
|
||||||
...notes[selectedElement.id],
|
...notes[selectedElement.id],
|
||||||
x: notes[selectedElement.id].x + 20,
|
x: notes[selectedElement.id].x + 20,
|
||||||
y: notes[selectedElement.id].y + 20,
|
y: notes[selectedElement.id].y + 20,
|
||||||
@ -588,7 +588,7 @@ export default function ControlPanel({
|
|||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case ObjectType.AREA:
|
case ObjectType.AREA:
|
||||||
addArea(true, {
|
addArea({
|
||||||
...areas[selectedElement.id],
|
...areas[selectedElement.id],
|
||||||
x: areas[selectedElement.id].x + 20,
|
x: areas[selectedElement.id].x + 20,
|
||||||
y: areas[selectedElement.id].y + 20,
|
y: areas[selectedElement.id].y + 20,
|
||||||
@ -630,21 +630,21 @@ export default function ControlPanel({
|
|||||||
}
|
}
|
||||||
const v = new Validator();
|
const v = new Validator();
|
||||||
if (v.validate(obj, tableSchema).valid) {
|
if (v.validate(obj, tableSchema).valid) {
|
||||||
addTable(true, {
|
addTable({
|
||||||
...obj,
|
...obj,
|
||||||
x: obj.x + 20,
|
x: obj.x + 20,
|
||||||
y: obj.y + 20,
|
y: obj.y + 20,
|
||||||
id: tables.length,
|
id: tables.length,
|
||||||
});
|
});
|
||||||
} else if (v.validate(obj, areaSchema).valid) {
|
} else if (v.validate(obj, areaSchema).valid) {
|
||||||
addArea(true, {
|
addArea({
|
||||||
...obj,
|
...obj,
|
||||||
x: obj.x + 20,
|
x: obj.x + 20,
|
||||||
y: obj.y + 20,
|
y: obj.y + 20,
|
||||||
id: areas.length,
|
id: areas.length,
|
||||||
});
|
});
|
||||||
} else if (v.validate(obj, noteSchema)) {
|
} else if (v.validate(obj, noteSchema)) {
|
||||||
addNote(true, {
|
addNote({
|
||||||
...obj,
|
...obj,
|
||||||
x: obj.x + 20,
|
x: obj.x + 20,
|
||||||
y: obj.y + 20,
|
y: obj.y + 20,
|
||||||
|
@ -238,7 +238,7 @@ export default function RelationshipInfo({ data }) {
|
|||||||
icon={<IconDeleteStroked />}
|
icon={<IconDeleteStroked />}
|
||||||
block
|
block
|
||||||
type="danger"
|
type="danger"
|
||||||
onClick={() => deleteRelationship(data.id, true)}
|
onClick={() => deleteRelationship(data.id)}
|
||||||
>
|
>
|
||||||
{t("delete")}
|
{t("delete")}
|
||||||
</Button>
|
</Button>
|
||||||
|
@ -19,7 +19,7 @@ export default function TablesTab() {
|
|||||||
<SearchBar tables={tables} />
|
<SearchBar tables={tables} />
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={8}>
|
<Col span={8}>
|
||||||
<Button icon={<IconPlus />} block onClick={() => addTable(true)}>
|
<Button icon={<IconPlus />} block onClick={() => addTable()}>
|
||||||
{t("add_table")}
|
{t("add_table")}
|
||||||
</Button>
|
</Button>
|
||||||
</Col>
|
</Col>
|
||||||
|
@ -19,7 +19,7 @@ export default function TypesTab() {
|
|||||||
<Searchbar />
|
<Searchbar />
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={8}>
|
<Col span={8}>
|
||||||
<Button icon={<IconPlus />} block onClick={() => addType(true)}>
|
<Button icon={<IconPlus />} block onClick={() => addType()}>
|
||||||
{t("add_type")}
|
{t("add_type")}
|
||||||
</Button>
|
</Button>
|
||||||
</Col>
|
</Col>
|
||||||
|
@ -15,7 +15,7 @@ export default function AreasContextProvider({ children }) {
|
|||||||
const { selectedElement, setSelectedElement } = useSelect();
|
const { selectedElement, setSelectedElement } = useSelect();
|
||||||
const { setUndoStack, setRedoStack } = useUndoRedo();
|
const { setUndoStack, setRedoStack } = useUndoRedo();
|
||||||
|
|
||||||
const addArea = (addToHistory = true, data) => {
|
const addArea = (data, addToHistory = true) => {
|
||||||
if (data) {
|
if (data) {
|
||||||
setAreas((prev) => {
|
setAreas((prev) => {
|
||||||
const temp = prev.slice();
|
const temp = prev.slice();
|
||||||
|
@ -15,7 +15,7 @@ export default function NotesContextProvider({ children }) {
|
|||||||
const { setUndoStack, setRedoStack } = useUndoRedo();
|
const { setUndoStack, setRedoStack } = useUndoRedo();
|
||||||
const { selectedElement, setSelectedElement } = useSelect();
|
const { selectedElement, setSelectedElement } = useSelect();
|
||||||
|
|
||||||
const addNote = (addToHistory = true, data) => {
|
const addNote = (data, addToHistory = true) => {
|
||||||
if (data) {
|
if (data) {
|
||||||
setNotes((prev) => {
|
setNotes((prev) => {
|
||||||
const temp = prev.slice();
|
const temp = prev.slice();
|
||||||
|
@ -16,7 +16,7 @@ export default function TablesContextProvider({ children }) {
|
|||||||
const { setUndoStack, setRedoStack } = useUndoRedo();
|
const { setUndoStack, setRedoStack } = useUndoRedo();
|
||||||
const { selectedElement, setSelectedElement } = useSelect();
|
const { selectedElement, setSelectedElement } = useSelect();
|
||||||
|
|
||||||
const addTable = (addToHistory = true, data) => {
|
const addTable = (data, addToHistory = true) => {
|
||||||
if (data) {
|
if (data) {
|
||||||
setTables((prev) => {
|
setTables((prev) => {
|
||||||
const temp = prev.slice();
|
const temp = prev.slice();
|
||||||
|
@ -11,7 +11,7 @@ export default function TypesContextProvider({ children }) {
|
|||||||
const [types, setTypes] = useState([]);
|
const [types, setTypes] = useState([]);
|
||||||
const { setUndoStack, setRedoStack } = useUndoRedo();
|
const { setUndoStack, setRedoStack } = useUndoRedo();
|
||||||
|
|
||||||
const addType = (addToHistory = true, data) => {
|
const addType = (data, addToHistory = true) => {
|
||||||
if (data) {
|
if (data) {
|
||||||
setTypes((prev) => {
|
setTypes((prev) => {
|
||||||
const temp = prev.slice();
|
const temp = prev.slice();
|
||||||
|
Loading…
Reference in New Issue
Block a user