Merge pull request #923 from dataease/v1.3

V1.3
This commit is contained in:
王嘉豪 2021-10-13 12:22:13 +08:00 committed by GitHub
commit a3175615db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -95,6 +95,7 @@
</el-drawer> </el-drawer>
<div <div
v-if="!previewVisible"
id="canvasInfo" id="canvasInfo"
:class="{'style-hidden':canvasStyleData.selfAdaption}" :class="{'style-hidden':canvasStyleData.selfAdaption}"
class="content this_canvas" class="content this_canvas"
@ -104,7 +105,7 @@
@mousedown="handleMouseDown" @mousedown="handleMouseDown"
@mouseup="deselectCurComponent" @mouseup="deselectCurComponent"
> >
<Editor v-if="!previewVisible" ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" /> <Editor ref="canvasEditor" :out-style="outStyle" @canvasScroll="canvasScroll" />
</div> </div>
</de-main-container> </de-main-container>
<!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">--> <!-- <de-aside-container v-if="aidedButtonActive" :class="aidedButtonActive ? 'show' : 'hidden'" class="style-aside">-->