fix: 修复panel页无法编辑panel的问题

This commit is contained in:
chenjinsong
2021-05-18 14:01:29 +08:00
parent dd2a6e4945
commit 656ed5e2d3
5 changed files with 19 additions and 20 deletions

View File

@@ -229,7 +229,7 @@ const en = {
createPanelTitle: 'New panel', // "新增面板" createPanelTitle: 'New panel', // "新增面板"
selectPanelTitle: 'Select', // "选择面板" selectPanelTitle: 'Select', // "选择面板"
createPanelTitleSec: 'New panel', // "新增面板" createPanelTitleSec: 'New panel', // "新增面板"
editPanelTitle: 'Panel', // "面板" editPanelTitle: 'Edit panel', // "面板"
singleStatErrorTip: 'Only queries that return single series/table is supported', singleStatErrorTip: 'Only queries that return single series/table is supported',
panelForm: { panelForm: {
panelName: 'Panel name', // "面板名称" panelName: 'Panel name', // "面板名称"

View File

@@ -24,7 +24,7 @@
<span>{{ node.label }}</span> <span>{{ node.label }}</span>
<span class="tree--operation" v-if="!panelLock"> <span class="tree--operation" v-if="!panelLock">
<span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i></span> <span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i></span>
<span @click.stop="editPanel(data)" class="panel-dropdown-btn"><i class="nz-icon nz-icon-edit" v-has="'panel_toEdit'"></i></span> <span class="panel-dropdown-btn" @click.stop="editPanel(data)"><i v-has="'panel_edit'" class="nz-icon nz-icon-edit"></i></span>
</span> </span>
</div> </div>
</el-tree> </el-tree>

View File

@@ -2,7 +2,7 @@
<div v-clickoutside="{obj:editPanel,func:clickOutside}" class="right-box right-box-panel"> <div v-clickoutside="{obj:editPanel,func:clickOutside}" class="right-box right-box-panel">
<!-- begin--标题--> <!-- begin--标题-->
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editPanel.id ? ($t("config.dc.editPanel")) : $t("config.dc.createPanel")}}</div> <div class="header__title">{{editPanel.id ? ($t("dashboard.panel.editPanelTitle")) : $t("dashboard.panel.createPanelTitle")}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{obj: editPanel, func: esc}"><i class="nz-icon nz-icon-close"></i></span> <span v-cancel="{obj: editPanel, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div> </div>

View File

@@ -208,20 +208,20 @@ export default {
step: 0, step: 0,
activeStep: 0, activeStep: 0,
database: { database: {
host: "", host: '',
port: 3306, port: 3306,
name: "nz", name: 'nz',
username: "", username: '',
pin: "", pin: ''
}, },
dbRules: { dbRules: {
host: [ host: [
{ {
required: true, required: true,
message: this.$t("validate.required"), message: this.$t('validate.required'),
trigger: "blur", trigger: 'blur'
}, },
{ validator: host, trigger: "blur" }, { validator: host, trigger: 'blur' }
], ],
port: [{ validator: port, trigger: 'blur' }], port: [{ validator: port, trigger: 'blur' }],
name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], name: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
@@ -229,18 +229,18 @@ export default {
pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }] pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
}, },
redis: { redis: {
host: "", host: '',
port: 6379, port: 6379,
pin: "", pin: ''
}, },
redisRules: { redisRules: {
host: [ host: [
{ {
required: true, required: true,
message: this.$t("validate.required"), message: this.$t('validate.required'),
trigger: "blur", trigger: 'blur'
}, },
{ validator: host, trigger: "blur" }, { validator: host, trigger: 'blur' }
], ],
port: [{ validator: port, trigger: 'blur' }] port: [{ validator: port, trigger: 'blur' }]
}, },
@@ -251,13 +251,13 @@ export default {
alertPrefix: '', alertPrefix: '',
haMode: 1, haMode: 1,
haVip: '', haVip: '',
prometheusFederationEnabled:1, federationEnabled: 1
}, },
sysRules: { sysRules: {
username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], username: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
alertPath: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], alertPath: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }], haVip: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
}, },
reloadTime: 5000, reloadTime: 5000,
reloadTimeout: null, reloadTimeout: null,

View File

@@ -83,7 +83,7 @@
<chart-temp-box :obj="chart" :from="$CONSTANTS.fromRoute.panel" :panel-data="panelData" :show-panel="showPanel" @close="closeChartTempBox" @on-create-success="createSuccess" v-if="rightBox.chartTemp.show"></chart-temp-box> <chart-temp-box :obj="chart" :from="$CONSTANTS.fromRoute.panel" :panel-data="panelData" :show-panel="showPanel" @close="closeChartTempBox" @on-create-success="createSuccess" v-if="rightBox.chartTemp.show"></chart-temp-box>
</transition> </transition>
<transition name="right-box"> <transition name="right-box">
<panel-box v-if="rightBox.panel.show" ref="panelBox" :panel="panel" @reload="panelReload" @reloadForDel="panelReloadForDel" @close="closePanelBox" ></panel-box> <panel-box v-if="rightBox.panel.show" ref="panelBox" :obj="panel" @close="closePanelBox" @reload="panelReload" @reloadForDel="panelReloadForDel" ></panel-box>
</transition> </transition>
</div> </div>
</template> </template>
@@ -256,8 +256,7 @@ export default {
}, },
edit (u) { edit (u) {
this.panel = Object.assign({}, u) this.panel = Object.assign({}, u)
this.$refs.panelBox.setTitle(this.$t('dashboard.panel.editPanelTitle')) this.rightBox.panel.show = true
this.$refs.panelBox.show(true)
}, },
toAdd () { toAdd () {
if (!this.hasButton('panel_view')) { if (!this.hasButton('panel_view')) {