diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index cf023b08a..048b35873 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -23,6 +23,8 @@ and provide some testing suggestions. ### Showcase +### Related issues + ### Changelog | Language | Changelog | diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx index deb8eb5a1..ade64325b 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx @@ -258,7 +258,9 @@ const PopoverContent = React.forwardRef((props: any, ref) => { id={property.id} style={{ background: - targetPort || sourcePort === property.id || associated?.includes(property.name) ? '#e6f7ff' : null, + targetPort === property.id || sourcePort === property.id || associated?.includes(property.name) + ? '#e6f7ff' + : null, }} onMouseEnter={() => { setIsHovered(true); diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx index 73e9dbed5..9663e50fd 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx @@ -59,7 +59,7 @@ export const getChildrenCollections = (collections, name) => { }; export const formatData = (data) => { const edgeData = []; - const targetTablekeys = []; + const targetTableKeys = []; const tableData = data.map((item) => { const ports = []; @@ -88,7 +88,7 @@ export const formatData = (data) => { ['obo', 'oho', 'o2o', 'o2m', 'm2o', 'm2m', 'linkTo'].includes(field.interface) && edgeData.push(field); }); - targetTablekeys.push(item.name); + targetTableKeys.push(item.name); const portsData = formatPortData(ports); return { id: item.name, @@ -101,7 +101,7 @@ export const formatData = (data) => { item: item, }; }); - const edges = formatRelationEdgeData(edgeData, targetTablekeys, tableData); + const edges = formatRelationEdgeData(edgeData, targetTableKeys, tableData); const inheritEdges = formatInheritEdgeData(data); return { nodesData: tableData, edgesData: edges, inheritEdges }; };