diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index 94db84e33..e33cca94c 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/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; + } + } } } } diff --git a/nezha-fronted/src/assets/css/font/iconfont.css b/nezha-fronted/src/assets/css/font/iconfont.css index 14469a88e..72e890997 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.css +++ b/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'), - url('iconfont.woff?t=1639385153414') format('woff'), - url('iconfont.ttf?t=1639385153414') format('truetype'); + src: url('iconfont.woff2?t=1642413628496') format('woff2'), + url('iconfont.woff?t=1642413628496') format('woff'), + 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"; } diff --git a/nezha-fronted/src/assets/css/font/iconfont.js b/nezha-fronted/src/assets/css/font/iconfont.js index 8199769aa..ed0cefabe 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.js +++ b/nezha-fronted/src/assets/css/font/iconfont.js @@ -1 +1 @@ -!function(a){var h,c,l,z,o,i='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),v=function(a,h){h.parentNode.insertBefore(a,h)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}h=function(){var a,h;(h=document.createElement("div")).innerHTML=i,i=null,(a=h.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",h=a,(a=document.body).firstChild?v(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),h()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=h,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); \ No newline at end of file +!function(a){var h,c,l,z,o,i='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),v=function(a,h){h.parentNode.insertBefore(a,h)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){o||(o=!0,l())}function p(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}m()}h=function(){var a,h;(h=document.createElement("div")).innerHTML=i,i=null,(a=h.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",h=a,(a=document.body).firstChild?v(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),h()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(l=h,z=a.document,o=!1,p(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}(window); \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index ab3a3feaf..b67c0f6bd 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index 416177263..a696c662d 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index ca0bb8595..391cca10a 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index 1fa0bf926..eeb74f031 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/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'), - url('./font/iconfont.woff?t=1639385153414') format('woff'), - url('./font/iconfont.ttf?t=1639385153414') format('truetype'); + src: url('./font/iconfont.woff2?t=1642413628496') format('woff2'), + url('./font/iconfont.woff?t=1642413628496') format('woff'), + 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"; } diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue index a1b45fdf5..3f5c0c3cc 100644 --- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue +++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue @@ -99,7 +99,7 @@ {{$t('globalSearch.toEsc')}}
-
+
{{stat[item.type] || 0}}
@@ -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 } diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue index 9444ad940..b08220be9 100644 --- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue +++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue @@ -58,11 +58,16 @@ {{ $t('overall.enabled') }} {{ $t('overall.disabled') }}
+
+ + + +
- {{getPathContent(item.key)}} - + {{getPathContent(item.key)}} +
@@ -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) {