diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 869e38d02c..aa2fd06726 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -109,6 +109,11 @@ export default { type: Boolean, required: false, default: true + }, + activeTab: { + type: String, + required: false, + default: 'none' } }, data() { @@ -148,12 +153,12 @@ export default { return this.$store.state.panel.mainActiveName }, showUnpublishedArea() { - return this.panelInfo.status === 'unpublished' - // if (this.mainActiveName === 'PanelMain') { - // return this.panelInfo.status === 'unpublished' && this.panelInfo.privileges.indexOf('manage') === -1 - // } else { - // return this.panelInfo.status === 'unpublished' - // } + // return this.panelInfo.status === 'unpublished' + if (this.mainActiveName === 'PanelMain' && this.activeTab==='') { + return this.panelInfo.status === 'unpublished' && this.panelInfo.privileges.indexOf('manage') === -1 + } else { + return this.panelInfo.status === 'unpublished' + } }, panelInfo() { return this.$store.state.panel.panelInfo diff --git a/frontend/src/icons/svg/panel-mobile-unpublished-back.svg b/frontend/src/icons/svg/panel-mobile-unpublished-back.svg new file mode 100644 index 0000000000..919694ec88 --- /dev/null +++ b/frontend/src/icons/svg/panel-mobile-unpublished-back.svg @@ -0,0 +1,19 @@ + + + + + + + + Layer 1 + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/icons/svg/panel-mobile-unpublished.svg b/frontend/src/icons/svg/panel-mobile-unpublished.svg index 919694ec88..0f899341c2 100644 --- a/frontend/src/icons/svg/panel-mobile-unpublished.svg +++ b/frontend/src/icons/svg/panel-mobile-unpublished.svg @@ -1,19 +1,18 @@ - + - + Layer 1 - - - - - - - - - + + + + + + + + - \ No newline at end of file + diff --git a/frontend/src/icons/svg/panel-unpublished-back.svg b/frontend/src/icons/svg/panel-unpublished-back.svg new file mode 100644 index 0000000000..ac5887e54a --- /dev/null +++ b/frontend/src/icons/svg/panel-unpublished-back.svg @@ -0,0 +1,10 @@ + + + Layer 1 + + + + + + + \ No newline at end of file diff --git a/frontend/src/icons/svg/panel-unpublished.svg b/frontend/src/icons/svg/panel-unpublished.svg index ac5887e54a..a7dae86bb3 100644 --- a/frontend/src/icons/svg/panel-unpublished.svg +++ b/frontend/src/icons/svg/panel-unpublished.svg @@ -1,10 +1,9 @@ - + + Layer 1 - - - - + + + - - \ No newline at end of file + diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue index 467d444dc0..d0c5135784 100644 --- a/frontend/src/views/panel/GrantAuth/shareTree.vue +++ b/frontend/src/views/panel/GrantAuth/shareTree.vue @@ -3,13 +3,24 @@ {{ $t('panel.share_in') }}
- + - {{ data.name }} + {{ data.name }} @@ -20,13 +31,23 @@ {{ $t('panel.share_out') }}
- + - {{ data.name }} + {{ data.name }} @@ -53,6 +74,7 @@ import { uuid } from 'vue-uuid' import { initPanelData } from '@/api/panel/panel' import { proxyInitPanelData } from '@/api/panel/shareProxy' import bus from '@/utils/bus' + export default { name: 'ShareTree', props: { @@ -179,7 +201,7 @@ export default { diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue index c6fdba4507..ee84c8905b 100644 --- a/frontend/src/views/panel/enshrine/index.vue +++ b/frontend/src/views/panel/enshrine/index.vue @@ -10,9 +10,13 @@