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

DataLinkDC · Dec 1, 2021 · 744c07a · 744c07a
1 parent a3d18b2
commit 744c07a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/dlink-web/src/components/Studio/StudioMenu/index.tsx b/dlink-web/src/components/Studio/StudioMenu/index.tsx
@@ -45,11 +45,11 @@ const StudioMenu = (props: any) => {
     }
     let useSession = !!currentSession.session;
     let param = {
+      ...current.task,
       useSession: useSession,
       session: currentSession.session,
-      statement: selectsql,
       configJson: JSON.stringify(current.task.config),
-      ...current.task,
+      statement: selectsql,
     };
     const key = current.key;
     const taskKey = (Math.random() * 1000) + '';

diff --git a/dlink-web/src/components/Studio/StudioTree/index.tsx b/dlink-web/src/components/Studio/StudioTree/index.tsx
@@ -253,10 +253,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
     const {pageX, pageY} = {...rightClickNodeTreeItem};
     const tmpStyle = {
       position: 'absolute',
-      // left: `${pageX - 50}px`,
-      // top: `${pageY - 202}px`,
-      left: `${pageX}px`,
-      top: `${pageY - 120}px`,
+      left: `${pageX - 40}px`,
+      top: `${pageY - 150}px`,
     };
     let menuItems;
     if(rightClickNode&&rightClickNode.isLeaf){
@@ -307,15 +305,10 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
   };
 
   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);
     setRightClickNodeTreeItem({
       pageX: e.pageX,
-      pageY: position.top+sref.current.getScrollTop(),
+      pageY: e.pageY+sref.current.getScrollTop(),
       id: node.id,
       categoryName: node.name
     });