From 3d4c627f06b7428151473267e6fda0911d26eef3 Mon Sep 17 00:00:00 2001 From: xujiang Date: Sun, 25 Oct 2020 00:00:32 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=95=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PanelComponents/FormEditor/index.tsx | 5 ---- src/global.css | 2 ++ src/pages/editor/Container.tsx | 23 ++++--------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/components/PanelComponents/FormEditor/index.tsx b/src/components/PanelComponents/FormEditor/index.tsx index 3fddb5c..290eb40 100644 --- a/src/components/PanelComponents/FormEditor/index.tsx +++ b/src/components/PanelComponents/FormEditor/index.tsx @@ -164,11 +164,6 @@ const FormEditor = (props: FormEditorProps) => { ); })} - {/*
- -
*/} ); }; diff --git a/src/global.css b/src/global.css index 08649f5..52580e2 100644 --- a/src/global.css +++ b/src/global.css @@ -1,5 +1,7 @@ html, body, #root { height: 100%; + width: 100vw; + overflow: hidden; } body { diff --git a/src/pages/editor/Container.tsx b/src/pages/editor/Container.tsx index fa5117d..d922e2a 100644 --- a/src/pages/editor/Container.tsx +++ b/src/pages/editor/Container.tsx @@ -1,13 +1,11 @@ import React, { useState, useEffect, useMemo, useCallback, useContext, useRef } from 'react'; -import { Result, Tabs } from 'antd'; +import { Result, Tabs, Button } from 'antd'; import { PieChartOutlined, - ExpandOutlined, PlayCircleOutlined, HighlightOutlined, DoubleRightOutlined, DoubleLeftOutlined, - ReloadOutlined, } from '@ant-design/icons'; import { connect } from 'dva'; import HeaderComponent from './components/Header'; @@ -27,14 +25,11 @@ import graphTpl2 from 'components/BasicPcShop/VisualComponents/template'; import schema1 from 'components/BasicShop/schema'; import schema2 from 'components/BasicPcShop/schema'; - -import { ActionCreators } from 'redux-undo'; -import { StateWithHistory } from 'redux-undo'; -import styles from './index.less'; -// import { useGetBall } from 'react-draggable-ball'; +import { ActionCreators, StateWithHistory } from 'redux-undo'; import { dooringContext } from '@/layouts'; import { throttle } from '@/utils/tool'; -import { Button } from 'antd'; + +import styles from './index.less'; const { TabPane } = Tabs; @@ -220,11 +215,7 @@ const Container = (props: { }, [graphTpl, mediaTpl, template]); const [dragstate, setDragState] = useState({ x: 0, y: 0 }); - // const [render] = useGetBall(setDragState, { - // innerStyle: { top: '10px', left: '10px', cursor: 'pointer' }, - // ratioSpeed: { x: 1.2, y: 1.2 }, - // intervalDelay: 5, - // }); + const ref = useRef(null); const renderRight = useMemo(() => { if (context.theme === 'h5') { @@ -248,9 +239,6 @@ const Container = (props: { onDel={handleDel} rightPannelRef={ref} /> - {/*
- -
*/} ) : (
@@ -515,7 +503,6 @@ const Container = (props: { canvasId={canvasId} allType={allType} /> - {/* TODO 暂时隐藏 */}