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

This commit is contained in:
zyh
2023-08-02 11:37:56 +08:00
2 changed files with 7 additions and 5 deletions

View File

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

View File

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