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

fix： 抽取修改别名方法为全局 修改正则

Browse Source
This commit is contained in:
zhangyu
2021-11-17 18:24:30 +08:00
parent c76c0511c9
commit 170b6a4749
13 changed files with 40 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -200,7 +200,7 @@ import chartAlertList from './chart-alert-list'
import chartConfig from '../page/dashboard/overview/chartConfig'
import diagram from '@/components/common/ChartDiagram/diagram'
import moment from 'moment-timezone'
import { formatScientificNotation } from '@/components/common/js/tools'
import { formatScientificNotation, dealLegendAlias } from '@/components/common/js/tools'
export default {
name: 'chartPreview',
components: {
@@ -572,7 +572,7 @@ export default {
host = chartItem.elements[innerPos].expression
}
// 处理legend别名
let alias = this.dealLegendAlias(host, chartItem.elements[innerPos].legend)
let alias = dealLegendAlias(host, chartItem.elements[innerPos].legend)
if (!alias || alias === '') {
alias = host
}
@@ -1740,7 +1740,7 @@ export default {
if (!host || host === '') {
host = this.chart.elements[pos].expression
}
let alias = this.dealLegendAlias(host, this.chart.elements[pos].legend)
let alias = dealLegendAlias(host, this.chart.elements[pos].legend)
if (!alias || alias === '') {
alias = host
}
@@ -1780,27 +1780,6 @@ export default {
})
})
},
dealLegendAlias: function (legend, expression) {
if (/\{\{.+\}\}/.test(expression)) {
const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
const reg = new RegExp(',' + label + '=".+?"')
const reg1 = new RegExp('{' + label + '=".+?"')
let value = null
if (reg.test(legend)) {
const find = legend.match(reg)[0]
value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
} else if (reg1.test(legend)) {
const find = legend.match(reg1)[0]
value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
}
return value || label
})
return labelValue
} else {
return expression
}
},
screenPageNo (val) {
this.screenPageObj.pageNo = val
this.seriesItemScreen = this.filterShowData(this.storedScreanTableData, this.screenPageObj)