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

Jump to bottom

修复右键菜单位置及执行选中无效的bug #42

Merged
merged 2 commits into from
Dec 1, 2021
Merged

修复右键菜单位置及执行选中无效的bug #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3d18b2
优化右键菜单的显示高度
coderTomato Dec 1, 2021
744c07a
修复树右键菜单位置与无法执行选中sql的问题
aiwenmo Dec 1, 2021
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
15 changes: 2 additions & 13 deletions dlink-web/src/components/Studio/StudioEdit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as _monaco from "monaco-editor";
import MonacoEditor from "react-monaco-editor";
import {BaseDataSourceField, BaseDataSourceHeader, CompletionItem} from "./data";
import styles from './index.less';

import {StateType} from "@/pages/FlinkSqlStudio/model";
import {connect} from "umi";
import {DocumentStateType} from "@/pages/Document/model";
Expand All @@ -15,13 +14,6 @@ let provider = {
dispose: () => {},
};

interface IRightContent {
key: string;
value: any;
handleCheck: () => Promise<boolean>;
secondRightData: (BaseDataSourceField|BaseDataSourceHeader)[];
}

interface ISuggestions {
label: string;
kind: string;
Expand All @@ -31,6 +23,7 @@ interface ISuggestions {

const FlinkSqlEditor = (props:any) => {
const {
tabsKey,
height = '100%',
width = '100%',
language = 'sql',
Expand All @@ -42,13 +35,9 @@ const FlinkSqlEditor = (props:any) => {
tabs,
fillDocuments,
dispatch,
} = props
;

const { tabsKey, value, handleCheck, secondRightData = [] }: IRightContent = props;
} = props;

const editorInstance:any = useRef<any>();

const monacoInstance: any = useRef();

const getTabIndex = ():number=>{
Expand Down
4 changes: 2 additions & 2 deletions dlink-web/src/components/Studio/StudioMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) + '';
Expand Down
34 changes: 16 additions & 18 deletions dlink-web/src/components/Studio/StudioTree/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ import UpdateCatalogueForm from './components/UpdateCatalogueForm';
import {ActionType} from "@ant-design/pro-table";
import UpdateTaskForm from "@/components/Studio/StudioTree/components/UpdateTaskForm";
import { Scrollbars } from 'react-custom-scrollbars';

const { DirectoryTree } = Tree;

const {Search} = Input;


type StudioTreeProps = {
rightClickMenu:StateType['rightClickMenu'];
dispatch:any;
tabs:StateType['tabs'];
current:StateType['current'];
toolHeight:number;
refs:any;
};

type RightClickMenu = {
Expand All @@ -50,7 +51,6 @@ const getParentKey = (key, tree) => {

const StudioTree: React.FC<StudioTreeProps> = (props) => {
const {rightClickMenu,dispatch,tabs,refs,toolHeight} = props;

const [treeData, setTreeData] = useState<TreeDataNode[]>();
const [dataList, setDataList] = useState<[]>();
const [expandedKeys, setExpandedKeys] = useState<[]>();
Expand All @@ -62,6 +62,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
const [taskFormValues, setTaskFormValues] = useState({});
const [rightClickNode, setRightClickNode] = useState<TreeDataNode>();
const [available, setAvailable] = useState<boolean>(true);
let sref = React.createRef<Scrollbars>();

const getTreeData = async () => {
const result = await getCatalogueTreeData();
Expand Down Expand Up @@ -95,9 +96,6 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
getTreeData();
}, []);

const onChange = (e:any) => {

};

const handleMenuClick=(key:string)=>{
if(key=='Open'){
Expand Down Expand Up @@ -255,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){
Expand Down Expand Up @@ -308,13 +304,13 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
return (treeData&&treeData.length==0)?empty:'';
};

const onRightClick = (e:any) => {
setRightClickNode(e.node);
const handleContextMenu = (e: React.MouseEvent, node: TreeDataNode) => {
setRightClickNode(node);
setRightClickNodeTreeItem({
pageX: e.event.pageX,
pageY: e.event.pageY,
id: e.node.id,
categoryName: e.node.name
pageX: e.pageX,
pageY: e.pageY+sref.current.getScrollTop(),
id: node.id,
categoryName: node.name
});
dispatch&&dispatch({
type: "Studio/showRightClickMenu",
Expand Down Expand Up @@ -360,11 +356,13 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
</Tooltip>
</Col>
</Row>
<Scrollbars style={{height:(toolHeight-32)}}>
<Scrollbars style={{height:(toolHeight-32)}} ref={sref}>
{/*<Search style={{marginBottom: 8}} placeholder="Search" onChange={onChange}/>*/}
<DirectoryTree
multiple
onRightClick={onRightClick}
onRightClick={({event, node}: any) => {
handleContextMenu(event, node)
}}
onSelect={onSelect}
switcherIcon={<DownOutlined/>}
treeData={treeData}
Expand Down