Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Optimize canvas performance (#1183)
1ilit73d7b3ac9e53
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsxindex ab11b2e9..72a00acf 100644--- a/src/components/EditorCanvas/Canvas.jsx+++ b/src/components/EditorCanvas/Canvas.jsx@@ -12,10 +12,10 @@ import {defaultRelationshipColor,} from "../../data/constants";import { Toast } from "@douyinfe/semi-ui";-import Table from "./Table";+import Table, { TableEditSheet } from "./Table";import View from "./View";import Area from "./Area";-import Relationship from "./Relationship";+import Relationship, { RelationshipEditSheet } from "./Relationship";import Note from "./Note";import {useCanvas,@@ -35,6 +35,7 @@ import { useTranslation } from "react-i18next";import { useEventListener } from "usehooks-ts";import {areFieldsCompatible,+ getRelatedFieldKeysByTable,getTableHeight,getTableWidth,} from "../../utils/utils";@@ -63,7 +64,7 @@ export default function Canvas() {pointer,} = canvasContextValue;- const { tables, updateTable, relationships, addRelationship, database } =+ const { tables, updateTables, relationships, addRelationship, database } =useDiagram();const { setSaveState } = useSaveState();const { areas, updateArea } = useAreas();@@ -153,6 +154,20 @@ export default function Canvas() {[tables],);+ const relatedFieldKeysRef = useRef(new Map());+ const relatedFieldKeysByTable = useMemo(() => {+ const next = getRelatedFieldKeysByTable(relationships);+ const prev = relatedFieldKeysRef.current;+ next.forEach((keys, tableId) => {+ const old = prev.get(tableId);+ if (old && old.size === keys.size && [...keys].every((k) => old.has(k))) {+ next.set(tableId, old);+ }+ });+ relatedFieldKeysRef.current = next;+ return next;+ }, [relationships]);+const selectedTableIds = useMemo(() => {const ids = new Set(bulkSelectedElements@@ -196,7 +211,11 @@ export default function Canvas() {x: table.x,y: table.y,width: getTableWidth(table),- height: getTableHeight(table, settings.showComments, relationships),+ height: getTableHeight(+ table,+ settings.showComments,+ relatedFieldKeysByTable.get(table.id),+ ),};if (shouldAddElement(tableRect, element)) {elements.push(element);@@ -407,13 +426,14 @@ export default function Canvas() {const deltaY = mainElementFinalY - currentCoords.y;const newBulkSelectedElements = [];+ const tableUpdates = new Map();bulkSelectedElements.forEach((el) => {const elementFinalCoords = {x: el.currentCoords.x + deltaX,y: el.currentCoords.y + deltaY,};if (el.type === ObjectType.TABLE) {- updateTable(el.id, { ...elementFinalCoords });+ tableUpdates.set(el.id, elementFinalCoords);}if (el.type === ObjectType.AREA) {updateArea(el.id, { ...elementFinalCoords });@@ -430,6 +450,7 @@ export default function Canvas() {});});+ if (tableUpdates.size > 0) updateTables(tableUpdates);setBulkSelectedElements(newBulkSelectedElements);return;}@@ -848,7 +869,10 @@ export default function Canvas() {data={e}startTable={tablesById.get(e.startTableId)}endTable={tablesById.get(e.endTableId)}- relationships={relationships}+ startRelatedFieldKeys={relatedFieldKeysByTable.get(+ e.startTableId,+ )}+ endRelatedFieldKeys={relatedFieldKeysByTable.get(e.endTableId)}/>))}{tables.map((table) => (@@ -856,9 +880,8 @@ export default function Canvas() {key={table.id}tableData={table}isSelected={selectedTableIds.has(table.id)}- zoom={transform.zoom}database={database}- relationships={relationships}+ relatedFieldKeys={relatedFieldKeysByTable.get(table.id)}setHoveredTable={setHoveredTable}handleGripField={handleGripField}setLinkingLine={setLinkingLine}@@ -899,6 +922,8 @@ export default function Canvas() {)}</svg></div>+ <TableEditSheet />+ <RelationshipEditSheet />{settings.showDebugCoordinates && (<div className="fixed flex flex-col flex-wrap gap-6 bg-[rgba(var(--semi-grey-1),var(--tw-bg-opacity))]/40 border border-color bottom-4 right-4 p-4 rounded-xl backdrop-blur-xs pointer-events-none select-none"><table className="table-auto grow">diff --git a/src/components/EditorCanvas/Relationship.jsx b/src/components/EditorCanvas/Relationship.jsxindex 448a6896..78e3d553 100644--- a/src/components/EditorCanvas/Relationship.jsx+++ b/src/components/EditorCanvas/Relationship.jsx@@ -1,6 +1,7 @@import {memo,useCallback,+ useContext,useEffect,useLayoutEffect,useMemo,@@ -9,13 +10,13 @@ import {} from "react";import { Cardinality, ObjectType, Tab } from "../../data/constants";import { calcPath, calcCompositePath } from "../../utils/calcPath";-import { useSettings, useLayout, useSelect } from "../../hooks";+import { useSettings, useLayout, useSelect, useDiagram } from "../../hooks";+import { SelectActionsContext } from "../../context/SelectContext";import { useTranslation } from "react-i18next";import { SideSheet } from "@douyinfe/semi-ui";import RelationshipInfo from "../EditorSidePanel/RelationshipsTab/RelationshipInfo";import {- getVisibleFieldIndex,- getVisibleFields,+ getVisibleFieldEntries,getRelationshipFields,getTableWidth,} from "../../utils/utils";@@ -27,11 +28,11 @@ export default memo(function Relationship({data,startTable,endTable,- relationships,+ startRelatedFieldKeys,+ endRelatedFieldKeys,}) {const { layout } = useLayout();- const { selectedElement, setSelectedElement } = useSelect();- const { t } = useTranslation();+ const { setSelectedElement } = useContext(SelectActionsContext);const edit = useCallback(() => {setSelectedElement((prev) => ({@@ -49,44 +50,56 @@ export default memo(function Relationship({}, [data.id, layout.sidebar, setSelectedElement]);return (- <>- <RelationshipPath- data={data}- startTable={startTable}- endTable={endTable}- relationships={relationships}- onEdit={edit}- />- <SideSheet- title={t("edit")}- size="small"- visible={- selectedElement.element === ObjectType.RELATIONSHIP &&- selectedElement.id === data.id &&- selectedElement.open &&- !layout.sidebar- }- onCancel={() => {- setSelectedElement((prev) => ({- ...prev,- open: false,- }));- }}- style={{ paddingBottom: "16px" }}- >- <div className="sidesheet-theme">- <RelationshipInfo data={data} />- </div>- </SideSheet>- </>+ <RelationshipPath+ data={data}+ startTable={startTable}+ endTable={endTable}+ startRelatedFieldKeys={startRelatedFieldKeys}+ endRelatedFieldKeys={endRelatedFieldKeys}+ onEdit={edit}+ />);});+export function RelationshipEditSheet() {+ const { layout } = useLayout();+ const { selectedElement, setSelectedElement } = useSelect();+ const { relationships } = useDiagram();+ const { t } = useTranslation();++ const data =+ selectedElement.element === ObjectType.RELATIONSHIP &&+ selectedElement.open &&+ !layout.sidebar+ ? relationships.find((r) => r.id === selectedElement.id)+ : null;++ return (+ <SideSheet+ title={t("edit")}+ size="small"+ visible={Boolean(data)}+ onCancel={() => {+ setSelectedElement((prev) => ({+ ...prev,+ open: false,+ }));+ }}+ style={{ paddingBottom: "16px" }}+ >+ <div className="sidesheet-theme">+ {data && <RelationshipInfo data={data} />}+ </div>+ </SideSheet>+ );+}+const RelationshipPath = memo(function RelationshipPath({data,startTable,endTable,- relationships,+ startRelatedFieldKeys,+ endRelatedFieldKeys,onEdit,}) {const { settings } = useSettings();@@ -96,44 +109,42 @@ const RelationshipPath = memo(function RelationshipPath({if (!startTable || !endTable || startTable.hidden || endTable.hidden)return null;- const startFields = getVisibleFields(startTable, relationships);- const endFields = getVisibleFields(endTable, relationships);+ const startEntries = getVisibleFieldEntries(+ startTable,+ startRelatedFieldKeys,+ );+ const endEntries = getVisibleFieldEntries(endTable, endRelatedFieldKeys);+ const indexOf = (entries, fieldId) =>+ entries.findIndex(+ ({ field, originalIndex }) =>+ field.id === fieldId || originalIndex === fieldId,+ );const pairs = getRelationshipFields(data);return {- startFieldIndex: getVisibleFieldIndex(- startTable,- data.startFieldId,- relationships,- ),- endFieldIndex: getVisibleFieldIndex(- endTable,- data.endFieldId,- relationships,- ),+ startFieldIndex: indexOf(startEntries, data.startFieldId),+ endFieldIndex: indexOf(endEntries, data.endFieldId),startFieldIndices: pairs.map((p) =>- getVisibleFieldIndex(startTable, p.startFieldId, relationships),- ),- endFieldIndices: pairs.map((p) =>- getVisibleFieldIndex(endTable, p.endFieldId, relationships),+ indexOf(startEntries, p.startFieldId),),+ endFieldIndices: pairs.map((p) => indexOf(endEntries, p.endFieldId)),startTable: {x: startTable.x,y: startTable.y,width: getTableWidth(startTable),comment: startTable.comment,- fields: startFields,+ fields: startEntries.map(({ field }) => field),},endTable: {x: endTable.x,y: endTable.y,width: getTableWidth(endTable),comment: endTable.comment,- fields: endFields,+ fields: endEntries.map(({ field }) => field),},};- }, [startTable, endTable, relationships, data]);+ }, [startTable, endTable, startRelatedFieldKeys, endRelatedFieldKeys, data]);const isComposite = (pathValues?.startFieldIndices?.length ?? 0) > 1;diff --git a/src/components/EditorCanvas/ResizeHandles.jsx b/src/components/EditorCanvas/ResizeHandles.jsxindex e7bcaf06..ab09170f 100644--- a/src/components/EditorCanvas/ResizeHandles.jsx+++ b/src/components/EditorCanvas/ResizeHandles.jsx@@ -11,7 +11,6 @@ export default function ResizeHandles({y,width,height,- zoom,visible,onResize,onResizeEnd,@@ -41,7 +40,7 @@ export default function ResizeHandles({width,clientX: e.clientX,pointerId: e.pointerId,- zoom: zoom || 1,+ zoom: e.currentTarget.ownerSVGElement?.getScreenCTM()?.a || 1,};setActive(side);diff --git a/src/components/EditorCanvas/Table.jsx b/src/components/EditorCanvas/Table.jsxindex c556f9b1..6586ffcb 100644--- a/src/components/EditorCanvas/Table.jsx+++ b/src/components/EditorCanvas/Table.jsx@@ -27,14 +27,9 @@ import {SideSheet,Divider,} from "@douyinfe/semi-ui";-import {- useLayout,- useSettings,- useDiagram,- useSelect,- useUndoRedo,-} from "../../hooks";+import { useLayout, useSettings, useDiagram, useSelect } from "../../hooks";import { DiagramActionsContext } from "../../context/DiagramContext";+import { UndoRedoActionsContext } from "../../context/UndoRedoContext";import { SelectActionsContext } from "../../context/SelectContext";import TableInfo from "../EditorSidePanel/TablesTab/TableInfo";import { useTranslation } from "react-i18next";@@ -47,17 +42,17 @@ import {getTableHeight,getTableWidth,getVisibleFieldEntries,- getVisibleFields,getRelationshipFields,} from "../../utils/utils";import ResizeHandles from "./ResizeHandles";+const shadowInset = 12;+export default memo(function Table({tableData,isSelected,- zoom,database,- relationships,+ relatedFieldKeys,onPointerDown,setHoveredTable,handleGripField,@@ -70,7 +65,7 @@ export default memo(function Table({const { addTable, deleteTable, deleteField, updateTable } = useContext(DiagramActionsContext,);- const { setUndoStack, setRedoStack } = useUndoRedo();+ const { setUndoStack, setRedoStack } = useContext(UndoRedoActionsContext);const { settings } = useSettings();const { t } = useTranslation();const { setSelectedElement, setBulkSelectedElements } =@@ -83,20 +78,19 @@ export default memo(function Table({const width = getTableWidth(tableData);- const height = getTableHeight(- tableData,- settings.showComments,- relationships,+ const height = useMemo(+ () => getTableHeight(tableData, settings.showComments, relatedFieldKeys),+ [tableData, settings.showComments, relatedFieldKeys],);const visibleFieldEntries = useMemo(- () => getVisibleFieldEntries(tableData, relationships),- [tableData, relationships],+ () => getVisibleFieldEntries(tableData, relatedFieldKeys),+ [tableData, relatedFieldKeys],);const visibleFields = useMemo(- () => getVisibleFields(tableData, relationships),- [tableData, relationships],+ () => visibleFieldEntries.map(({ field }) => field),+ [visibleFieldEntries],);const toggleTableCollapse = (e) => {@@ -243,18 +237,19 @@ export default memo(function Table({<><foreignObjectkey={tableData.id}- x={tableData.x}- y={tableData.y}- width={width}- height={height}- className="group drop-shadow-lg rounded-md cursor-move"+ x={tableData.x - shadowInset}+ y={tableData.y - shadowInset}+ width={width + shadowInset * 2}+ height={height + shadowInset * 2}+ className="group"onPointerDown={() => onPointerDown(tableData, ObjectType.TABLE)}onPointerEnter={(e) => e.isPrimary && setHovered(true)}onPointerLeave={(e) => e.isPrimary && setHovered(false)}>- <div- onDoubleClick={openEditor}- className={`border-2 hover:border-dashed hover:border-blue-500+ <div className="pointer-events-none" style={{ padding: shadowInset }}>+ <div+ onDoubleClick={openEditor}+ className={`pointer-events-auto cursor-move shadow-[0_4px_4px_rgb(0_0_0/0.15)] border-2 hover:border-dashed hover:border-blue-500select-none rounded-lg w-full ${settings.mode === "light"? "bg-zinc-100 text-zinc-800"@@ -266,159 +261,160 @@ export default memo(function Table({? "border-solid border-blue-500": borderColor}`}- style={{ direction: "ltr" }}- >- <div- className="h-[10px] w-full rounded-t-md"- style={{ backgroundColor: tableData.color }}- />- <div- className={`${- visibleFieldEntries.length === 0- ? "rounded-b-md"- : "border-b border-gray-400"- } ${- settings.mode === "light" ? "bg-zinc-100" : "bg-zinc-900"- } ${tableData.comment && settings.showComments ? "pb-3" : ""}`}+ style={{ direction: "ltr" }}><div- className={`overflow-hidden font-bold h-[40px] flex justify-between items-center gap-2`}+ className="h-[10px] w-full rounded-t-md"+ style={{ backgroundColor: tableData.color }}+ />+ <div+ className={`${+ visibleFieldEntries.length === 0+ ? "rounded-b-md"+ : "border-b border-gray-400"+ } ${+ settings.mode === "light" ? "bg-zinc-100" : "bg-zinc-900"+ } ${tableData.comment && settings.showComments ? "pb-3" : ""}`}>- <div className="px-3 overflow-hidden text-ellipsis whitespace-nowrap min-w-0 flex-1">- {tableData.name}- </div>- <div className="hidden group-hover:flex items-center shrink-0 pe-2">- <ButtonGroup- type="tertiary"- size="small"- aria-label={t("table_actions")}- >- <Button- size="small"+ <div+ className={`overflow-hidden font-bold h-[40px] flex justify-between items-center gap-2`}+ >+ <div className="px-3 overflow-hidden text-ellipsis whitespace-nowrap min-w-0 flex-1">+ {tableData.name}+ </div>+ <div className="hidden group-hover:flex items-center shrink-0 pe-2">+ <ButtonGrouptype="tertiary"- title={- tableData.locked ? t("unlock_table") : t("lock_table")- }- icon={- tableData.locked ? (- <IconLock size="small" />- ) : (- <IconUnlock size="small" />- )- }- disabled={layout.readOnly}- onClick={lockUnlockTable}- />- <Buttonsize="small"- type="tertiary"- icon={- tableData.collapsed ? (- <IconChevronDown size="small" />- ) : (- <IconChevronUp size="small" />- )- }- disabled={layout.readOnly}- aria-label={- tableData.collapsed- ? t("expand_unlinked_columns")- : t("collapse_unlinked_columns")- }- title={- tableData.collapsed- ? t("expand_unlinked_columns")- : t("collapse_unlinked_columns")- }- onClick={toggleTableCollapse}- onPointerDown={(e) => e.stopPropagation()}- />- <Popover- key={tableData.id}- content={- <div className="popover-theme flex flex-col py-1 min-w-[160px]">- <Button- icon={<IconEditStroked />}- type="tertiary"- theme="borderless"- block- style={{ justifyContent: "flex-start" }}- onClick={openEditor}- >- {t("edit")}- </Button>- <Button- icon={<IconCopyStroked />}- type="tertiary"- theme="borderless"- block- style={{ justifyContent: "flex-start" }}- onClick={duplicateTable}- disabled={layout.readOnly}- >- {t("duplicate")}- </Button>- <Divider className="!my-1" />- <Button- icon={<IconDeleteStroked />}- type="danger"- theme="borderless"- block- style={{ justifyContent: "flex-start" }}- onClick={() => deleteTable(tableData.id)}- disabled={layout.readOnly}- >- {t("delete")}- </Button>- </div>- }- position="rightTop"- style={{ padding: 8 }}- showArrow- trigger="click"+ aria-label={t("table_actions")}><Buttonsize="small"type="tertiary"- icon={<IconMore size="small" />}- title={t("see_more")}+ title={+ tableData.locked ? t("unlock_table") : t("lock_table")+ }+ icon={+ tableData.locked ? (+ <IconLock size="small" />+ ) : (+ <IconUnlock size="small" />+ )+ }+ disabled={layout.readOnly}+ onClick={lockUnlockTable}+ />+ <Button+ size="small"+ type="tertiary"+ icon={+ tableData.collapsed ? (+ <IconChevronDown size="small" />+ ) : (+ <IconChevronUp size="small" />+ )+ }+ disabled={layout.readOnly}+ aria-label={+ tableData.collapsed+ ? t("expand_unlinked_columns")+ : t("collapse_unlinked_columns")+ }+ title={+ tableData.collapsed+ ? t("expand_unlinked_columns")+ : t("collapse_unlinked_columns")+ }+ onClick={toggleTableCollapse}+ onPointerDown={(e) => e.stopPropagation()}/>- </Popover>- </ButtonGroup>+ <Popover+ key={tableData.id}+ content={+ <div className="popover-theme flex flex-col py-1 min-w-[160px]">+ <Button+ icon={<IconEditStroked />}+ type="tertiary"+ theme="borderless"+ block+ style={{ justifyContent: "flex-start" }}+ onClick={openEditor}+ >+ {t("edit")}+ </Button>+ <Button+ icon={<IconCopyStroked />}+ type="tertiary"+ theme="borderless"+ block+ style={{ justifyContent: "flex-start" }}+ onClick={duplicateTable}+ disabled={layout.readOnly}+ >+ {t("duplicate")}+ </Button>+ <Divider className="!my-1" />+ <Button+ icon={<IconDeleteStroked />}+ type="danger"+ theme="borderless"+ block+ style={{ justifyContent: "flex-start" }}+ onClick={() => deleteTable(tableData.id)}+ disabled={layout.readOnly}+ >+ {t("delete")}+ </Button>+ </div>+ }+ position="rightTop"+ style={{ padding: 8 }}+ showArrow+ trigger="click"+ >+ <Button+ size="small"+ type="tertiary"+ icon={<IconMore size="small" />}+ title={t("see_more")}+ />+ </Popover>+ </ButtonGroup>+ </div></div>+ {tableData.comment && settings.showComments && (+ <div className="text-xs px-3 line-clamp-5">+ {tableData.comment}+ </div>+ )}</div>- {tableData.comment && settings.showComments && (- <div className="text-xs px-3 line-clamp-5">- {tableData.comment}- </div>- )}- </div>- {visibleFieldEntries.map(({ field: e }, i) => {- return settings.showFieldSummary ? (- <Popover- key={e.id ?? i}- content={- <FieldSummary- field={e}- tableId={tableData.id}- database={database}- />- }- position="right"- showArrow- style={- isRtl(i18n.language)- ? { direction: "rtl" }- : { direction: "ltr" }- }- >- {field(e, i)}- </Popover>- ) : (- field(e, i)- );- })}+ {visibleFieldEntries.map(({ field: e }, i) => {+ return settings.showFieldSummary ? (+ <Popover+ key={e.id ?? i}+ content={+ <FieldSummary+ field={e}+ tableId={tableData.id}+ database={database}+ />+ }+ position="right"+ showArrow+ style={+ isRtl(i18n.language)+ ? { direction: "rtl" }+ : { direction: "ltr" }+ }+ >+ {field(e, i)}+ </Popover>+ ) : (+ field(e, i)+ );+ })}+ </div></div></foreignObject>{!layout.readOnly && !tableData.locked && (@@ -427,14 +423,12 @@ export default memo(function Table({y={tableData.y}width={width}height={height}- zoom={zoom}visible={hovered}onResize={resizeTable}onResizeEnd={commitResize}onEngagedChange={setResizeEngaged}/>)}- <TableEditSheet tableData={tableData} /></>);@@ -651,21 +645,24 @@ function FieldSummary({ field: e, tableId, database }) {);}-function TableEditSheet({ tableData }) {+export function TableEditSheet() {const { layout } = useLayout();const { selectedElement, setSelectedElement } = useSelect();+ const { tables } = useDiagram();const { t } = useTranslation();+ const tableData =+ selectedElement.element === ObjectType.TABLE &&+ selectedElement.open &&+ !layout.sidebar+ ? tables.find((table) => table.id === selectedElement.id)+ : null;+return (<SideSheettitle={t("edit")}size="small"- visible={- selectedElement.element === ObjectType.TABLE &&- selectedElement.id === tableData.id &&- selectedElement.open &&- !layout.sidebar- }+ visible={Boolean(tableData)}onCancel={() =>setSelectedElement((prev) => ({...prev,@@ -675,7 +672,7 @@ function TableEditSheet({ tableData }) {style={{ paddingBottom: "16px" }}><div className="sidesheet-theme">- <TableInfo data={tableData} />+ {tableData && <TableInfo data={tableData} />}</div></SideSheet>);diff --git a/src/components/EditorCanvas/View.jsx b/src/components/EditorCanvas/View.jsxindex 1f90959b..8091a492 100644--- a/src/components/EditorCanvas/View.jsx+++ b/src/components/EditorCanvas/View.jsx@@ -23,7 +23,6 @@ import {useSelect,useViews,useUndoRedo,- useTransform,} from "../../hooks";import ViewInfo from "../EditorSidePanel/ViewsTab/ViewInfo";import { useTranslation } from "react-i18next";@@ -43,7 +42,6 @@ export default memo(function View({ viewData, onPointerDown }) {const { views, addView, deleteView, updateView } = useViews();const { settings } = useSettings();const { setUndoStack, setRedoStack } = useUndoRedo();- const { transform } = useTransform();const { t } = useTranslation();const {selectedElement,@@ -360,7 +358,6 @@ export default memo(function View({ viewData, onPointerDown }) {y={viewData.y}width={width}height={height}- zoom={transform.zoom}visible={hovered}onResize={resizeView}onResizeEnd={commitResize}diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsxindex 2414d1d6..fb67a8cb 100644--- a/src/components/EditorHeader/ControlPanel.jsx+++ b/src/components/EditorHeader/ControlPanel.jsx@@ -100,7 +100,11 @@ import { applyDiagramPlan } from "../../utils/dbml/applyPlan";import { diffDiagram } from "../../utils/dbml/diff";import { exportSavedData } from "../../utils/exportSavedData";import { nanoid } from "nanoid";-import { getTableHeight, getTableWidth } from "../../utils/utils";+import {+ getRelatedFieldKeysByTable,+ getTableHeight,+ getTableWidth,+} from "../../utils/utils";import {getViewHeight,getViewWidth,@@ -718,13 +722,19 @@ export default function ControlPanel({maxY: -Infinity,};+ const relatedFieldKeysByTable = getRelatedFieldKeysByTable(relationships);tablesToFit.forEach((table) => {minMaxXY.minX = Math.min(minMaxXY.minX, table.x);minMaxXY.minY = Math.min(minMaxXY.minY, table.y);minMaxXY.maxX = Math.max(minMaxXY.maxX, table.x + getTableWidth(table));minMaxXY.maxY = Math.max(minMaxXY.maxY,- table.y + getTableHeight(table, settings.showComments, relationships),+ table.y ++ getTableHeight(+ table,+ settings.showComments,+ relatedFieldKeysByTable.get(table.id),+ ),);});diff --git a/src/components/EditorSidePanel/Issues.jsx b/src/components/EditorSidePanel/Issues.jsxindex 0c9c8fd7..c7e57f10 100644--- a/src/components/EditorSidePanel/Issues.jsx+++ b/src/components/EditorSidePanel/Issues.jsx@@ -21,7 +21,7 @@ export default function Issues({ dbmlProblems = [] }) {const [issues, setIssues] = useState([]);useEffect(() => {- const findIssues = async () => {+ const timer = setTimeout(() => {const newIssues = getIssues({tables: tables,relationships: relationships,@@ -34,9 +34,9 @@ export default function Issues({ dbmlProblems = [] }) {if (!arrayIsEqual(newIssues, issues)) {setIssues(newIssues);}- };+ }, 300);- findIssues();+ return () => clearTimeout(timer);}, [tables, relationships, issues, types, database, enums, views]);const badgeCount = settings.strictModediff --git a/src/components/EditorSidePanel/RelationshipsTab/RelationshipsTab.jsx b/src/components/EditorSidePanel/RelationshipsTab/RelationshipsTab.jsxindex 537db7cd..79b63174 100644--- a/src/components/EditorSidePanel/RelationshipsTab/RelationshipsTab.jsx+++ b/src/components/EditorSidePanel/RelationshipsTab/RelationshipsTab.jsx@@ -1,3 +1,4 @@+import { memo } from "react";import { Collapse } from "@douyinfe/semi-ui";import { useSelect, useDiagram, useSaveState, useLayout } from "../../../hooks";import Empty from "../Empty";@@ -12,7 +13,6 @@ export default function RelationshipsTab() {const { relationships, setRelationships } = useDiagram();const { selectedElement, setSelectedElement } = useSelect();const { setSaveState } = useSaveState();- const { layout } = useLayout();const { t } = useTranslation();return (@@ -48,27 +48,39 @@ export default function RelationshipsTab() {items={relationships}onChange={(newRelationships) => setRelationships(newRelationships)}afterChange={() => setSaveState(State.SAVING)}- renderItem={(item) => (- <div id={`scroll_ref_${item.id}`} key={"relationship_" + item.id}>- <Collapse.Panel- className="relative"- header={- <div className="w-full flex items-center gap-2">- <DragHandle readOnly={layout.readOnly} id={item.id} />- <div className="overflow-hidden text-ellipsis whitespace-nowrap">- {item.name}- </div>- </div>- }- itemKey={`${item.id}`}- >- <RelationshipInfo data={item} />- </Collapse.Panel>- </div>- )}+ renderItem={renderRelationshipListItem}/></Collapse>)}</>);}++const renderRelationshipListItem = (relationship) => (+ <RelationshipListItem relationship={relationship} />+);++const RelationshipListItem = memo(function RelationshipListItem({+ relationship,+}) {+ const { layout } = useLayout();++ return (+ <div id={`scroll_ref_${relationship.id}`}>+ <Collapse.Panel+ className="relative"+ header={+ <div className="w-full flex items-center gap-2">+ <DragHandle readOnly={layout.readOnly} id={relationship.id} />+ <div className="overflow-hidden text-ellipsis whitespace-nowrap">+ {relationship.name}+ </div>+ </div>+ }+ itemKey={`${relationship.id}`}+ >+ <RelationshipInfo data={relationship} />+ </Collapse.Panel>+ </div>+ );+});diff --git a/src/components/EditorSidePanel/SidePanel.jsx b/src/components/EditorSidePanel/SidePanel.jsxindex ac56fc00..6dd5d3d7 100644--- a/src/components/EditorSidePanel/SidePanel.jsx+++ b/src/components/EditorSidePanel/SidePanel.jsx@@ -1,4 +1,4 @@-import { useMemo, useState } from "react";+import { memo, useMemo, useState } from "react";import { Tabs, TabPane } from "@douyinfe/semi-ui";import { IconCode, IconList } from "@douyinfe/semi-icons";import { IconTable, IconRelationship } from "../../icons";@@ -29,7 +29,7 @@ import i18n from "../../i18n/i18n";import DBMLEditor from "./DBMLEditor";import SqlHeaderTab from "./SqlHeaderTab";-export default function SidePanel({ width, resize, setResize }) {+export default memo(function SidePanel({ width, resize, setResize }) {const { layout, setLayout } = useLayout();const { settings } = useSettings();const { selectedElement, setSelectedElement } = useSelect();@@ -210,4 +210,4 @@ export default function SidePanel({ width, resize, setResize }) {</div></div>);-}+});diff --git a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx b/src/components/EditorSidePanel/TablesTab/TablesTab.jsxindex 06e3e172..a1122597 100644--- a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx+++ b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx@@ -1,3 +1,4 @@+import { memo, useContext } from "react";import { Collapse, Button } from "@douyinfe/semi-ui";import { IconEyeOpened, IconEyeClosed } from "@douyinfe/semi-icons";import { IconPlus } from "@douyinfe/semi-icons";@@ -6,9 +7,10 @@ import {useDiagram,useSaveState,useLayout,- useUndoRedo,useSettings,} from "../../../hooks";+import { DiagramActionsContext } from "../../../context/DiagramContext";+import { UndoRedoActionsContext } from "../../../context/UndoRedoContext";import { Action, ObjectType, State } from "../../../data/constants";import { useTranslation } from "react-i18next";import { DragHandle } from "../../SortableList/DragHandle";@@ -65,7 +67,7 @@ export default function TablesTab() {items={tables}onChange={(newTables) => setTables(newTables)}afterChange={() => setSaveState(State.SAVING)}- renderItem={(item) => <TableListItem table={item} />}+ renderItem={renderTableListItem}/></Collapse>)}@@ -73,10 +75,12 @@ export default function TablesTab() {);}-function TableListItem({ table }) {+const renderTableListItem = (table) => <TableListItem table={table} />;++const TableListItem = memo(function TableListItem({ table }) {const { layout } = useLayout();- const { updateTable } = useDiagram();- const { setUndoStack, setRedoStack } = useUndoRedo();+ const { updateTable } = useContext(DiagramActionsContext);+ const { setUndoStack, setRedoStack } = useContext(UndoRedoActionsContext);const { settings } = useSettings();const { t } = useTranslation();@@ -141,4 +145,4 @@ function TableListItem({ table }) {</Collapse.Panel></div>);-}+});diff --git a/src/components/SortableList/SortableList.jsx b/src/components/SortableList/SortableList.jsxindex efc55a53..83132253 100644--- a/src/components/SortableList/SortableList.jsx+++ b/src/components/SortableList/SortableList.jsx@@ -1,3 +1,4 @@+import { memo, useRef } from "react";import {closestCenter,DndContext,@@ -12,6 +13,10 @@ import {} from "@dnd-kit/sortable";import { SortableItem } from "./SortableItem";+const SortableRow = memo(function SortableRow({ item, index, renderItem }) {+ return <SortableItem id={item.id}>{renderItem(item, index)}</SortableItem>;+});+export function SortableList({items,onChange,@@ -20,6 +25,15 @@ export function SortableList({keyPrefix,}) {const sensors = useSensors(useSensor(PointerSensor));+ const idsRef = useRef([]);++ const ids = items.map((item) => item.id);+ if (+ ids.length !== idsRef.current.length ||+ ids.some((id, i) => id !== idsRef.current[i])+ ) {+ idsRef.current = ids;+ }const handleDragEnd = (event) => {const { active, over } = event;@@ -39,14 +53,17 @@ export function SortableList({collisionDetection={closestCenter}onDragEnd={handleDragEnd}>- <SortableContext items={items} strategy={verticalListSortingStrategy}>+ <SortableContext+ items={idsRef.current}+ strategy={verticalListSortingStrategy}+ >{items.map((item, i) => (- <SortableItem- id={item.id}+ <SortableRowkey={`${keyPrefix}-sortable-item-${item.id}`}- >- {renderItem(item, i)}- </SortableItem>+ item={item}+ index={i}+ renderItem={renderItem}+ />))}</SortableContext></DndContext>diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsxindex bec4f93a..a485a601 100644--- a/src/components/Workspace.jsx+++ b/src/components/Workspace.jsx@@ -508,13 +508,19 @@ export default function WorkSpace({ forcedDiagramId } = {}) {views?.length,types?.length,relationships?.length,- transform.zoom,title,gistId,sqlHeader,setSaveState,]);+ useEffect(() => {+ if (!settings.autosave || tables.length === 0) return;++ const timer = setTimeout(() => setSaveState(State.SAVING), 500);+ return () => clearTimeout(timer);+ }, [transform.zoom, settings.autosave, tables.length, setSaveState]);+useEffect(() => {if (layout.readOnly) return;diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsxindex 3f9ed088..919c20cc 100644--- a/src/context/DiagramContext.jsx+++ b/src/context/DiagramContext.jsx@@ -175,6 +175,24 @@ export default function DiagramContextProvider({ children }) {}};+ const updateTables = (updatesById) => {+ setTables((prev) =>+ prev.map((t) =>+ updatesById.has(t.id) ? { ...t, ...updatesById.get(t.id) } : t,+ ),+ );+ if (shouldEmit()) {+ updatesById.forEach((updatedValues, id) => {+ emitDelta({+ target: "table",+ action: "update",+ entityId: id,+ data: [id, updatedValues],+ });+ });+ }+ };+const updateField = (tid, fid, updatedValues) => {setTables((prev) =>prev.map((table) => {@@ -335,6 +353,7 @@ export default function DiagramContextProvider({ children }) {latestActionsRef.current = {addTable,updateTable,+ updateTables,updateField,deleteField,deleteTable,diff --git a/src/context/UndoRedoContext.jsx b/src/context/UndoRedoContext.jsxindex f878d272..091c8f1b 100644--- a/src/context/UndoRedoContext.jsx+++ b/src/context/UndoRedoContext.jsx@@ -1,4 +1,4 @@-import { createContext, useState } from "react";+import { createContext, useMemo, useState } from "react";export const UndoRedoContext = createContext({undoStack: [],@@ -7,15 +7,27 @@ export const UndoRedoContext = createContext({setRedoStack: () => {},});+export const UndoRedoActionsContext = createContext({+ setUndoStack: () => {},+ setRedoStack: () => {},+});+export default function UndoRedoContextProvider({ children }) {const [undoStack, setUndoStack] = useState([]);const [redoStack, setRedoStack] = useState([]);+ const actions = useMemo(() => ({ setUndoStack, setRedoStack }), []);++ const value = useMemo(+ () => ({ ...actions, undoStack, redoStack }),+ [actions, undoStack, redoStack],+ );+return (- <UndoRedoContext.Provider- value={{ undoStack, redoStack, setUndoStack, setRedoStack }}- >- {children}- </UndoRedoContext.Provider>+ <UndoRedoActionsContext.Provider value={actions}>+ <UndoRedoContext.Provider value={value}>+ {children}+ </UndoRedoContext.Provider>+ </UndoRedoActionsContext.Provider>);}diff --git a/src/utils/autoArrange.js b/src/utils/autoArrange.jsindex b199cff9..dccd55e0 100644--- a/src/utils/autoArrange.js+++ b/src/utils/autoArrange.js@@ -1,6 +1,10 @@import { graphlib, layout } from "@dagrejs/dagre";import { tableWidth as defaultTableWidth } from "../data/constants";-import { getTableHeight, getTableWidth } from "./utils";+import {+ getRelatedFieldKeysByTable,+ getTableHeight,+ getTableWidth,+} from "./utils";const nodeSep = 60;const rankSep = 110;@@ -25,9 +29,14 @@ export function autoArrange(tables, relationships, settings) {}}+ const relatedFieldKeysByTable = getRelatedFieldKeysByTable(relationships);const sizeOf = (table) => ({width: getTableWidth(table),- height: getTableHeight(table, settings.showComments, relationships),+ height: getTableHeight(+ table,+ settings.showComments,+ relatedFieldKeysByTable.get(table.id),+ ),});const connected = movable.filter((table) => connectedIds.has(table.id));diff --git a/src/utils/utils.js b/src/utils/utils.jsindex c53b33ed..c33257e0 100644--- a/src/utils/utils.js+++ b/src/utils/utils.js@@ -185,31 +185,33 @@ export function getRelationshipFields(relationship) {];}-export function isFieldRelatedToTable(- tableId,- field,- fieldIndex,- relationships = [],-) {- return relationships.some((relationship) =>- getRelationshipFields(relationship).some(- (pair) =>- (relationship.startTableId === tableId &&- (pair.startFieldId === field.id ||- pair.startFieldId === fieldIndex)) ||- (relationship.endTableId === tableId &&- (pair.endFieldId === field.id || pair.endFieldId === fieldIndex)),- ),- );+export function getRelatedFieldKeysByTable(relationships = []) {+ const byTable = new Map();+ const add = (tableId, key) => {+ let keys = byTable.get(tableId);+ if (!keys) {+ keys = new Set();+ byTable.set(tableId, keys);+ }+ keys.add(key);+ };+ for (const relationship of relationships) {+ for (const pair of getRelationshipFields(relationship)) {+ add(relationship.startTableId, pair.startFieldId);+ add(relationship.endTableId, pair.endFieldId);+ }+ }+ return byTable;}-export function getVisibleFieldEntries(table, relationships = []) {+export function getVisibleFieldEntries(table, relatedFieldKeys) {const fields = table.fields ?? [];return fields.reduce((entries, field, index) => {if (!table.collapsed ||- isFieldRelatedToTable(table.id, field, index, relationships)+ relatedFieldKeys?.has(field.id) ||+ relatedFieldKeys?.has(index)) {entries.push({ field, originalIndex: index });}@@ -217,14 +219,9 @@ export function getVisibleFieldEntries(table, relationships = []) {}, []);}-export function getVisibleFields(table, relationships = []) {- return getVisibleFieldEntries(table, relationships).map(({ field }) => field);-}--export function getVisibleFieldIndex(table, fieldId, relationships = []) {- return getVisibleFieldEntries(table, relationships).findIndex(- ({ field, originalIndex }) =>- field.id === fieldId || originalIndex === fieldId,+export function getVisibleFields(table, relatedFieldKeys) {+ return getVisibleFieldEntries(table, relatedFieldKeys).map(+ ({ field }) => field,);}@@ -254,9 +251,9 @@ export function getFieldOffsetY(return total;}-export function getTableHeight(table, showComments = true, relationships = []) {+export function getTableHeight(table, showComments = true, relatedFieldKeys) {const width = getTableWidth(table);- const visibleFields = getVisibleFields(table, relationships);+ const visibleFields = getVisibleFields(table, relatedFieldKeys);return (getFieldsTotalHeight(visibleFields, width, showComments) +