mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 10:26:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: incorrect highlight linkage for association field (#4794)
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Katherine 2024-07-02 10:19:51 +08:00 committed by GitHub
parent 906e0773d2
commit 9e95aec449
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx
View File

@ -258,7 +258,9 @@ const PopoverContent = React.forwardRef((props: any, ref) => {
id={property.id} id={property.id}
style={{ style={{
background: background:
targetPort || sourcePort === property.id || associated?.includes(property.name) ? '#e6f7ff' : null, targetPort === property.id || sourcePort === property.id || associated?.includes(property.name)
? '#e6f7ff'
: null,
}} }}
onMouseEnter={() => { onMouseEnter={() => {
setIsHovered(true); setIsHovered(true);

6
packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx
View File

@ -59,7 +59,7 @@ export const getChildrenCollections = (collections, name) => {
}; };
export const formatData = (data) => { export const formatData = (data) => {
const edgeData = []; const edgeData = [];
const targetTablekeys = []; const targetTableKeys = [];
const tableData = data.map((item) => { const tableData = data.map((item) => {
const ports = []; const ports = [];
@ -88,7 +88,7 @@ export const formatData = (data) => {
['obo', 'oho', 'o2o', 'o2m', 'm2o', 'm2m', 'linkTo'].includes(field.interface) && edgeData.push(field); ['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); const portsData = formatPortData(ports);
return { return {
id: item.name, id: item.name,
@ -101,7 +101,7 @@ export const formatData = (data) => {
item: item, item: item,
}; };
}); });
const edges = formatRelationEdgeData(edgeData, targetTablekeys, tableData); const edges = formatRelationEdgeData(edgeData, targetTableKeys, tableData);
const inheritEdges = formatInheritEdgeData(data); const inheritEdges = formatInheritEdgeData(data);
return { nodesData: tableData, edgesData: edges, inheritEdges }; return { nodesData: tableData, edgesData: edges, inheritEdges };
}; };