forked from github/dataease
feat: 1.编辑界面调整 预览自动全屏预览 2.仪表盘主界面调整,增加全屏预览,新tab页预览
This commit is contained in:
parent
62ca8a2dd5
commit
ccf13b9e50
@ -38,6 +38,7 @@
|
|||||||
"vue-axios": "3.2.4",
|
"vue-axios": "3.2.4",
|
||||||
"vue-clipboard2": "0.3.1",
|
"vue-clipboard2": "0.3.1",
|
||||||
"vue-codemirror": "^4.0.6",
|
"vue-codemirror": "^4.0.6",
|
||||||
|
"vue-fullscreen": "^2.5.1",
|
||||||
"vue-i18n": "7.3.2",
|
"vue-i18n": "7.3.2",
|
||||||
"vue-router": "3.0.6",
|
"vue-router": "3.0.6",
|
||||||
"vue-uuid": "2.0.2",
|
"vue-uuid": "2.0.2",
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<div style="width: 100%;height: 100vh;">
|
<div style="width: 100%;height: 100vh;">
|
||||||
<span style="line-height: 35px; position: absolute; top:10px;right: 20px;z-index:100000">
|
<fullscreen style="background: #ffffff" :fullscreen.sync="fullscreen" @change="fullscreenChange">
|
||||||
<el-button size="mini" @click="close">
|
<Preview v-if="fullscreen" />
|
||||||
关闭
|
</fullscreen>
|
||||||
</el-button>
|
|
||||||
</span>
|
|
||||||
<Preview />
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -16,10 +13,21 @@ import bus from '@/utils/bus'
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { Preview },
|
components: { Preview },
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
fullscreen: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.fullscreen = false
|
||||||
|
this.$nextTick(() => (this.fullscreen = true))
|
||||||
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
close() {
|
fullscreenChange(fullscreen) {
|
||||||
bus.$emit('previewFullScreenClose')
|
if (!fullscreen) {
|
||||||
|
bus.$emit('previewFullScreenClose')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
<el-button class="el-icon-document-delete" size="mini" circle @click="clearCanvas" />
|
<el-button class="el-icon-document-delete" size="mini" circle @click="clearCanvas" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<input id="input" ref="files" type="file" hidden @change="handleFileChange">
|
<input id="input" ref="files" type="file" hidden @change="handleFileChange">
|
||||||
<el-tooltip :content="$t('panel.preview')">
|
<el-tooltip :content="$t('panel.fullscreen_preview')">
|
||||||
<el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
|
<el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|
||||||
|
@ -899,6 +899,8 @@ export default {
|
|||||||
save_to_panel: 'Save to template',
|
save_to_panel: 'Save to template',
|
||||||
export_to_panel: 'Export to template',
|
export_to_panel: 'Export to template',
|
||||||
preview: 'Preview',
|
preview: 'Preview',
|
||||||
|
fullscreen_preview: 'Fullscreen Preview',
|
||||||
|
new_tab_preview: 'New Tab Preview',
|
||||||
select_panel_from_left: 'Please select Dashboard from left',
|
select_panel_from_left: 'Please select Dashboard from left',
|
||||||
template_nale: 'Template name',
|
template_nale: 'Template name',
|
||||||
template: 'Template',
|
template: 'Template',
|
||||||
|
@ -899,6 +899,8 @@ export default {
|
|||||||
save_to_panel: '保存為模板',
|
save_to_panel: '保存為模板',
|
||||||
export_to_panel: '導出為模板',
|
export_to_panel: '導出為模板',
|
||||||
preview: '預覽',
|
preview: '預覽',
|
||||||
|
fullscreen_preview: '全屏预览',
|
||||||
|
new_tab_preview: '新Tab页预览',
|
||||||
select_panel_from_left: '請從左側選擇儀表板',
|
select_panel_from_left: '請從左側選擇儀表板',
|
||||||
template_nale: '模板名稱',
|
template_nale: '模板名稱',
|
||||||
template: '模板',
|
template: '模板',
|
||||||
|
@ -899,6 +899,8 @@ export default {
|
|||||||
save_to_panel: '保存为模板',
|
save_to_panel: '保存为模板',
|
||||||
export_to_panel: '导出为模板',
|
export_to_panel: '导出为模板',
|
||||||
preview: '预览',
|
preview: '预览',
|
||||||
|
fullscreen_preview: '全屏预览',
|
||||||
|
new_tab_preview: '新Tab页预览',
|
||||||
select_panel_from_left: '请从左侧选择仪表板',
|
select_panel_from_left: '请从左侧选择仪表板',
|
||||||
template_nale: '模板名称',
|
template_nale: '模板名称',
|
||||||
template: '模板',
|
template: '模板',
|
||||||
|
@ -37,6 +37,10 @@ Vue.use(UmyUi)
|
|||||||
import vcolorpicker from 'vcolorpicker'
|
import vcolorpicker from 'vcolorpicker'
|
||||||
Vue.use(vcolorpicker)
|
Vue.use(vcolorpicker)
|
||||||
|
|
||||||
|
// 全屏插件
|
||||||
|
import fullscreen from 'vue-fullscreen'
|
||||||
|
Vue.use(fullscreen)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If you don't want to use mock-server
|
* If you don't want to use mock-server
|
||||||
* you want to use MockJs for mock api
|
* you want to use MockJs for mock api
|
||||||
|
@ -141,7 +141,7 @@
|
|||||||
:fullscreen="true"
|
:fullscreen="true"
|
||||||
custom-class="preview-dialog"
|
custom-class="preview-dialog"
|
||||||
>
|
>
|
||||||
<PreviewFullScreen />
|
<PreviewFullScreen :fullscreen="previewVisible" />
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</el-row>
|
</el-row>
|
||||||
</template>
|
</template>
|
||||||
|
@ -19,8 +19,14 @@
|
|||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</span>
|
</span>
|
||||||
<span style="float: right;margin-right: 10px">
|
<span style="float: right;margin-right: 10px">
|
||||||
<el-tooltip :content="$t('panel.preview')">
|
<el-tooltip :content="$t('panel.fullscreen_preview')">
|
||||||
<el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
|
<el-button class="el-icon-view" size="mini" circle @click="clickFullscreen" />
|
||||||
|
</el-tooltip>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<span style="float: right;margin-right: 10px">
|
||||||
|
<el-tooltip :content="$t('panel.new_tab_preview')">
|
||||||
|
<el-button class="el-icon-data-analysis" size="mini" circle @click="newTab" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
@ -41,7 +47,9 @@
|
|||||||
<!-- 仪表板预览区域-->
|
<!-- 仪表板预览区域-->
|
||||||
<el-row class="panel-design-preview">
|
<el-row class="panel-design-preview">
|
||||||
<div ref="imageWrapper" style="width: 100%;height: 100%">
|
<div ref="imageWrapper" style="width: 100%;height: 100%">
|
||||||
<Preview v-if="showMain" />
|
<fullscreen style="background: #ffffff;height: 100%" :fullscreen.sync="fullscreen">
|
||||||
|
<Preview v-if="showMain" />
|
||||||
|
</fullscreen>
|
||||||
</div>
|
</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -78,7 +86,8 @@ export default {
|
|||||||
templateInfo: {},
|
templateInfo: {},
|
||||||
templateSaveTitle: '保存为模板',
|
templateSaveTitle: '保存为模板',
|
||||||
templateSaveShow: false,
|
templateSaveShow: false,
|
||||||
hasStar: false
|
hasStar: false,
|
||||||
|
fullscreen: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -103,7 +112,10 @@ export default {
|
|||||||
mounted() {
|
mounted() {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
clickPreview() {
|
clickFullscreen() {
|
||||||
|
this.fullscreen = true
|
||||||
|
},
|
||||||
|
newTab() {
|
||||||
const url = '#/preview/' + this.$store.state.panel.panelInfo.id
|
const url = '#/preview/' + this.$store.state.panel.panelInfo.id
|
||||||
window.open(url, '_blank')
|
window.open(url, '_blank')
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user