-
+
+
${str}
-
+
${valueStr}
@@ -215,8 +215,8 @@ export default {
`
} else if (str) {
return `
-
-
+
+
${str}
@@ -224,8 +224,8 @@ export default {
`
} else if (valueStr) {
return `
-
-
+
+
${valueStr}
diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index fe429bb0e..e51e9ed8b 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -127,7 +127,7 @@ export function positiveInteger (rule, value, callback) {
if (isNaN(Number(value))) {
callback(new Error(vm.$t('validate.number')))
} else {
- if (Number(value) >= 0) {
+ if (Number(value) >= 0 && (parseInt(value) == parseFloat(value))) {
callback()
} else {
callback(new Error(vm.$t('validate.positiveInteger')))
@@ -227,4 +227,3 @@ export function dataValidate () {
// const DMY = '/((^(3[01]|[12][0-9]|0[1-9])(\\/)(10|12|0[13578])(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(30|[12][0-9]|0[1-9])(\\/)(11|0[469])(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(2[0-8]|1[0-9]|0[1-9])(\\/)(02)(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(29)(\\/)(02)(\\/)([2468][048]00)$)|(^(29)(\\/)(02)(\\/)([3579][26]00)$)|(^(29)(\\/)(02)(\\/)([1][89][0][48])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][0][48])$)|(^(29)(\\/)(02)(\\/)([1][89][2468][048])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][2468][048])$)|(^(29)(\\/)(02)(\\/)([1][89][13579][26])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][13579][26])$))/'
// const MDY =
}
-
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 08f8393d7..19a4dae26 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -517,8 +517,8 @@
-
-
+
+
@@ -637,8 +637,8 @@
-
-
+
+
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index e16ea9b47..097a4d9cc 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -198,6 +198,18 @@ export default {
value: 'el-icon-sort-down'
}, {
value: 'el-icon-rank'
+ }, {
+ value: 'nz-icon nz-icon-zhengfangxing'
+ }, {
+ value: 'nz-icon nz-icon-zhixian'
+ }, {
+ value: 'nz-icon nz-icon-sanjiaoxing'
+ }, {
+ value: 'nz-icon nz-icon-xingxing'
+ }, {
+ value: 'nz-icon nz-icon-duobianxing'
+ }, {
+ value: 'nz-icon nz-icon-circle'
}
], // 获取icon列表
letter: [
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index da8292042..ecb2e30d4 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -470,8 +470,8 @@
-
-
+
+
@@ -590,8 +590,8 @@
-
-
+
+
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index ca5e46c61..48226fdbc 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -144,8 +144,8 @@
v-model="item.multi"
size="small"
>
-
-
+
+
@@ -163,8 +163,8 @@
v-model="item.allOption"
size="small"
>
-
-
+
+
@@ -412,11 +412,11 @@ export default {
? localStorage.getItem('nz-default-dateFormat')
: 'YYYY-MM-DD HH:ss:mm',
queryVariableList: [
- { name: 'label_names()', description: 'Returns a list of metric label names.' },
- { name: 'label_values(label)', description: 'Returns a list of label values for the label in every metric.' },
- { name: 'label_values(metric, label)', description: 'Returns a list of label values for the label in the specified metric.' },
- { name: 'metrics(metric)', description: 'Returns a list of metrics matching the specified metric regex.' },
- { name: 'query_result(query)', description: 'Returns a list of metric query result for the query.' }
+ { name: 'label_names()', description: this.$t('dashboard.panel.label_names()') },
+ { name: 'label_values(label)', description: this.$t('dashboard.panel.label_values(label)') },
+ { name: 'label_values(metric, label)', description: this.$t('dashboard.label_values(metric, label)') },
+ { name: 'metrics(metric)', description: this.$t('dashboard.panel.metrics(metric)') },
+ { name: 'query_result(query)', description: this.$t('dashboard.panel.query_result(query)') }
]
}
},
diff --git a/nezha-fronted/src/components/page/tool/ping.vue b/nezha-fronted/src/components/page/tool/ping.vue
index 0f85a6ced..0de0244ac 100644
--- a/nezha-fronted/src/components/page/tool/ping.vue
+++ b/nezha-fronted/src/components/page/tool/ping.vue
@@ -24,7 +24,8 @@