diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss index 6dda37943..be12cf7ae 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss @@ -177,7 +177,7 @@ } .system-chart-config { display: flex; - height: 150px; + height: 206px; align-items: center; margin-bottom: 10px; } diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue new file mode 100644 index 000000000..0740f0f82 --- /dev/null +++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue index 354f730ad..abbc6c8ca 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue @@ -92,6 +92,20 @@ +
+ + + +
@@ -575,6 +589,7 @@ import publicConfig from '@/components/common/rightBox/chart/publicConfig' import chartTypeShow from '@/components/common/rightBox/chart/chartTypeShow' import nezhaColor from '@/components/common/nezhaColor' +import filterSearch from '@/components/common/filterSearch/filterSearch' import VueTagsInput from '@johmun/vue-tags-input' import { isGauge } from '@/components/chart/chart/tools' @@ -583,6 +598,7 @@ export default { mixins: [publicConfig, chartTypeShow], components: { nezhaColor, + filterSearch, VueTagsInput }, data () { @@ -629,7 +645,9 @@ export default { id: 'table', name: this.$t('dashboard.panel.chartForm.typeVal.table.label') } - ] + ], + keyList: [], + compareList: [] } }, watch: { diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index b206feff3..ae8ad6164 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -7,7 +7,7 @@ + @@ -55,7 +55,7 @@ :class="[plugins.indexOf('metric-selector') > -1 ?'metric-selector-title':'metric-null-title']"> - {{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }} {{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }}