gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2059 fix：panel 变量 未完全渲染

Browse Source
This commit is contained in:
zhangyu
2022-07-21 18:32:25 +08:00
parent 4f65ad4e4b
commit ddc5f7e923
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nezha-fronted/src/components/chart/panelChart.vue
View File

@@ -546,22 +546,22 @@ export default {
}, },
variablesReplace (expression) { variablesReplace (expression) {
let str = expression let str = expression
let confirmReg = '' let confirmReg = []
let confirmRegItem = ''
this.variablesArr.forEach(item => { this.variablesArr.forEach(item => {
const reg = '$' + item.name // 后续需要考虑 item,name 使用特殊字符的问题 const reg = '$' + item.name // 后续需要考虑 item,name 使用特殊字符的问题
const index = expression.indexOf(reg) const index = expression.indexOf(reg)
if (index !== -1) { if (index !== -1) {
if (reg.length > confirmReg.length) { confirmReg.push(item)
confirmReg = reg
confirmRegItem = item
}
} }
}) })
if (confirmReg) { confirmReg = this.$loadsh.sortBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题
const index = expression.indexOf(confirmReg) return item.name.length
const replaceStr = confirmRegItem.checked.map(label => label.replace(/\"/g, '\\"').replace(/\'/g, "\\'")).join('|') })
str = str.substring(0, index) + replaceStr + str.substring(index + confirmReg.length) if (confirmReg.length) {
confirmReg.forEach(item => {
const reg = new RegExp('\\$' + item.name, 'g') // 后续需要考虑 item,name 使用特殊字符的问题
str = str.replace(reg, item.checked.map(label => label.replace(/\"/g, '\\"').replace(/\'/g, "\\'")).join('|'))
})
} }
return str return str
}, },

2
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -150,7 +150,7 @@
</el-form-item> </el-form-item>
<!-- visibility --> <!-- visibility -->
<div> <div v-if="params.type === 'group'">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.showHidden')}}</span> <span>{{$t('dashboard.panel.showHidden')}}</span>
<el-switch <el-switch

2
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -680,7 +680,7 @@
</div> </div>
<!-- visibility --> <!-- visibility -->
<div> <div v-if="params.type === 'group'">
<div class="form__sub-title"> <div class="form__sub-title">
<span>{{$t('dashboard.panel.showHidden')}}</span> <span>{{$t('dashboard.panel.showHidden')}}</span>
<el-switch <el-switch