center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-07-01 18:11:15 +08:00
commit 27c4247e9a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -185,8 +185,9 @@ export default {
return this.$store.state.panel.mainActiveName
},
showUnpublishedArea() {
// return this.panelInfo.status === 'unpublished'
if (this.panelInfo && this.panelInfo.showType === 'view') {
if (this.showPosition === 'edit') {
return false
} else if (this.panelInfo && this.panelInfo.showType === 'view') {
return false
} else if ((this.mainActiveName === 'PanelMain' && this.activeTab === 'PanelList') || this.showPosition.includes('multiplexing')) {
return this.panelInfo.status === 'unpublished' && !hasDataPermission('manage', this.panelInfo.privileges)

1
frontend/src/components/canvas/components/Toolbar.vue
View File

@ -372,7 +372,6 @@ export default {
},
clearCanvas() {
this.$store.commit('setComponentData', [])
this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
this.$store.commit('recordSnapshot', 'clearCanvas')
this.$store.commit('setInEditorStatus', false)
},

1
frontend/src/views/panel/edit/index.vue
View File

@ -269,6 +269,7 @@
:show-type="canvasStyleData.selfAdaption?'full':'width'"
:canvas-style-data="canvasStyleData"
:component-data="componentData"
show-position="edit"
/>
</fullscreen>
<input