fix: 修复endpoint编辑侧滑标题错误的问题等

1.修复endpoint编辑侧滑标题错误的问题
2.统一pop的圆角
This commit is contained in:
陈劲松
2020-03-02 20:23:27 +08:00
parent 32439cd031
commit 58b60178f2
4 changed files with 12 additions and 11 deletions

View File

@@ -698,9 +698,11 @@ li{
padding-top: 0; padding-top: 0;
box-shadow: $pop-box-shadow; box-shadow: $pop-box-shadow;
z-index: 2951 !important; z-index: 2951 !important;
border-radius: 10px;
} }
.nz-pop2 { .nz-pop2 {
padding: 0 20px 20px 20px; padding: 0 20px 20px 20px;
border-radius: 10px;
} }
.nz-pop-select-area { .nz-pop-select-area {
padding: 0 !important; padding: 0 !important;

View File

@@ -215,8 +215,14 @@
this.rightBox.show = show; this.rightBox.show = show;
}, },
toEdit(show) { toEdit(show, id) {
this.rightBox.isEdit = show; this.rightBox.isEdit = show;
this.rightBox.show = true;
if (show) {
this.rightBox.title = this.$t("project.endpoint.editEndpoint") + " ID" + id;
} else {
this.rightBox.title = this.$t("project.endpoint.endpoint") + " ID" + id;
}
}, },
//endpoint弹框中asset子弹框控制 //endpoint弹框中asset子弹框控制
@@ -415,13 +421,6 @@
setTimeout(()=>{this.getModuleList(this.currentProject.id);}, 100); setTimeout(()=>{this.getModuleList(this.currentProject.id);}, 100);
}, },
watch: { watch: {
endpoint(n, o) {
if (n && n.id) {
this.rightBox.title = this.$t("project.endpoint.editEndpoint") + " ID" + n.id;
} else {
this.rightBox.title = this.$t("project.endpoint.createEndpoint");
}
},
projectListReloadWatch(n, o) { projectListReloadWatch(n, o) {
this.getProjectList(); this.getProjectList();
}, },

View File

@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-dialog :title="$t('overall.changePwd')" :visible.sync="visible" @open="dialogOpened" :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" > <el-dialog class="nz-dialog" :title="$t('overall.changePwd')" :visible.sync="visible" @open="dialogOpened" :modal-append-to-body='false' @closed="dialogClosed" width="600px" :show-close="false" >
<el-form :model="user" label-position="right" label-width="135px" :rules="rules" ref="changePwdForm" size="mini"> <el-form :model="user" label-position="right" label-width="135px" :rules="rules" ref="changePwdForm" size="mini">
<el-form-item :label="$t('config.account.account')" prop="username"> <el-form-item :label="$t('config.account.account')" prop="username">
<el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input> <el-input type="text" autocomplete="false" v-model="user.username" disabled></el-input>

View File

@@ -887,7 +887,7 @@
toEditEndpoint(endpoint) { toEditEndpoint(endpoint) {
this.editEndpoint = JSON.parse(JSON.stringify(endpoint)); this.editEndpoint = JSON.parse(JSON.stringify(endpoint));
this.rightBoxHandler(3); this.rightBoxHandler(3);
this.$refs.editEndpointBox.toEdit(true); this.$refs.editEndpointBox.toEdit(true, this.editEndpoint.id);
if (!this.editEndpoint.paramObj) { if (!this.editEndpoint.paramObj) {
this.$set(this.editEndpoint, 'paramObj', []); this.$set(this.editEndpoint, 'paramObj', []);
} }
@@ -905,7 +905,7 @@
this.$set(this.editEndpoint, 'paramObj', []); this.$set(this.editEndpoint, 'paramObj', []);
} }
this.rightBoxHandler(3); this.rightBoxHandler(3);
this.$refs.editEndpointBox.toEdit(false); this.$refs.editEndpointBox.toEdit(false, this.editEndpoint.id);
}, },
//弹出module编辑页 //弹出module编辑页