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

Merge pull request #3508 from dataease/pr@dev@fix_panel-rename

Browse Source 
fix(仪表板): 仪表板修改名称后没有自动修改顶部名称 #3445
This commit is contained in:
fit2cloud-chenyw 2022-10-27 21:35:45 +08:00 committed by GitHub
commit f7ce8fc3f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/src/views/panel/list/EditPanel/index.vue
View File

@ -8,16 +8,19 @@
<el-radio <el-radio
v-model="inputType" v-model="inputType"
label="new" label="new"
> {{ $t('panel.custom') }}</el-radio> > {{ $t('panel.custom') }}
</el-radio>
<el-radio <el-radio
v-model="inputType" v-model="inputType"
label="new_outer_template" label="new_outer_template"
>{{ $t('panel.import_template') }} </el-radio> >{{ $t('panel.import_template') }}
</el-radio>
<el-radio <el-radio
v-model="inputType" v-model="inputType"
label="new_inner_template" label="new_inner_template"
@click.native="getTree" @click.native="getTree"
>{{ $t('panel.copy_template') }} </el-radio> >{{ $t('panel.copy_template') }}
</el-radio>
</el-col> </el-col>
<el-col <el-col
v-if="inputType==='new_outer_template'" v-if="inputType==='new_outer_template'"
@ -28,7 +31,8 @@
size="small" size="small"
type="primary" type="primary"
@click="goFile" @click="goFile"
>{{ $t('panel.upload_template') }}</el-button> >{{ $t('panel.upload_template') }}
</el-button>
<input <input
id="input" id="input"
ref="files" ref="files"
@ -77,13 +81,15 @@
<el-button <el-button
size="mini" size="mini"
@click="cancel()" @click="cancel()"
>{{ $t('commons.cancel') }}</el-button> >{{ $t('commons.cancel') }}
</el-button>
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
:disabled="!saveStatus" :disabled="!saveStatus"
@click="save()" @click="save()"
>{{ $t('commons.confirm') }}</el-button> >{{ $t('commons.confirm') }}
</el-button>
</el-row> </el-row>
</el-row> </el-row>
</template> </template>
@ -234,7 +240,7 @@ export default {
showClose: true showClose: true
}) })
this.loading = false this.loading = false
this.$emit('closeEditPanelDialog', response.data) this.$emit('closeEditPanelDialog', { id: response.data, name: this.editPanel.panelInfo.name })
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
}) })
@ -265,34 +271,38 @@ export default {
<style scoped> <style scoped>
.my_table ::v-deep .el-table__row>td{ .my_table ::v-deep .el-table__row > td {
/* 去除表格线 */ /* 去除表格线 */
border: none; border: none;
padding: 0 0; padding: 0 0;
} }
.my_table ::v-deep .el-table th.is-leaf { .my_table ::v-deep .el-table th.is-leaf {
/* 去除上边框 */ /* 去除上边框 */
border: none; border: none;
} }
.my_table ::v-deep .el-table::before{
.my_table ::v-deep .el-table::before {
/* 去除下边框 */ /* 去除下边框 */
height: 0; height: 0;
} }
.root-class { .root-class {
margin: 15px 0px 5px; margin: 15px 0px 5px;
text-align: center; text-align: center;
} }
.preview {
.preview {
margin-top: 5px; margin-top: 5px;
border:1px solid #E6E6E6; border: 1px solid #E6E6E6;
height:250px !important; height: 250px !important;
overflow:hidden; overflow: hidden;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.preview-show {
border-left:1px solid #E6E6E6; .preview-show {
height:250px; border-left: 1px solid #E6E6E6;
height: 250px;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
</style> </style>

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

@ -645,6 +645,9 @@ export default {
if (panelInfo) { if (panelInfo) {
this.defaultTree() this.defaultTree()
this.tree() this.tree()
if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) {
this.$store.state.panel.panelInfo.name = panelInfo.name
}
// 默认展开 同时点击 新增的节点 // 默认展开 同时点击 新增的节点
if ( if (
panelInfo && panelInfo &&