Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

This commit is contained in:
zhangyu
2022-03-14 16:23:16 +08:00
130 changed files with 1171 additions and 809 deletions

View File

@@ -202,6 +202,7 @@ export const alertMessage = {
{ value: 'P3', label: i18n.t('alert.config.P3') }
],
states: [
{ value: '', label: i18n.t('overall.all') },
{ value: '1', label: i18n.t('overall.active') },
{ value: '2', label: i18n.t('overall.silence') },
{ value: '3', label: i18n.t('alert.list.expired') }
@@ -395,7 +396,7 @@ export const chartType = {
bar: 'bar',
table: 'table',
stat: 'stat',
guage: 'guage',
gauge: 'gauge',
pie: 'pie',
treemap: 'treemap',
log: 'log',

View File

@@ -77,7 +77,7 @@ export function nzNumber (rule, value, callback) {
export function noSpecialChar (rule, value, callback) {
// eslint-disable-next-line no-control-regex
const charReg = /^\w[\u0000-\uFFFF]*$/
const charReg = /^\S[\u0000-\uFFFF]*$/
/// ^\S[\u0000-\uFFFF]*$/
setTimeout(() => {
if (!value) {