From 83c00039c52cb74f8f1bb2ce7eb41810ee1723e5 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 31 Oct 2023 18:22:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?NEZ-3302=20fix=EF=BC=9Aalert=20message=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      | 20 +++++++++++++++++++
 .../src/components/common/js/constants.js     |  6 +++++-
 .../common/rightBox/chart/chartConfig.vue     |  1 -
 .../rightBox/chart/systemChartConfig.vue      |  1 -
 .../common/rightBox/editEndpointBoxNew.vue    |  4 ----
 .../components/common/rightBox/moduleBox.vue  |  4 ----
 .../rightBox/software/softwareTypeBox.vue     |  1 -
 .../components/page/alert/alertMessage.vue    |  2 +-
 .../src/components/page/config/monitor.vue    |  1 -
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 65fb76be4..40b79648d 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/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 7299860ce..9093fb8ce 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -363,11 +363,15 @@ export const chart = {
 
 export const intervalList = [
   { value: 0, label: i18n.t('dashboard.dashboard.chartForm.lockList.off') },
+  { value: 5, label: '5s' },
+  { value: 10, label: '10s' },
   { value: 30, label: '30s' },
   { value: 60, label: '1m' },
   { value: 300, label: '5m' },
   { value: 900, label: '15m' },
-  { value: 1800, label: '30m' }
+  { value: 1800, label: '30m' },
+  { value: 3600, label: '1h' },
+  { value: 7200, label: '2h' }
 ]
 
 export const setting = {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 7da534753..20dea23cf 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -181,7 +181,6 @@
         >
           <vue-tags-input
             v-model="tag"
-            :maxlength="32"
             :placeholder="$t('tagsInput.placeholder')"
             :tags="chartConfig.param.tags"
             @tags-changed="(newTags)=>{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 45794e3ff..ed1ed49ac 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 @@
         >
           <vue-tags-input
             v-model="tag"
-            :maxlength="32"
             :placeholder="$t('tagsInput.placeholder')"
             :tags="chartConfig.param.tags"
             @tags-changed="(newTags)=>{tagsChange(newTags)}"
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index 768632ed8..7130c13e5 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -208,7 +208,6 @@
                     <el-form-item :prop="'paramObj.' + index + '.value'" class="param-box-row-value">
                       <vue-tags-input
                         v-model="item.tags"
-                        :maxlength="32"
                         :placeholder="$t('tagsInput.placeholder')"
                         :tags="item.value"
                         @tags-changed="(newTags)=>{tagsChange(newTags, index)}"
@@ -268,7 +267,6 @@
                         ]">
                         <vue-tags-input
                           v-model="item.tags"
-                          :maxlength="32"
                           ref="relabelTag"
                           tabindex="9999"
                           :placeholder="$t('tagsInput.placeholder')"
@@ -439,7 +437,6 @@
                     >
                       <vue-tags-input
                         v-model="item.namespaces.tags"
-                        :maxlength="32"
                         :placeholder="$t('tagsInput.placeholder')"
                         :tags="item.namespaces.names"
                         @tags-changed="(newTags)=>{logsTagsChange(newTags,item)}"
@@ -471,7 +468,6 @@
                             ]">
                             <vue-tags-input
                               v-model="subItem.tags"
-                              :maxlength="32"
                               :ref="'logsRelabelTag'+index+subIndex"
                               tabindex="9999"
                               :placeholder="$t('tagsInput.placeholder')"
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 19b18762c..38689e3a6 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -187,7 +187,6 @@
                   <el-form-item :prop="'paramObj.' + index + '.value'" class="param-box-row-value">
                     <vue-tags-input
                       v-model="item.tags"
-                      :maxlength="32"
                       :placeholder="$t('tagsInput.placeholder')"
                       :tags="item.value"
                       @tags-changed="(newTags)=>{tagsChange(newTags, index)}"
@@ -247,7 +246,6 @@
                       ]">
                       <vue-tags-input
                         v-model="item.tags"
-                        :maxlength="32"
                         ref="relabelTag"
                         tabindex="9999"
                         :placeholder="$t('tagsInput.placeholder')"
@@ -420,7 +418,6 @@
                     >
                       <vue-tags-input
                         v-model="item.namespaces.tags"
