forked from github/dataease
Merge pull request #12979 from dataease/pr@dev-v2@style_picture-group
style(图表): 图片组样式调整
This commit is contained in:
commit
ed8dad5763
@ -88,6 +88,6 @@ const handleDragEnd = e => {
|
||||
}
|
||||
.media-component {
|
||||
float: left;
|
||||
margin: 0 6px !important;
|
||||
margin: 0 6px 12px 6px !important;
|
||||
}
|
||||
</style>
|
||||
|
@ -318,6 +318,7 @@ const list = [
|
||||
sizeX: 36,
|
||||
sizeY: 14,
|
||||
style: {
|
||||
adaptation: 'adaptation',
|
||||
width: 600,
|
||||
height: 300
|
||||
},
|
||||
|
@ -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,
|
||||
|
@ -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}`">
|
||||
支持JPG、PNG、GIF、SVG
|
||||
</span>
|
||||
</el-row>
|
||||
|
Loading…
Reference in New Issue
Block a user