titor/drawDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix field type not updating when Type name is changed (#193 part1)

Browse Source
This commit is contained in:
1ilit 2024-07-31 14:50:06 +03:00
parent 1a2ac74424
commit 52248f1016
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/EditorHeader/ControlPanel.jsx
View File

@ -298,6 +298,13 @@ export default function ControlPanel({
); );
} else if (a.component === "self") { } else if (a.component === "self") {
updateType(a.tid, a.undo); updateType(a.tid, a.undo);
if (a.updatedFields) {
if (a.undo.name) {
a.updatedFields.forEach((x) =>
updateField(x.tid, x.fid, { type: a.undo.name.toUpperCase() }),
);
}
}
} }
} else if (a.element === ObjectType.ENUM) { } else if (a.element === ObjectType.ENUM) {
updateEnum(a.id, a.undo); updateEnum(a.id, a.undo);
@ -460,6 +467,13 @@ export default function ControlPanel({
}); });
} else if (a.component === "self") { } else if (a.component === "self") {
updateType(a.tid, a.redo); updateType(a.tid, a.redo);
if (a.updatedFields) {
if (a.redo.name) {
a.updatedFields.forEach((x) =>
updateField(x.tid, x.fid, { type: a.redo.name.toUpperCase() }),
);
}
}
} }
} else if (a.element === ObjectType.ENUM) { } else if (a.element === ObjectType.ENUM) {
updateEnum(a.id, a.redo); updateEnum(a.id, a.redo);

23
src/components/EditorSidePanel/TypesTab/TypeInfo.jsx
View File

@ -10,12 +10,13 @@ import {
Card, Card,
} from "@douyinfe/semi-ui"; } from "@douyinfe/semi-ui";
import { IconDeleteStroked, IconPlus } from "@douyinfe/semi-icons"; import { IconDeleteStroked, IconPlus } from "@douyinfe/semi-icons";
import { useUndoRedo, useTypes } from "../../../hooks"; import { useUndoRedo, useTypes, useDiagram } from "../../../hooks";
import TypeField from "./TypeField"; import TypeField from "./TypeField";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
export default function TypeInfo({ index, data }) { export default function TypeInfo({ index, data }) {
const { deleteType, updateType } = useTypes(); const { deleteType, updateType } = useTypes();
const { tables, updateField } = useDiagram();
const { setUndoStack, setRedoStack } = useUndoRedo(); const { setUndoStack, setRedoStack } = useUndoRedo();
const [editField, setEditField] = useState({}); const [editField, setEditField] = useState({});
const { t } = useTranslation(); const { t } = useTranslation();
@ -37,10 +38,27 @@ export default function TypeInfo({ index, data }) {
validateStatus={data.name === "" ? "error" : "default"} validateStatus={data.name === "" ? "error" : "default"}
placeholder={t("name")} placeholder={t("name")}
className="ms-2" className="ms-2"
onChange={(value) => updateType(index, { name: value })} onChange={(value) => {
updateType(index, { name: value });
tables.forEach((table, i) => {
table.fields.forEach((field, j) => {
if (field.type.toLowerCase() === data.name.toLowerCase()) {
updateField(i, j, { type: value.toUpperCase() });
}
});
});
}}
onFocus={(e) => setEditField({ name: e.target.value })} onFocus={(e) => setEditField({ name: e.target.value })}
onBlur={(e) => { onBlur={(e) => {
if (e.target.value === editField.name) return; if (e.target.value === editField.name) return;
const updatedFields = tables.reduce((acc, table) => {
table.fields.forEach((_, i) => {
acc.push({ tid: table.id, fid: i });
});
return acc;
}, []);
setUndoStack((prev) => [ setUndoStack((prev) => [
...prev, ...prev,
{ {
@ -50,6 +68,7 @@ export default function TypeInfo({ index, data }) {
tid: index, tid: index,
undo: editField, undo: editField,
redo: { name: e.target.value }, redo: { name: e.target.value },
updatedFields,
message: t("edit_type", { message: t("edit_type", {
typeName: data.name, typeName: data.name,
extra: "[name]", extra: "[name]",