Merge pull request #12979 from dataease/pr@dev-v2@style_picture-group

style(图表): 图片组样式调整
This commit is contained in:
王嘉豪 2024-10-29 17:37:49 +08:00 committed by GitHub
commit ed8dad5763
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 9 deletions

View File

@ -88,6 +88,6 @@ const handleDragEnd = e => {
}
.media-component {
float: left;
margin: 0 6px !important;
margin: 0 6px 12px 6px !important;
}
</style>

View File

@ -318,6 +318,7 @@ const list = [
sizeX: 36,
sizeY: 14,
style: {
adaptation: 'adaptation',
width: 600,
height: 300
},

View File

@ -1,11 +1,17 @@
<template>
<div class="pic-main" @click="onPictureClick">
<div class="pic-main">
<img
draggable="false"
v-if="state.showUrl"
:style="imageAdapter"
:src="imgUrlTrans(state.showUrl)"
/>
<template v-else>
<chart-empty-info
:themes="canvasStyleData.dashboard.themeColor"
:view-icon="view.type"
></chart-empty-info>
</template>
</div>
</template>
@ -28,8 +34,9 @@ import { getData } from '@/api/chart'
import { parseJson } from '@/views/chart/components/js/util'
import { mappingColor } from '@/views/chart/components/js/panel/common/common_table'
import { storeToRefs } from 'pinia'
import ChartEmptyInfo from '@/views/chart/components/views/components/ChartEmptyInfo.vue'
const dvMainStore = dvMainStoreWithOut()
const { canvasViewInfo, editMode, mobileInPc } = storeToRefs(dvMainStore)
const { canvasViewInfo, editMode, mobileInPc, canvasStyleData } = storeToRefs(dvMainStore)
const state = reactive({
emptyValue: '-',
data: null,

View File

@ -140,12 +140,7 @@ onBeforeUnmount(() => {
</el-col>
</el-row>
<el-row>
<span
style="margin-top: 2px"
v-if="!curComponent.propValue.url"
class="image-hint"
:class="`image-hint_${themes}`"
>
<span style="margin-top: 2px" class="image-hint" :class="`image-hint_${themes}`">
支持JPGPNGGIFSVG
</span>
</el-row>