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] =?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"