Skip to content
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

fix(graph): user cursor has higher priority #16867

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix(graph): user cursor has higher priority #16867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c92a36
fix(graph): user cursor has higher priority
susiwen8 Apr 11, 2022
7127109
fix(graph): simplify code
susiwen8 Apr 12, 2022
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
1 change: 1 addition & 0 deletions src/chart/graph/GraphSeries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export interface GraphNodeItemOption extends SymbolOptionMixin, GraphNodeStateOp
category?: number | string

draggable?: boolean
cursor?: string
}

export interface GraphEdgeStateOption {
Expand Down
2 changes: 1 addition & 1 deletion src/chart/graph/GraphView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class GraphView extends ChartView {
}
});
}
el.setDraggable(draggable && !!forceLayout);
el.setDraggable(draggable && !!forceLayout, !!itemModel.get('cursor'));

const focus = itemModel.get(['emphasis', 'focus']);

Expand Down
4 changes: 2 additions & 2 deletions src/chart/helper/Symbol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ class Symbol extends graphic.Group {
symbolPath.z = z;
}

setDraggable(draggable: boolean) {
setDraggable(draggable: boolean, hasCursorOption?: boolean) {
const symbolPath = this.childAt(0) as ECSymbol;
symbolPath.draggable = draggable;
symbolPath.cursor = draggable ? 'move' : symbolPath.cursor;
symbolPath.cursor = hasCursorOption ? symbolPath.cursor : draggable ? 'move' : symbolPath.cursor;
susiwen8 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
2 changes: 2 additions & 0 deletions test/graph-symbol.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.