forked from github/dataease
fix:仪表板全屏预览过滤组件下拉框不显示问题
This commit is contained in:
parent
ffd429c675
commit
f35cbc166b
@ -12,6 +12,7 @@
|
||||
:style="getComponentStyleDefault(config.style)"
|
||||
:out-style="config.style"
|
||||
:element="config"
|
||||
:in-screen="inScreen"
|
||||
/>
|
||||
|
||||
<component
|
||||
@ -50,6 +51,11 @@ export default {
|
||||
type: Number,
|
||||
required: false,
|
||||
default: 0
|
||||
},
|
||||
inScreen: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
@ -8,6 +8,7 @@
|
||||
:key="index"
|
||||
:config="item"
|
||||
:search-count="searchCount"
|
||||
:in-screen="inScreen"
|
||||
/>
|
||||
<!--视图详情-->
|
||||
<el-dialog
|
||||
@ -54,6 +55,11 @@ export default {
|
||||
type: String,
|
||||
required: false,
|
||||
default: 'full'
|
||||
},
|
||||
inScreen: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div style="width: 100%;height: 100vh;">
|
||||
<fullscreen style="height:100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen" @change="fullscreenChange">
|
||||
<Preview v-if="fullscreen" />
|
||||
<Preview v-if="fullscreen" :in-screen="!fullscreen" />
|
||||
</fullscreen>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -21,6 +21,8 @@
|
||||
class="component-custom"
|
||||
:out-style="element.style"
|
||||
:element="element"
|
||||
:in-draw="inDraw"
|
||||
:in-screen="inScreen"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -42,6 +44,11 @@ export default {
|
||||
inDraw: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
inScreen: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
@ -8,6 +8,7 @@
|
||||
:clearable="!options.attrs.multiple"
|
||||
:multiple="options.attrs.multiple"
|
||||
:placeholder="options.attrs.placeholder"
|
||||
:popper-append-to-body="inScreen"
|
||||
@change="changeValue"
|
||||
>
|
||||
<el-option
|
||||
@ -32,6 +33,11 @@ export default {
|
||||
inDraw: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
inScreen: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
|
||||
<el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" @change="changeValue">
|
||||
<el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
|
||||
<el-option
|
||||
v-for="item in options.attrs.datas"
|
||||
:key="item[options.attrs.key]"
|
||||
@ -23,6 +23,11 @@ export default {
|
||||
inDraw: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
inScreen: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
@ -154,7 +154,7 @@
|
||||
</el-dialog>
|
||||
|
||||
<fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="previewVisible">
|
||||
<Preview v-if="previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
|
||||
<Preview v-if="previewVisible" :in-screen="!previewVisible" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
|
||||
</fullscreen>
|
||||
<input id="input" ref="files" type="file" accept="image/*" hidden @change="handleFileChange">
|
||||
|
||||
|
@ -51,7 +51,7 @@
|
||||
<el-row class="panel-design-preview">
|
||||
<div ref="imageWrapper" style="width: 100%;height: 100%">
|
||||
<fullscreen style="height: 100%;background: #f7f8fa;overflow-y: auto" :fullscreen.sync="fullscreen">
|
||||
<Preview v-if="showMain" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
|
||||
<Preview v-if="showMain" :in-screen="!fullscreen" :show-type="canvasStyleData.selfAdaption?'full':'width'" />
|
||||
</fullscreen>
|
||||
</div>
|
||||
</el-row>
|
||||
@ -116,6 +116,14 @@ export default {
|
||||
this.showMain = true
|
||||
this.initHasStar()
|
||||
})
|
||||
},
|
||||
fullscreen(newVal, oldVla) {
|
||||
// 刷新 进行重新渲染
|
||||
this.showMain = false
|
||||
this.$nextTick(() => {
|
||||
this.showMain = true
|
||||
this.initHasStar()
|
||||
})
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
Loading…
Reference in New Issue
Block a user