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

fix(仪表板): 修复从收藏tab切换至仪表板tab页面右侧没有内容显示

Browse Source
This commit is contained in:
wangjiahao 2022-12-28 12:24:35 +08:00
parent 89cad759fc
commit 4d91954d00
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/views/panel/list/PanelList.vue
View File

@ -174,7 +174,7 @@
/>
</span>
<span v-if="data.nodeType === 'folder'">
<svg-icon icon-class="scene" />
<svg-icon icon-class="scene"/>
</span>
<span
:class="data.status"
@ -211,7 +211,7 @@
<el-dropdown-item
:command="beforeClickEdit('folder', 'new', data, node)"
>
<svg-icon icon-class="scene" />
<svg-icon icon-class="scene"/>
<span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
</el-dropdown-item>
<el-dropdown-item
@ -334,7 +334,7 @@
:label="$t('commons.name')"
prop="name"
>
<el-input v-model="groupForm.name" />
<el-input v-model="groupForm.name"/>
</el-form-item>
</el-form>
<div
@ -345,8 +345,8 @@
size="mini"
@click="close()"
>{{
$t('panel.cancel')
}}
$t('panel.cancel')
}}
</el-button>
<el-button
type="primary"
@ -422,8 +422,8 @@
size="mini"
@click="closeMoveGroup()"
>{{
$t('dataset.cancel')
}}
$t('dataset.cancel')
}}
</el-button>
<el-button
:disabled="groupMoveConfirmDisabled"
@ -635,6 +635,11 @@ export default {
}
},
methods: {
activeLastNode() {
this.$nextTick(() => {
document.querySelector('.is-current').firstChild.click()
})
},
toTop(data, node) {
panelToTop(data.id).then(() => {
this.defaultTree()

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

@ -8,7 +8,7 @@
@tab-click="handleClick"
>
<el-tab-pane name="PanelList">
<span slot="label"><i class="el-icon-document tablepanel-i" />{{ $t('panel.panel_list') }}</span>
<span slot="label"><i class="el-icon-document tablepanel-i"/>{{ $t('panel.panel_list') }}</span>
<panel-list
v-show="activeName==='PanelList'"
ref="panelList"
@ -18,14 +18,14 @@
name="panels_star"
:lazy="true"
>
<span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.store') }}</span>
<enshrine v-if="activeName==='panels_star'" />
<span slot="label"><i class="el-icon-star-off tablepanel-i"/>{{ $t('panel.store') }}</span>
<enshrine v-if="activeName==='panels_star'"/>
</el-tab-pane>
<el-tab-pane
name="panels_share"
:lazy="true"
>
<span slot="label"><i class="el-icon-share tablepanel-i" />{{ $t('panel.share') }}</span>
<span slot="label"><i class="el-icon-share tablepanel-i"/>{{ $t('panel.share') }}</span>
<share-tree
v-if="showShare"
ref="share_tree"
@ -104,6 +104,9 @@ export default {
if (tab.name === 'panels_star') {
this.refreshEnshrine()
}
if (tab.name === 'PanelList') {
this.$refs.panelList.activeLastNode()
}
},
refreshShare() {
this.showShare = false
@ -148,28 +151,33 @@ export default {
</script>
<style scoped>
.ms-aside-container {
height: calc(100vh - 56px);
padding: 0px;
min-width: 260px;
max-width: 460px;
}
.ms-main-container {
height: calc(100vh - 56px);
padding: 0px;
}
.tab-panel{
height: 100%;
overflow-y: auto;
}
.tab-panel ::v-deep .el-tabs__nav-wrap{
padding: 0 10px;
}
.tab-panel ::v-deep .el-tabs__nav-wrap::after {
height: 1px;
}
.tab-panel ::v-deep .el-tabs__item{
/* width: 10px; */
padding: 0 10px;
}
.ms-aside-container {
height: calc(100vh - 56px);
padding: 0px;
min-width: 260px;
max-width: 460px;
}
.ms-main-container {
height: calc(100vh - 56px);
padding: 0px;
}
.tab-panel {
height: 100%;
overflow-y: auto;
}
.tab-panel ::v-deep .el-tabs__nav-wrap {
padding: 0 10px;
}
.tab-panel ::v-deep .el-tabs__nav-wrap::after {
height: 1px;
}
.tab-panel ::v-deep .el-tabs__item {
/* width: 10px; */
padding: 0 10px;
}
</style>