refactor(仪表板): 清除联动按钮始终保持在右上方

This commit is contained in:
wangjiahao 2022-08-11 14:03:31 +08:00
parent 0743b9ae85
commit 5523e21638
4 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,6 @@
<template> <template>
<div class="bg" :style="customStyle" @scroll="canvasScroll"> <div class="bg" :style="customStyle" @scroll="canvasScroll">
<canvas-opt-bar />
<div id="canvasInfoMain" ref="canvasInfoMain" :style="canvasInfoMainStyle"> <div id="canvasInfoMain" ref="canvasInfoMain" :style="canvasInfoMainStyle">
<el-row v-if="showUnpublishedArea" class="custom-position"> <el-row v-if="showUnpublishedArea" class="custom-position">
<div style="text-align: center"> <div style="text-align: center">
@ -20,7 +21,6 @@
@mouseup="deselectCurComponent" @mouseup="deselectCurComponent"
@mousedown="handleMouseDown" @mousedown="handleMouseDown"
> >
<canvas-opt-bar />
<ComponentWrapper <ComponentWrapper
v-for="(item, index) in componentDataInfo" v-for="(item, index) in componentDataInfo"
:key="index" :key="index"

View File

@ -1,5 +1,6 @@
<template> <template>
<div class="bg" :style="customStyle"> <div class="bg" :style="customStyle">
<canvas-opt-bar />
<div id="canvasInfoMain" ref="canvasInfoMain" style="width: 100%;height: 100%"> <div id="canvasInfoMain" ref="canvasInfoMain" style="width: 100%;height: 100%">
<div <div
id="canvasInfoTemp" id="canvasInfoTemp"
@ -12,7 +13,6 @@
<el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position"> <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
{{ $t('panel.panelNull') }} {{ $t('panel.panelNull') }}
</el-row> </el-row>
<canvas-opt-bar />
<ComponentWrapper <ComponentWrapper
v-for="(item, index) in componentDataInfo" v-for="(item, index) in componentDataInfo"
:key="index" :key="index"

View File

@ -16,9 +16,6 @@
<!-- 网格线 --> <!-- 网格线 -->
<Grid v-if="showGrid" :matrix-style="matrixStyle" /> <Grid v-if="showGrid" :matrix-style="matrixStyle" />
<PGrid v-if="psDebug" :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" /> <PGrid v-if="psDebug" :position-box="positionBoxInfoArray" :matrix-style="matrixStyle" />
<!-- 仪表板联动清除按钮-->
<canvas-opt-bar />
<!--页面组件列表展示--> <!--页面组件列表展示-->
<de-drag <de-drag
v-for="(item, index) in componentData" 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 { deepCopy } from '@/components/canvas/utils/utils'
import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog' import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import DeOutWidget from '@/components/dataease/DeOutWidget' import DeOutWidget from '@/components/dataease/DeOutWidget'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
import DragShadow from '@/components/DeDrag/shadow' import DragShadow from '@/components/DeDrag/shadow'
import bus from '@/utils/bus' import bus from '@/utils/bus'
import LinkJumpSet from '@/views/panel/LinkJumpSet' import LinkJumpSet from '@/views/panel/LinkJumpSet'
@ -793,7 +789,6 @@ export default {
DeDrag, DeDrag,
UserViewDialog, UserViewDialog,
DeOutWidget, DeOutWidget,
CanvasOptBar,
DragShadow, DragShadow,
LinkJumpSet LinkJumpSet
}, },

View File

@ -158,6 +158,8 @@
@mouseup="deselectCurComponent" @mouseup="deselectCurComponent"
@scroll="canvasScroll" @scroll="canvasScroll"
> >
<!-- 仪表板联动清除按钮-->
<canvas-opt-bar />
<Editor ref="canvasEditor" :matrix-count="pcMatrixCountBase" :out-style="outStyle" :scroll-top="scrollTop" /> <Editor ref="canvasEditor" :matrix-count="pcMatrixCountBase" :out-style="outStyle" :scroll-top="scrollTop" />
</div> </div>
<!--移动端画布区域 保持宽高比2.5--> <!--移动端画布区域 保持宽高比2.5-->
@ -379,6 +381,8 @@ import elementResizeDetectorMaker from 'element-resize-detector'
import AssistComponent from '@/views/panel/AssistComponent' import AssistComponent from '@/views/panel/AssistComponent'
import ChartGroup from '@/views/chart/group/Group' import ChartGroup from '@/views/chart/group/Group'
import { chartCopy } from '@/api/chart/chart' import { chartCopy } from '@/api/chart/chart'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
// //
import '@/components/canvas/assets/iconfont/iconfont.css' import '@/components/canvas/assets/iconfont/iconfont.css'
import '@/components/canvas/styles/animate.css' import '@/components/canvas/styles/animate.css'
@ -419,7 +423,8 @@ export default {
AssistComponent, AssistComponent,
TextAttr, TextAttr,
ChartGroup, ChartGroup,
ChartEdit ChartEdit,
CanvasOptBar
}, },
data() { data() {
return { return {