gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zyh
2023-08-02 11:37:56 +08:00
parent cadb19dc0a 34c0a65f19
commit 1513e37a49
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
View File

@@ -575,10 +575,13 @@
} }
#pane-trbShot { #pane-trbShot {
// .editor-core.ql-container.ql-snow {
// background-color: #23241E;
// border-radius: 2px;
// color: #fff;
// }
.editor-core.ql-container.ql-snow { .editor-core.ql-container.ql-snow {
background-color: #23241E; border: none;
border-radius: 2px;
color: #fff;
} }
} }
} }

3
nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
View File

@@ -26,8 +26,7 @@
/> />
</div> </div>
<div v-else-if="item.key === 'trbShot' && activeName === 'trbShot'"> <div v-else-if="item.key === 'trbShot' && activeName === 'trbShot'">
<div v-html="infoData.alertRule.trbShot" v-if="infoData.alertRule.trbShot"> <div class="rich-text-editor" v-html="infoData.alertRule.trbShot" v-if="infoData.alertRule.trbShot"></div>
</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>