Skip to content

feat: pin node with menu #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pomelo-nwu merged 1 commit into from
Nov 2, 2023
Merged

feat: pin node with menu #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions packages/gi-assets-basic/src/components/PinNodeWithMenu/Component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import $i18n from '../../i18n';
import { handlePinNode, handleUnPinNode } from '../common/handlePinNode';

// import { INode } from '@antv/g6';
type INode = any;

const hasPinned = nodeModel => nodeModel?.data.__style?.badgeShapes?.find(badge => badge.name === 'pin');
export interface PinNodeMenuItemProps {
contextmenu: any;
controlledValues?: {
Expand All @@ -17,17 +17,17 @@ export interface PinNodeMenuItemProps {

const PinNodeMenuItem: React.FunctionComponent<PinNodeMenuItemProps> = props => {
const { contextmenu, controlledValues } = props;
const { graph, layout, restartForceSimulation, updateHistory } = useContext();
const isForce = layout.type === 'graphin-force';
const { graph, layout, updateHistory } = useContext();
const isForce = layout.type === 'graphin-force' || layout.type === 'force' || layout.type === 'd3force';

const [pinned, setPinned] = useState(false);

const targetNode = contextmenu.item;

const handleLockNode = (propId?: string, action?: 'pin' | 'unpin') => {
const target = contextmenu.item;
let { id } = contextmenu.item;
// 仅支持对节点的操作
const invalidFromContextMenu = !target || target.destroyed || target.getType?.() !== 'node';
const invalidFromContextMenu = !graph.getNodeData(id);
if (invalidFromContextMenu && !propId) {
handleUpateHistory(
undefined,
Expand All @@ -39,9 +39,7 @@ const PinNodeMenuItem: React.FunctionComponent<PinNodeMenuItemProps> = props =>
}
contextmenu.onClose();

let item;
let pinAction;
let id;
if (propId) {
if (!graph.findById(propId)) {
handleUpateHistory(
Expand All @@ -53,19 +51,23 @@ const PinNodeMenuItem: React.FunctionComponent<PinNodeMenuItemProps> = props =>
return;
}
id = propId;
item = graph.findById(propId);
pinAction = action || 'pin';
} else {
item = target;
const model = target.getModel();
id = model.id;
pinAction = model.pinned ? 'unpin' : 'pin';
setPinned(model.pinned);
const model = graph.getNodeData(id);
const pinned = hasPinned(model);
pinAction = pinned ? 'unpin' : 'pin';
setPinned(pinned);
}
if (pinAction === 'unpin') {
handleUnPinNode(item, graph, restartForceSimulation, isForce);
handleUnPinNode(id, graph);
} else {
handlePinNode(item, graph, restartForceSimulation, { dragNodeMass: 100000, isForce });
handlePinNode(id, graph, { dragNodeMass: 1000 });
}
if (isForce) {
graph.layout({
animated: true,
presetLayout: {},
});
}
handleUpateHistory(id, pinAction, true);
};
Expand Down Expand Up @@ -109,7 +111,7 @@ const PinNodeMenuItem: React.FunctionComponent<PinNodeMenuItemProps> = props =>

return (
<Menu.Item key="lock-node" eventKey="lock-node" onClick={() => handleLockNode()}>
{targetNode.pinned
{hasPinned(targetNode)
? $i18n.get({ id: 'basic.components.PinNodeWithMenu.Component.Unfix', dm: '解除固定' })
: $i18n.get({ id: 'basic.components.PinNodeWithMenu.Component.FixedNode', dm: '固定节点' })}
</Menu.Item>
Expand Down
55 changes: 23 additions & 32 deletions packages/gi-assets-basic/src/components/common/handlePinNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@ import { IGraph, icons } from '@antv/gi-sdk';

export const handlePinNode = (itemId, graph, params) => {
const { x, y, color, dragNodeMass } = params || {};
const nodeModel = graph.getNodeData(itemId);
if (!nodeModel) return;

try {
const { x: ox, y: oy, __style } = nodeModel.data;
const pinPosition = {
x: isNaN(x) ? ox : x,
y: isNaN(y) ? oy : y,
};
const pinBadge = {
text: icons.pushpin,
position: 'leftBottom',
Expand All @@ -15,17 +22,14 @@ export const handlePinNode = (itemId, graph, params) => {
[
{
id: itemId,
data: {
x,
y,
},
data: pinPosition,
},
],
true,
true,
);

const { badgeShapes = [] } = graph.getNodeData(itemId)?.data || {};
const { badgeShapes = [] } = __style || {};
if (!badgeShapes.find(badge => badge.name === 'pin')) {
badgeShapes.push(pinBadge);
graph.updateData('node', {
Expand All @@ -43,34 +47,21 @@ export const handlePinNode = (itemId, graph, params) => {
}
};

export const handleUnPinNode = (target, graph: IGraph, restartForceSimulation, isForce) => {
export const handleUnPinNode = (itemId, graph: IGraph) => {
try {
const model = target.getModel();
// 目前仅支持GraphinNode 节点
const isGraphinNode = model.type === 'graphin-circle';
if (!isGraphinNode) {
return;
}
const style = model.style || { badges: [] };
const badges = [...style.badges];
const index = badges.findIndex(({ value }) => value === icons.pushpin);
badges.splice(index, 1);
// 更改样式
graph.updateItem(model.id, {
layout: {
...model.layout,
force: { mass: null },
},
mass: 1,
pinned: false,
style: {
badges,
},
});

// 重启力导
if (isForce) {
restartForceSimulation([model], graph);
const { badgeShapes = [] } = graph.getNodeData(itemId)?.data?.__style || {};
const index = badgeShapes.findIndex(({ name }) => name === 'pin');
if (index > -1) {
badgeShapes.splice(index, 1);
graph.updateData('node', {
id: itemId,
data: {
mass: undefined,
__style: {
badgeShapes,
},
},
});
}
} catch (error) {
console.log(error);
Expand Down