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

NEZ-2344 fix：Chart templates部分类型展示有误

Browse Source
This commit is contained in:
zhangyu
2022-11-01 16:59:53 +08:00
parent 363511115d
commit 342aaf6f03
9 changed files with 212 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nezha-fronted/src/assets/css/font/iconfont.css
View File

File diff suppressed because one or more lines are too long

2
nezha-fronted/src/assets/css/font/iconfont.js
View File

File diff suppressed because one or more lines are too long

42
nezha-fronted/src/assets/css/font/iconfont.json
View File

@@ -5,6 +5,48 @@
"css_prefix_text": "nz-icon-",
"description": "",
"glyphs": [
{
"icon_id": "586976",
"name": "map-sankey",
"font_class": "sankey",
"unicode": "e784",
"unicode_decimal": 59268
},
{
"icon_id": "6537184",
"name": "地图",
"font_class": "map",
"unicode": "e66c",
"unicode_decimal": 58988
},
{
"icon_id": "6807270",
"name": "Diagram-2",
"font_class": "diagram",
"unicode": "ec02",
"unicode_decimal": 60418
},
{
"icon_id": "11488020",
"name": "clock",
"font_class": "clock",
"unicode": "e762",
"unicode_decimal": 59234
},
{
"icon_id": "17692259",
"name": "走马灯",
"font_class": "projectTopology",
"unicode": "e765",
"unicode_decimal": 59237
},
{
"icon_id": "20559415",
"name": "165ranking",
"font_class": "rank",
"unicode": "e7ac",
"unicode_decimal": 59308
},
{
"icon_id": "32442422",
"name": "New",

BIN
nezha-fronted/src/assets/css/font/iconfont.ttf
View File

Binary file not shown.

BIN
nezha-fronted/src/assets/css/font/iconfont.woff
View File

Binary file not shown.

BIN
nezha-fronted/src/assets/css/font/iconfont.woff2
View File

Binary file not shown.

43
nezha-fronted/src/assets/css/nzIcon.css
View File

File diff suppressed because one or more lines are too long

61
nezha-fronted/src/components/common/js/constants.js
View File

@@ -251,6 +251,30 @@ export const chart = {
value: 'stackArea',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label')
},
{
value: 'area',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label')
},
{
value: 'point',
label: i18n.t('dashboard.panel.chartForm.typeVal.point.label')
},
{
value: 'gauge',
label: i18n.t('dashboard.panel.chartForm.typeVal.gauge.label')
},
{
value: 'sankey',
label: i18n.t('dashboard.panel.chartForm.typeVal.sankey.label')
},
{
value: 'hexagon',
label: i18n.t('dashboard.panel.chartForm.typeVal.hexagonFigure.label')
},
{
value: 'stat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label')
},
{
value: 'bar',
label: i18n.t('dashboard.panel.chartForm.typeVal.bar.label')
@@ -283,6 +307,7 @@ export const chart = {
value: 'group',
label: i18n.t('dashboard.panel.chartForm.group')
},
{
value: 'logs',
label: i18n.t('overall.logs')
@@ -290,6 +315,42 @@ export const chart = {
{
value: 'diagram',
label: i18n.t('dashboard.panel.chartForm.typeVal.diagram.label')
},
{
value: 'treemap',
label: i18n.t('dashboard.panel.chartForm.typeVal.treemap.label')
},
{
value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label')
},
{
value: 'bubble',
label: i18n.t('dashboard.panel.chartForm.typeVal.bubble.label')
},
{
value: 'rank',
label: i18n.t('dashboard.panel.chartForm.typeVal.rank.label')
},
{
value: 'log',
label: i18n.t('dashboard.panel.chartForm.typeVal.log.label')
},
{
value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label')
},
{
value: 'map',
label: i18n.t('dashboard.panel.chartForm.typeVal.map.label')
},
{
value: 'topology',
label: i18n.t('dashboard.panel.chartForm.typeVal.topology.label')
},
{
value: 'clock',
label: i18n.t('dashboard.panel.chartForm.typeVal.clock.label')
}
]
}

45
nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
View File

@@ -40,6 +40,7 @@
<span v-else-if="item.prop==='type'">
<i :class="typeIcon(scope.row)"/>
{{findTypeLabel(scope.row)}}
{{scope.row.type}}
</span>
<template v-else-if="item.prop === 'name'">
<copy :copyData='scope.row[item.prop]' :showInfo='scope.row[item.prop]'>
@@ -114,6 +115,7 @@ export default {
data () {
return {
chartTypeList: chartConstant.type,
qsArr: [],
tableTitle: [
{
label: 'ID',
@@ -185,17 +187,56 @@ export default {
case 'logs':
str += 'nz-icon-logs'
break
case 'log':
str += 'nz-icon-logs'
break
case 'bubble':
str += 'nz-icon-bubble'
break
case 'area':
str += 'nz-icon-stack-area'
break
case 'point':
str += 'nz-icon-bubble'
break
case 'stat':
str += 'nz-icon-single-value'
break
case 'hexagon':
str += 'nz-icon-duobianxing'
break
case 'gauge':
str += 'nz-icon-menu-dashboard'
break
case 'treemap':
str += 'nz-icon-Firewall'
break
case 'sankey':
str += 'nz-icon-sankey'
break
case 'rank':
str += 'nz-icon-rank'
break
case 'diagram':
str += 'nz-icon-diagram'
break
case 'map':
str += 'nz-icon-map'
break
case 'clock':
str += 'nz-icon-clock'
break
case 'topology':
str += 'nz-icon-projectTopology'
break
default :
str += 'nz-icon-table1'
// str += 'nz-icon-table1'
break
}
return str
},
findTypeLabel (row) {
const typeItem = this.chartTypeList.find(title => title.value === row.type)
const typeItem = this.chartTypeList.find(title => title.value == row.type)
return typeItem ? this.$t(typeItem.label) : '-'
}
}