dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6657 from dataease/pr@dev_one_dot_x

Browse Source 
Pr@dev one dot x
This commit is contained in:
dataeaseShu 2023-11-13 15:01:41 +08:00 committed by GitHub
commit 6aff57bb26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
View File

@ -392,10 +392,14 @@ export default {
} }
// .component-outer { // .component-outer {
// transform: translate(0); // transform: none;
// } // }
.component-active { .component-active {
z-index: 1; z-index: 1;
} }
.fullscreen {
transform: translate(0);
}
</style> </style>

20
core/frontend/src/views/chart/view/TitleRemark.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<span <span
style="transform: translate(0);display: inline-block;position: relative; style="display: inline-block;position: relative;
z-index: 10;" z-index: 10;"
> >
<el-popover <el-popover
placement="bottom" placement="bottom"
trigger="hover" trigger="hover"
width="300" width="300"
:append-to-body="false" :append-to-body="!previewVisible"
popper-class="remark-pop" popper-class="remark-pop"
:visible-arrow="false" :visible-arrow="false"
> >
@ -26,6 +26,7 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex'
export default { export default {
name: 'TitleRemark', name: 'TitleRemark',
props: { props: {
@ -33,6 +34,9 @@ export default {
type: Object, type: Object,
required: true required: true
} }
},
computed: {
...mapState(['previewVisible'])
} }
} }
</script> </script>
@ -73,15 +77,3 @@ export default {
text-align: -webkit-match-parent!important; text-align: -webkit-match-parent!important;
} }
</style> </style>
<style>
.el-popover.remark-pop{
padding: 0;
border: none;
margin-top: 8px!important;
top: 22px !important;
left: auto !important;
}
.title-is-right .el-popover.remark-pop {
right: 0;
}
</style>