Commit 45ccc198 authored by wenmo's avatar wenmo

去除滚动条

parent 84c263bc
@import '~antd/lib/style/themes/default.less'; @import '~antd/lib/style/themes/default.less';
.container{ .container{
background: #fafafa; background: #fafafa;
border: 1px solid #e6f7ff; //border: 1px solid #e6f7ff;
} }
.ant-divider-horizontal-0 { .ant-divider-horizontal-0 {
......
...@@ -16,7 +16,7 @@ const StudioRightTool = (props:any) => { ...@@ -16,7 +16,7 @@ const StudioRightTool = (props:any) => {
// const [form] = Form.useForm(); // const [form] = Form.useForm();
const {form} = props; const {form} = props;
return ( return (
<Tabs defaultActiveKey="1" size="small" tabPosition="right" style={{ height: "100%",overflow:"auto",border: "1px solid #f0f0f0"}}> <Tabs defaultActiveKey="1" size="small" tabPosition="right" style={{ height: "100%",overflow:"auto"}}>
<TabPane tab={<span><SettingOutlined /> 作业配置</span>} key="StudioSetting" > <TabPane tab={<span><SettingOutlined /> 作业配置</span>} key="StudioSetting" >
<StudioSetting form={form} /> <StudioSetting form={form} />
</TabPane> </TabPane>
......
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
.ant-tabs-right > .ant-tabs-content-holder > .ant-tabs-content > .ant-tabs-tabpane, .ant-tabs-right > div > .ant-tabs-content-holder > .ant-tabs-content > .ant-tabs-tabpane { .ant-tabs-right > .ant-tabs-content-holder > .ant-tabs-content > .ant-tabs-tabpane, .ant-tabs-right > div > .ant-tabs-content-holder > .ant-tabs-content > .ant-tabs-tabpane {
padding-right: 10px; padding-right: 10px;
} }
.ant-tabs > .ant-tabs-nav .ant-tabs-nav-more, .ant-tabs > div > .ant-tabs-nav .ant-tabs-nav-more {
padding: 8px;
}
} }
} }
/* --- tabs 垂直样式 --- end */ /* --- tabs 垂直样式 --- end */
......
...@@ -30,28 +30,17 @@ const Studio: React.FC<StudioProps> = (props) => { ...@@ -30,28 +30,17 @@ const Studio: React.FC<StudioProps> = (props) => {
leftToolWidth:300, leftToolWidth:300,
marginTop:114, marginTop:114,
}; };
const [height, setHeight] = useState<number>();
const [size, setSize] = useState({ const [size, setSize] = useState({
width: document.documentElement.clientWidth, width: document.documentElement.clientWidth-1,
height: document.documentElement.clientHeight, height: document.documentElement.clientHeight,
}); });
const onResize = useCallback(() => { const onResize = useCallback(() => {
setSize({ setSize({
width: document.documentElement.clientWidth, width: document.documentElement.clientWidth-1,
height: document.documentElement.clientHeight, height: document.documentElement.clientHeight,
}) })
}, []); }, []);
// const width = document.querySelector('body').offsetWidth;
// const height = document.querySelector('body').offsetHeight*(1/2);
/*const minWidth = document.querySelector('body').offsetWidth*(1/6);
const maxWidth = document.querySelector('body').offsetWidth*(1/2);*/
/* const resize=()=>{
debugger;
setWidth(document.querySelector('body').offsetWidth);
setHeight(document.querySelector('body').offsetHeight);
console.log(width);
console.log(height);
};*/
useEffect(() => { useEffect(() => {
window.addEventListener('resize', onResize); window.addEventListener('resize', onResize);
onResize(); onResize();
...@@ -69,8 +58,6 @@ const Studio: React.FC<StudioProps> = (props) => { ...@@ -69,8 +58,6 @@ const Studio: React.FC<StudioProps> = (props) => {
listSession(dispatch); listSession(dispatch);
showJars(dispatch); showJars(dispatch);
const onClick=()=>{ const onClick=()=>{
if(rightClickMenu){ if(rightClickMenu){
dispatch&&dispatch({ dispatch&&dispatch({
...@@ -83,7 +70,7 @@ const Studio: React.FC<StudioProps> = (props) => { ...@@ -83,7 +70,7 @@ const Studio: React.FC<StudioProps> = (props) => {
return ( return (
<div onClick={onClick} style={{'margin':'-24px'}}> <div onClick={onClick} style={{'margin':'-24px'}}>
<StudioMenu form={form}/> <StudioMenu form={form}/>
<Card bordered={false} className={styles.card} size="small" id="studio_card"> <Card bordered={false} className={styles.card} size="small" id="studio_card" style={{marginBottom:0}}>
<Row> <Row>
<DraggleLayout <DraggleLayout
containerWidth={size.width-VIEW.rightToolWidth} containerWidth={size.width-VIEW.rightToolWidth}
......
...@@ -414,6 +414,9 @@ export default (): React.ReactNode => { ...@@ -414,6 +414,9 @@ export default (): React.ReactNode => {
<li> <li>
<Link>新增yarn-application 的自定义Jar提交</Link> <Link>新增yarn-application 的自定义Jar提交</Link>
</li> </li>
<li>
<Link>优化 Studio 页面布局与拖动</Link>
</li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
......
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