Commit 744c07a2 authored by wenmo's avatar wenmo

修复树右键菜单位置与无法执行选中sql的问题

parent a3d18b27
...@@ -45,11 +45,11 @@ const StudioMenu = (props: any) => { ...@@ -45,11 +45,11 @@ const StudioMenu = (props: any) => {
} }
let useSession = !!currentSession.session; let useSession = !!currentSession.session;
let param = { let param = {
...current.task,
useSession: useSession, useSession: useSession,
session: currentSession.session, session: currentSession.session,
statement: selectsql,
configJson: JSON.stringify(current.task.config), configJson: JSON.stringify(current.task.config),
...current.task, statement: selectsql,
}; };
const key = current.key; const key = current.key;
const taskKey = (Math.random() * 1000) + ''; const taskKey = (Math.random() * 1000) + '';
......
...@@ -253,10 +253,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => { ...@@ -253,10 +253,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
const {pageX, pageY} = {...rightClickNodeTreeItem}; const {pageX, pageY} = {...rightClickNodeTreeItem};
const tmpStyle = { const tmpStyle = {
position: 'absolute', position: 'absolute',
// left: `${pageX - 50}px`, left: `${pageX - 40}px`,
// top: `${pageY - 202}px`, top: `${pageY - 150}px`,
left: `${pageX}px`,
top: `${pageY - 120}px`,
}; };
let menuItems; let menuItems;
if(rightClickNode&&rightClickNode.isLeaf){ if(rightClickNode&&rightClickNode.isLeaf){
...@@ -307,15 +305,10 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => { ...@@ -307,15 +305,10 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
}; };
const handleContextMenu = (e: React.MouseEvent, node: TreeDataNode) => { const handleContextMenu = (e: React.MouseEvent, node: TreeDataNode) => {
console.log('top:',sref.current.getScrollTop());
console.log('node:',node);
console.log('e:',e.pageY);
let position = e.currentTarget.getBoundingClientRect();
console.log('p:',position);
setRightClickNode(node); setRightClickNode(node);
setRightClickNodeTreeItem({ setRightClickNodeTreeItem({
pageX: e.pageX, pageX: e.pageX,
pageY: position.top+sref.current.getScrollTop(), pageY: e.pageY+sref.current.getScrollTop(),
id: node.id, id: node.id,
categoryName: node.name categoryName: node.name
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment