diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 6ad1aac4d..7856ea690 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -746,3 +746,23 @@ i.nz-icon-override{
input::placeholder{
text-transform:capitalize;
}
+.vue-tags-input {
+ .ti-tag.ti-valid {
+ max-width: 100%;
+ .ti-content {
+ max-width: 90%;
+ flex-shrink: 0;
+ .ti-tag-center {
+ max-width: 100%;
+ flex-shrink: 0;
+ > span {
+ max-width: 100%;
+ display: inline-block;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+ }
+}
diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss
index 779d38df2..940b121bf 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss
@@ -1,6 +1,6 @@
.query-prompt-box {
//width: calc(100% - 10px);
- height: 400px;
+ height: 440px;
background: $--background-color-empty;
box-shadow: 0px 0px 21px 4px $--dropdown-menu-box-shadow-color;
border-radius: 2px;
@@ -9,7 +9,7 @@
//left: 5px;
transform: unset;
z-index: 11;
- max-height: 400px;
+ max-height: 440px;
font-size: 14px;
.explore-history-box-header {
padding-left: 20px;
@@ -32,6 +32,7 @@
}
.query-prompt-log-content {
height: 220px;
+ flex-shrink: 0;
border: 1px solid $--border-color-light;
border-radius: 2px;
display: flex;
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index a6443d456..1269e103e 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -303,6 +303,7 @@ export default {
oldValue: ''
}
const display = this.globalVariablesReplace(column.display)
+ console.log(column, display, /\{\{.+\}\}/.test(display), params)
if (/\{\{.+\}\}/.test(display)) {
const labelValue = display.replace(/(\{\{.+?\}\})/g, function (i) {
const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
@@ -312,7 +313,8 @@ export default {
if (label.indexOf('$value') !== -1) {
value = chartDataFormat.getUnit(column.unit ? column.unit : 2).compute(value, null, -1, 2)
}
- if (!((typeof value) == 'string' && value.constructor == String)) {
+ console.log(value)
+ if (!((typeof value) == 'string' && value.constructor == String) && isNaN(value)) {
let legend = ''
if (value.__name__) {
legend += `${value.__name__}{`
@@ -339,7 +341,7 @@ export default {
let value = null
if (lodash.get(params, label)) {
value = lodash.get(params, label)
- if (!((typeof value) == 'string' && value.constructor == String)) {
+ if (!((typeof value) == 'string' && value.constructor == String) && isNaN(value)) {
let legend = ''
if (value.__name__) {
legend += `${value.__name__}{`
@@ -361,6 +363,7 @@ export default {
}
return value || ''
})
+ console.log(labelValue)
obj[column.title + 'display'] = {
display: labelValue,
oldValue: oldLabelValue
@@ -394,7 +397,7 @@ export default {
if (label.indexOf('$value') !== -1) {
value = chartDataFormat.getUnit(col.unit ? col.unit : 2).compute(value, null, -1, 2)
}
- if (!((typeof value) == 'string' && value.constructor == String)) {
+ if (!((typeof value) == 'string' && value.constructor == String) && isNaN(value)) {
let legend = ''
if (value.__name__) {
legend += `${value.__name__}{`
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index f3febe924..efbd9aefc 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -19,7 +19,7 @@
-
+
{tagsChange(newTags)}"
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index a24e150dc..080ffd3dd 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -188,7 +188,6 @@
>
{tagsChange(newTags)}"
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index 484a096cd..ed6176632 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -236,7 +236,6 @@
{tagsChange(newTags, index)}"
@@ -296,7 +295,6 @@
]">
{logsTagsChange(newTags,item)}"
@@ -499,7 +496,6 @@
]">
{tagsChange(newTags, index)}"
@@ -247,7 +246,6 @@
]">
{logsTagsChange(newTags,item)}"
@@ -472,7 +469,6 @@
]">
-
+
diff --git a/nezha-fronted/src/components/page/config/monitor.vue b/nezha-fronted/src/components/page/config/monitor.vue
index 1c131cbd7..b59463ffc 100644
--- a/nezha-fronted/src/components/page/config/monitor.vue
+++ b/nezha-fronted/src/components/page/config/monitor.vue
@@ -30,7 +30,6 @@