From 5523e216385634e61d3f4af41dcfd19ab30b049f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 11 Aug 2022 14:03:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=81=94=E5=8A=A8=E6=8C=89=E9=92=AE=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=88=E4=BF=9D=E6=8C=81=E5=9C=A8=E5=8F=B3=E4=B8=8A=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/Preview.vue    | 2 +-
 .../components/canvas/components/Editor/PreviewMobile.vue  | 2 +-
 frontend/src/components/canvas/components/Editor/index.vue | 5 -----
 frontend/src/views/panel/edit/index.vue                    | 7 ++++++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 1e9c8c1ef4..6c3fd2fa30 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="bg" :style="customStyle" @scroll="canvasScroll">
+    <canvas-opt-bar />
     <div id="canvasInfoMain" ref="canvasInfoMain" :style="canvasInfoMainStyle">
       <el-row v-if="showUnpublishedArea" class="custom-position">
         <div style="text-align: center">
@@ -20,7 +21,6 @@
         @mouseup="deselectCurComponent"
         @mousedown="handleMouseDown"
       >
-        <canvas-opt-bar />
         <ComponentWrapper
           v-for="(item, index) in componentDataInfo"
           :key="index"
diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
index 5e3195d1e8..2445d21888 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="bg" :style="customStyle">
+    <canvas-opt-bar />
     <div id="canvasInfoMain" ref="canvasInfoMain" style="width: 100%;height: 100%">
       <div
         id="canvasInfoTemp"
@@ -12,7 +13,6 @@
         <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
           {{ $t('panel.panelNull') }}
         </el-row>
-        <canvas-opt-bar />
         <ComponentWrapper
           v-for="(item, index) in componentDataInfo"
           :key="index"
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 0a4145d0fa..f66c8c01d0 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -16,9 +16,6 @@
     <!-- 网格线 -->
     <Grid v-if="showGrid" :matrix-style="matrixStyle" />
     <PGrid v-if="psDebug" :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />
-
-    <!-- 仪表板联动清除按钮-->
-    <canvas-opt-bar />
     <!--页面组件列表展示-->
     <de-drag
       v-for="(item, index) in componentData"
@@ -203,7 +200,6 @@ import { changeStyleWithScale } from '@/components/canvas/utils/translate'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
 import DeOutWidget from '@/components/dataease/DeOutWidget'
-import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
 import DragShadow from '@/components/DeDrag/shadow'
 import bus from '@/utils/bus'
 import LinkJumpSet from '@/views/panel/LinkJumpSet'
@@ -793,7 +789,6 @@ export default {
     DeDrag,
     UserViewDialog,
     DeOutWidget,
-    CanvasOptBar,
     DragShadow,
     LinkJumpSet
   },
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5c6194537c..f682e43857 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -158,6 +158,8 @@
           @mouseup="deselectCurComponent"
           @scroll="canvasScroll"
         >
+          <!-- 仪表板联动清除按钮-->
+          <canvas-opt-bar />
           <Editor ref="canvasEditor" :matrix-count="pcMatrixCountBase" :out-style="outStyle" :scroll-top="scrollTop" />
         </div>
         <!--移动端画布区域 保持宽高比2.5-->
@@ -379,6 +381,8 @@ import elementResizeDetectorMaker from 'element-resize-detector'
 import AssistComponent from '@/views/panel/AssistComponent'
 import ChartGroup from '@/views/chart/group/Group'
 import { chartCopy } from '@/api/chart/chart'
+import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
+
 // 引入样式
 import '@/components/canvas/assets/iconfont/iconfont.css'
 import '@/components/canvas/styles/animate.css'
@@ -419,7 +423,8 @@ export default {
     AssistComponent,
     TextAttr,
     ChartGroup,
-    ChartEdit
+    ChartEdit,
+    CanvasOptBar
   },
   data() {
     return {