style:字体图标修改

nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss

@@ -73,6 +73,13 @@
         white-space: nowrap;
         text-overflow: ellipsis;
         line-height: 47px;
+        .ql-container.ql-snow{
+          border: none;
+          .ql-editor{
+            padding: 0;
+            line-height: 47px;
+          }
+        }
       }
     }
   }

nezha-fronted/src/assets/css/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nz-icon"; /* Project id 2030432 */
-  src: url('iconfont.woff2?t=1639385153414') format('woff2'),
+  src: url('iconfont.woff2?t=1642413628496') format('woff2'),
-  url('iconfont.woff?t=1639385153414') format('woff'),
+       url('iconfont.woff?t=1642413628496') format('woff'),
-  url('iconfont.ttf?t=1639385153414') format('truetype');
+       url('iconfont.ttf?t=1642413628496') format('truetype');
 }
 
 .nz-icon {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nz-icon-Cabinet1:before {
+  content: "\e75f";
+}
+
+.nz-icon-user1:before {
+  content: "\e75d";
+}
+
+.nz-icon-Datacenter2:before {
+  content: "\e75e";
+}
+
 .nz-icon-Upload1:before {
   content: "\e75c";
 }

nezha-fronted/src/assets/css/nzIcon.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nz-icon"; /* Project id 2030432 */
-  src: url('./font/iconfont.woff2?t=1639385153414') format('woff2'),
+  src: url('./font/iconfont.woff2?t=1642413628496') format('woff2'),
-  url('./font/iconfont.woff?t=1639385153414') format('woff'),
+  url('./font/iconfont.woff?t=1642413628496') format('woff'),
-  url('./font/iconfont.ttf?t=1639385153414') format('truetype');
+  url('./font/iconfont.ttf?t=1642413628496') format('truetype');
 }
 
 .nz-icon {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nz-icon-Cabinet1:before {
+  content: "\e75f";
+}
+
+.nz-icon-user1:before {
+  content: "\e75d";
+}
+
+.nz-icon-Datacenter2:before {
+  content: "\e75e";
+}
+
 .nz-icon-Upload1:before {
   content: "\e75c";
 }

nezha-fronted/src/components/common/globalSearch/globalSearch.vue

@@ -99,7 +99,7 @@
             {{$t('globalSearch.toEsc')}}
           </div>
           <div class="global-search-footer-right">
-            <div class="scope-box" v-for="item in scope" :class="item.isSelect ? 'is-select' : ''" :key="item.type" @click="scopeChange(item)">
+            <div class="scope-box" v-for="item in scope" :class="item.isSelect ? 'is-select' : ''" :key="item.type" @click="scopeChange(item)" :title="item.type">
               <i class="nz-icon" :class="selectIcon(item)" />
               {{stat[item.type] || 0}}
             </div>
@@ -151,23 +151,29 @@ export default {
       // scope: ['asset', 'datacenter', 'project', 'module', 'endpoint', 'alertrule'],
       scope: [
         {
-          type: 'asset',
-          isSelect: true
-        }, {
           type: 'datacenter',
-          isSelect: true
+          isSelect: true,
+          title: this.$t('overall.dc')
+        }, {
+          type: 'asset',
+          isSelect: true,
+          title: this.$t('overall.asset')
         }, {
           type: 'project',
-          isSelect: true
+          isSelect: true,
+          title: this.$t('overall.project')
         }, {
           type: 'module',
-          isSelect: true
+          isSelect: true,
+          title: this.$t('overall.module')
         }, {
           type: 'endpoint',
-          isSelect: true
+          isSelect: true,
+          title: this.$t('overall.endpoint')
         }, {
           type: 'alertrule',
-          isSelect: true
+          isSelect: true,
+          title: this.$t('alert.alertRule')
         }
       ],
       skeletonArr: 20,
@@ -208,7 +214,7 @@ export default {
     selectIcon (item) {
       switch (item.type) {
         case 'asset' : return 'nz-icon-overview-project'
-        case 'datacenter' : return 'nz-icon-datacenter1'
+        case 'datacenter' : return 'nz-icon-datacenter2'
         case 'project' : return 'nz-icon-project'
         case 'module' : return 'nz-icon-overview-module'
         case 'endpoint' : return 'nz-icon-overview-endpoint'
@@ -256,6 +262,7 @@ export default {
       }
     },
     keyDown (e) {
+      window.event ? window.event.cancelBubble = true : e.stopPropagation()
       if (this.jumpLoading) {
         return
       }

nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue

@@ -58,11 +58,16 @@
             <span v-if="alertLabelData && alertLabelData.state === 'ON'">{{ $t('overall.enabled') }}</span>
             <span v-if="alertLabelData && alertLabelData.state === 'OFF'">{{ $t('overall.disabled') }}</span>
           </div>
+          <div class="search-item-value-box" v-else-if="obj.type === 'alertrule'&&item.key==='trbShot'">
+            <i v-if="item.icon&&getPathContent(item.key)!=='--'" class="nz-icon" :class="searchItemClass(item)" :style="searchItemStyle(item)"/>
+            <span class="search-item-value" v-html="getPathContent(item.key)">
+            </span>
+          </div>
           <div class="search-item-value-box" v-else>
             <i v-if="item.icon&&getPathContent(item.key)!=='--'" class="nz-icon" :class="searchItemClass(item)" :style="searchItemStyle(item)"/>
             <span class="search-item-value">
-          {{getPathContent(item.key)}}
+              {{getPathContent(item.key)}}
-        </span>
+            </span>
           </div>
         </div>
       </div>
@@ -403,6 +408,12 @@ export default {
       if (key === 'state' && this.obj.type === 'alertrule') {
         str = this.alertLabelData.state ? this.$t('overall.enabled') : this.$t('overall.disabled')
       }
+      if (key === 'trbShot' && this.obj.type === 'alertrule') {
+        // str = ''
+      }
+      if (key === 'severityId' && this.obj.type === 'alertrule' && this.alertLabelData.severityId) {
+        str = this.severityData.find(item => this.alertLabelData.severityId == item.id).name
+      }
       return str || '--'
     },
     selectIcon (item) {