-                        :maxlength="32"
                         :placeholder="$t('tagsInput.placeholder')"
                         :tags="item.namespaces.names"
                         @tags-changed="(newTags)=>{logsTagsChange(newTags,item)}"
@@ -472,7 +469,6 @@
                             ]">
                             <vue-tags-input
                               v-model="subItem.tags"
-                              :maxlength="32"
                               :ref="'logsRelabelTag'+index+subIndex"
                               tabindex="9999"
                               :placeholder="$t('tagsInput.placeholder')"
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
index a32bdbed7..63b85ae20 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
@@ -46,7 +46,6 @@
                 <el-form-item :prop="'paramObj.' + index + '.value'" class="param-box-row-value">
                   <vue-tags-input
                     v-model="item.tags"
-                    :maxlength="32"
                     :placeholder="$t('tagsInput.placeholder')"
                     :tags="item.value"
                     @tags-changed="(newTags)=>{tagsChange(newTags, index)}"
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 42a8f3e9d..e108f6da4 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,7 +18,7 @@
 <!--        <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch" :title="$t('dashboard.dashboard.chartForm.filter')">-->
 <!--          <i class="nz-icon nz-icon-funnel"></i>-->
 <!--        </button>-->
-        <pick-time ref="pickTime" v-model="searchTime" sign="message" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time ref="pickTime" v-model="searchTime" sign="message" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="true"></pick-time>
         <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10" type="button" @click="showExportDialog">
           <i class="nz-icon-download1 nz-icon"></i>
         </button>
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 @@
         <el-form-item :label="$t('config.system.monitor.interface_name')" prop="interface_name">
           <vue-tags-input
                         v-model="tag"
-                        :maxlength="32"
                         :class="monitor.interface_name.length !== 0 ? 'interface-name' : ''"
                         :placeholder="$t('tagsInput.placeholder')"
                         :tags="monitor.interface_name"

From ec37a18943fc8aeb6b67cfcf6f25b2c38b238c74 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 1 Nov 2023 09:54:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?NEZ-3304=20=20fix=EF=BC=9ADashboard?=
 =?UTF-8?q?=E4=B8=AD=E5=88=9B=E5=BB=BA=E5=9B=BE=E8=A1=A8=E4=BE=A7=E6=BB=91?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=20log=E6=97=A5=E5=BF=97Label=20browser?=
 =?UTF-8?q?=E4=B8=AD=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA=E7=95=8C=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/dashboard/explore/queryPrompt.scss   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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;

From 76ca5031b10a9af7ecd1e205526e97914e8a0932 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 1 Nov 2023 10:32:21 +0800
Subject: [PATCH 3/4] =?UTF-8?q?NEZ-3302=20fix=EF=BC=9AbottomBox=20=20alert?=
 =?UTF-8?q?=20message=20=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/alertMessageTabNew.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index ad31ad674..27dcb4042 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 @@
         <el-select v-model="state" class="margin-r-10" size="small" value-key="value" :disabled="from === fromRoute.alertSilence" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 110px">
           <el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
         </el-select>
-        <pick-time ref="pickTime" v-model="searchTimeHeader" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="false" :sign="sign"></pick-time>
+        <pick-time ref="pickTime" v-model="searchTimeHeader" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="true" :sign="sign"></pick-time>
       </template>
       <template v-slot>
         <alertMessageTable

From 9e0ef56d8dd3955c32abc5a37ce9d06d4397b852 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 1 Nov 2023 11:33:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?NEZ-3308=20fix=EF=BC=9ADashboard=E4=B8=ADTa?=
 =?UTF-8?q?ble=E5=9B=BE=E8=A1=A8=EF=BC=8C=E5=88=97=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=20number=E7=9A=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=20=E5=8F=96=E4=B8=8D=E5=88=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartTable.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 40740db9c..3f4ba7257 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -300,6 +300,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)
@@ -309,7 +310,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__}{`
@@ -336,7 +338,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__}{`
@@ -358,6 +360,7 @@ export default {
             }
             return value || ''
           })
+          console.log(labelValue)
           obj[column.title + 'display'] = {
             display: labelValue,
             oldValue: oldLabelValue
@@ -391,7 +394,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__}{`