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

Merge branch 'main' into next

Browse Source
This commit is contained in:
xilesun 2024-07-02 12:23:25 +08:00
commit 4138432878
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull_request_template.md vendored
View File

@ -23,6 +23,8 @@ and provide some testing suggestions.
### Showcase ### Showcase
<!-- Including any screenshots of the changes. --> <!-- Including any screenshots of the changes. -->
### Related issues
### Changelog ### Changelog
| Language | Changelog | | Language | Changelog |

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 };
}; };