diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index 1546ffcbf..814220810 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -17,6 +17,13 @@
:chart-option="chartOption"
:is-fullscreen="isFullscreen"
>
+
-
+
diff --git a/nezha-fronted/src/components/chart/chart/chartPie.vue b/nezha-fronted/src/components/chart/chart/chartPie.vue
index 97cb95c0f..5aecd8713 100644
--- a/nezha-fronted/src/components/chart/chart/chartPie.vue
+++ b/nezha-fronted/src/components/chart/chart/chartPie.vue
@@ -193,7 +193,9 @@ export default {
chartData: {
deep: true,
handler (n) {
- this.initChart(this.chartOption)
+ if (!this.isInit) {
+ this.initChart(this.chartOption)
+ }
}
}
},
diff --git a/nezha-fronted/src/components/chart/chart/options/chartBar.js b/nezha-fronted/src/components/chart/chart/options/chartBar.js
index bc279ce64..49d71566b 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartBar.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartBar.js
@@ -1,4 +1,32 @@
const chartBarOption = {
-
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ show: false
+ },
+ xAxis: {
+ type: 'category'
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ type: 'bar',
+ data: [],
+ label: {
+ show: true,
+ color: '#333',
+ width: 100,
+ align: 'center',
+ overflow: 'break',
+ ellipsis: '...'
+ },
+ labelLine: {
+ show: true
+ }
+ }
+ ]
}
export default chartBarOption
diff --git a/nezha-fronted/src/components/chart/chart/options/chartPie.js b/nezha-fronted/src/components/chart/chart/options/chartPie.js
index ce059923c..fb68c2013 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartPie.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartPie.js
@@ -15,7 +15,6 @@ const chartPieOption = {
show: true,
color: '#333',
position: 'inside',
- rotate: true,
width: 200,
overflow: 'truncate',
ellipsis: '...'
diff --git a/nezha-fronted/src/components/chart/chart/tools.js b/nezha-fronted/src/components/chart/chart/tools.js
index 2bed4c520..5d60d1308 100644
--- a/nezha-fronted/src/components/chart/chart/tools.js
+++ b/nezha-fronted/src/components/chart/chart/tools.js
@@ -57,6 +57,9 @@ export function isHexagonFigure (type) {
export function isChartPie (type) {
return type === chartType.pie
}
+export function isChartBar (type) {
+ return type === chartType.bar
+}
export function isUrl (type) {
return type === chartType.url
}
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index e931abdb2..3a4f66436 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -136,11 +136,11 @@ export default {
this.noData = !n || n.length < 1
this.copyDataList = n.map(item => {
let param = item.param
- try {
- param = JSON.parse(item.param)
- } catch (e) {
- console.info(e)
- }
+ // try {
+ // param = JSON.parse(item.param)
+ // } catch (e) {
+ // console.info(e)
+ // }
param.showHeader = true
return {
...item,
diff --git a/nezha-fronted/src/components/chart/testData.js b/nezha-fronted/src/components/chart/testData.js
index 285f1f0ac..3c82df933 100644
--- a/nezha-fronted/src/components/chart/testData.js
+++ b/nezha-fronted/src/components/chart/testData.js
@@ -902,7 +902,7 @@ const chartData = {
height: 4,
updateBy: 1,
updateAt: '2021-11-10 07:06:09',
- type: 'pie',
+ type: 'bar',
unit: 2,
weight: 0,
param: JSON.stringify(
diff --git a/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js b/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
index aab7262b4..ebc275634 100644
--- a/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
+++ b/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
@@ -320,6 +320,12 @@ function randomcolor () {
return n()
}
-export {
- randomcolor
+function ColorReverse (OldColorValue) {
+ const newValue = '0x' + OldColorValue.replace(/#/g, '')
+ const str = '000000' + (0xFFFFFF - newValue).toString(16)
+ return '#' + str.substring(str.length - 6, str.length)
+}
+export {
+ randomcolor,
+ ColorReverse
}
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 31009c4da..d76aca5cc 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -513,6 +513,7 @@
size="small"
v-model.number="item.value"
placeholder="value"
+ @change="change"
>
@@ -551,6 +554,7 @@
size="small"
v-model="item.regx"
placeholder="regx"
+ @change="change"
>
@@ -559,7 +563,7 @@
Display
-
+
{colorChange(val, key, index)}"/>
@@ -605,7 +609,7 @@
Title
-
+
Unit
@@ -624,7 +628,7 @@
Display
-
+
@@ -645,7 +649,7 @@ import publicConfig from '@/components/common/rightBox/chart/publicConfig'
import chartTypeShow from '@/components/common/rightBox/chart/chartTypeShow'
import VueTagsInput from '@johmun/vue-tags-input'
import draggable from 'vuedraggable'
-import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
+import { randomcolor, ColorReverse } from '@/components/common/js/radomcolor/randomcolor'
export default {
name: 'chartConfig',
components: {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index b6ee3dc95..3cd698c75 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -1,6 +1,6 @@
import chartDataFormat from '@/components/charts/chartDataFormat'
import { getUUID, resetZIndex } from '@/components/common/js/common'
-import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
+import { randomcolor, ColorReverse } from '@/components/common/js/radomcolor/randomcolor'
const rz = {
methods: {
rz (e) {
@@ -304,8 +304,8 @@ export default {
value: undefined,
display: '',
color: {
- bac: bacColor,
- text: randomcolor()
+ bac: bacColor + 'FF',
+ text: ColorReverse(bacColor) + 'FF'
}
})
this.change()
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index fce4848b9..cc6cda34f 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -67,7 +67,7 @@
class="form-item--half-width"
prop="param.limit"
>
-
+
@@ -258,6 +258,7 @@
size="small"
v-model.number="item.value"
placeholder="value"
+ @change="change"
>
@@ -304,7 +308,7 @@
Display
-
+
{colorChange(val, key, index)}"/>
@@ -350,7 +354,7 @@
Title
-
+
Unit
@@ -369,7 +373,7 @@
Display
-
+
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 7e7b4765a..03ca6a61e 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -400,7 +400,6 @@ export default {
this.chart.panelId = this.showPanel.id
this.chart.panelName = this.showPanel.name
this.chart.param = JSON.parse(this.chart.param)
- this.chart.datasource = 'metrics'
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
@@ -503,7 +502,7 @@ export default {
this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => {
if (response.code === 200) {
this.chartListLoading = false
- this.dataList = chartData.data.list.map(item => {
+ this.dataList = response.data.list.map(item => {
return {
...item,
hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件