Merge branch 'develop' into release/1.1.11-beta

This commit is contained in:
JackLian 2023-09-26 09:37:30 +08:00
commit 71b3c057cc
2 changed files with 7 additions and 7 deletions

View File

@ -9,10 +9,10 @@ const instance: Record<string, Record<string, string>> = {
export function createIntl(locale: string = 'zh-CN') {
const intl = (id: string) => {
return instance[locale][id];
return instance[locale]?.[id] || id;
};
const intlNode = (id: string) => createElement('span', instance[locale][id]);
const intlNode = (id: string) => createElement('span', instance[locale]?.[id] || id);
return {
intl,

View File

@ -52,11 +52,11 @@ const bizNameColors = [
'#2e8b57',
];
const bodyColors: Record<string, string> = {
debug: '#666666',
log: '#bbbbbb',
info: '#ffffff',
warn: '#bbbbbb',
error: '#bbbbbb',
debug: '#fadb14',
log: '#8c8c8c',
info: '#52c41a',
warn: '#fa8c16',
error: '#ff4d4f',
};
const levelMarks: Record<string, string> = {
debug: 'debug',