dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #173 from dataease/pr@dev@panel

Browse Source 
Pr@dev@panel
This commit is contained in:
王嘉豪 2021-07-07 14:16:37 +08:00 committed by GitHub
commit b4b3ad3a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/views/Tinymce/TextAttr.vue
View File

@ -164,8 +164,9 @@ export default {
padding: 0px!important; padding: 0px!important;
} }
::v-deep .el-radio-button__inner{ ::v-deep .el-radio-button__inner{
padding: 5px; padding: 5px!important;
width: 30px; width: 30px!important;
} }
</style> </style>

4
frontend/src/views/panel/list/PanelMain.vue
View File

@ -8,7 +8,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane name="panels_star" :lazy="true"> <el-tab-pane name="panels_star" :lazy="true">
<span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store') }}</span> <span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store') }}</span>
<enshrine v-if="showEnshrine" /> <enshrine v-if="activeName==='panels_star'" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane name="panels_share" :lazy="true"> <el-tab-pane name="panels_share" :lazy="true">
<span slot="label"><i class="el-icon-share" />{{ $t('panel.share') }}</span> <span slot="label"><i class="el-icon-share" />{{ $t('panel.share') }}</span>
@ -17,7 +17,7 @@
</el-tabs> </el-tabs>
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
<PanelViewShow v-if="mainActiveName==='PanelMain'" /> <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName" />
</de-main-container> </de-main-container>
</de-container> </de-container>
</template> </template>

10
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -83,6 +83,12 @@ import bus from '@/utils/bus'
export default { export default {
name: 'PanelViewShow', name: 'PanelViewShow',
components: { Preview, SaveToTemplate }, components: { Preview, SaveToTemplate },
props: {
activeTab: {
type: String,
required: false
}
},
data() { data() {
return { return {
showMain: true, showMain: true,
@ -194,7 +200,9 @@ export default {
}) })
}, },
refreshStarList(isStar) { refreshStarList(isStar) {
bus.$emit('panle_start_list_refresh', isStar) if (this.activeTab !== 'PanelList') {
bus.$emit('panle_start_list_refresh', isStar)
}
} }
} }