better color name for balloon

Author: pandadtdyy

packages/server/client/balloon.ts

@@ -72,8 +72,10 @@ let timer = null;
 let printer = null;
 
 async function printBalloon(doc, lang) {
-    const status = (doc.total ? Object.keys(doc.total).map(async (k) =>
-        `- ${k}: ${lang === 'zh' ? await convertToChinese(doc.total[k].color) : doc.total[k].color}`).join('\n') : 'N/A');
+    let status = '';
+    for (const i in doc.total) {
+        status += `- ${i}: ${lang === 'zh' ? await convertToChinese(doc.total[i].color) : doc.total[i].color}\n`;
+    }
     const bReceipt = receiptText(
         doc.balloonid,
         doc.location ? doc.location : 'N/A',

packages/server/utils/color.ts

@@ -151,151 +151,144 @@ export const HTML_COLORS = {
 export const CHINESE_NAME = {
     aliceblue: '艾利斯兰',
     antiquewhite: '古董白',
-    aqua: '浅绿色',
-    aquamarine: '碧绿色',
-    azure: '天蓝色',
+    aqua: '水绿色',
+    aquamarine: '碧绿',
+    azure: '天蓝',
     beige: '米色',
-    bisque: '桔黄色',
+    bisque: '桔黄',
     black: '黑色',
-    blanchedalmond: '白杏色',
+    blanchedalmond: '白杏',
     blue: '蓝色',
-    blueviolet: '紫罗兰色',
-    brown: '褐色',
+    blueviolet: '蓝紫色',
+    brown: '棕色',
     burlywood: '实木色',
-    cadetblue: '军兰色',
-    chartreuse: '黄绿色',
-    chocolate: '巧可力色',
+    cadetblue: '军蓝',
+    chartreuse: '浅黄绿色',
+    chocolate: '巧克力色',
     coral: '珊瑚色',
-    cornflowerblue: '菊兰色',
-    cornsilk: '米绸色',
-    crimson: '暗深红色',
+    cornflowerblue: '矢车菊蓝',
+    cornsilk: '玉米丝色',
+    crimson: '绯红',
     cyan: '青色',
-    darkblue: '暗蓝色',
-    darkcyan: '暗青色',
-    darkgoldenrod: '暗金黄色',
-    darkgray: '暗灰色',
-    darkgreen: '暗绿色',
-    darkgrey: '暗灰色',
-    darkkhaki: '暗黄褐色',
-    darkmagenta: '暗洋红',
-    darkolivegreen: '暗橄榄绿',
-    darkorange: '暗桔黄色',
-    darkorchid: '暗紫色',
-    darkred: '暗红色',
-    darksalmon: '暗肉色',
-    darkseagreen: '暗海兰色',
-    darkslateblue: '暗灰蓝色',
-    darkslategray: '暗瓦灰色',
-    darkslategrey: '暗瓦灰色',
-    darkturquoise: '暗宝石绿',
-    darkviolet: '暗紫罗兰色',
-    deeppink: '深粉红色',
-    deepskyblue: '深天蓝色',
-    dimgray: '暗灰色',
-    dimgrey: '暗灰色',
-    dodgerblue: '闪兰色',
+    darkblue: '深蓝',
+    darkcyan: '深青',
+    darkgoldenrod: '深金黄色',
+    darkgray: '深灰',
+    darkgreen: '深绿',
+    darkkhaki: '深卡其色',
+    darkmagenta: '深紫红色',
+    darkolivegreen: '深橄榄绿',
+    darkorange: '深橙色',
+    darkorchid: '深兰花紫',
+    darkred: '深红',
+    darksalmon: '深橙红',
+    darkseagreen: '深海绿',
+    darkslateblue: '深板岩蓝',
+    darkslategray: '深板岩灰',
+    darkturquoise: '深宝石绿',
+    darkviolet: '深紫罗兰',
+    deeppink: '深粉红',
+    deepskyblue: '深天蓝',
+    dimgray: '暗灰',
+    dodgerblue: '道奇蓝',
     firebrick: '火砖色',
-    floralwhite: '花白色',
+    floralwhite: '花白',
     forestgreen: '森林绿',
-    fuchsia: '紫红色',
-    gainsboro: '淡灰色',
+    fuchsia: '紫红',
+    gainsboro: '亮灰',
     ghostwhite: '幽灵白',
     gold: '金色',
-    goldenrod: '金麒麟色',
+    goldenrod: '金菊黄',
     gray: '灰色',
     green: '绿色',
-    greenyellow: '黄绿色',
-    grey: '灰色',
-    honeydew: '蜜色',
-    hotpink: '热粉红色',
-    indianred: '印第安红',
-    indigo: '靛青色',
+    greenyellow: '绿黄色',
+    honeydew: '蜜瓜色',
+    hotpink: '亮粉红',
+    indianred: '印度红',
+    indigo: '靛青',
     ivory: '象牙色',
-    khaki: '黄褐色',
-    lavender: '淡紫色',
+    khaki: '卡其色',
+    lavender: '薰衣草色',
     lavenderblush: '淡紫红',
-    lawngreen: '草绿色',
+    lawngreen: '草绿',
     lemonchiffon: '柠檬绸色',
-    lightblue: '亮蓝色',
-    lightcoral: '亮珊瑚色',
-    lightcyan: '亮青色',
-    lightgoldenrodyellow: '亮金黄色',
-    lightgray: '亮灰色',
-    lightgreen: '亮绿色',
-    lightgrey: '亮灰色',
-    lightpink: '亮粉红色',
-    lightsalmon: '亮肉色',
-    lightseagreen: '亮海蓝色',
-    lightskyblue: '亮天蓝色',
-    lightslategray: '亮蓝灰',
-    lightslategrey: '亮蓝灰',
-    lightsteelblue: '亮钢兰色',
-    lightyellow: '亮黄色',
+    lightblue: '淡蓝',
+    lightcoral: '浅珊瑚色',
+    lightcyan: '浅青',
+    lightgoldenrodyellow: '浅金黄色',
+    lightgray: '浅灰',
+    lightgreen: '浅绿',
+    lightpink: '浅粉',
+    lightsalmon: '浅橙红',
+    lightseagreen: '浅海绿',
+    lightskyblue: '浅天蓝',
+    lightslategray: '浅板岩灰',
+    lightsteelblue: '浅钢蓝',
+    lightyellow: '浅黄',
     lime: '酸橙色',
-    limegreen: '橙绿色',
+    limegreen: '酸橙绿',
     linen: '亚麻色',
-    magenta: '红紫色',
-    maroon: '粟色',
-    mediumaquamarine: '中绿色',
-    mediumblue: '中兰色',
-    mediumorchid: '中粉紫色',
-    mediumpurple: '中紫色',
-    mediumseagreen: '中海蓝',
-    mediumslateblue: '中暗蓝色',
-    mediumspringgreen: '中春绿色',
-    mediumturquoise: '中绿宝石',
-    mediumvioletred: '中紫罗兰色',
-    midnightblue: '中灰兰色',
-    mintcream: '薄荷色',
-    mistyrose: '浅玫瑰色',
+    magenta: '洋红',
+    maroon: '栗色',
+    mediumaquamarine: '中碧绿',
+    mediumblue: '中蓝',
+    mediumorchid: '中兰花紫',
+    mediumpurple: '中紫',
+    mediumseagreen: '中海绿',
+    mediumslateblue: '中板岩蓝',
+    mediumspringgreen: '中春绿',
+    mediumturquoise: '中宝石绿',
+    mediumvioletred: '中紫罗兰',
+    midnightblue: '午夜蓝',
+    mintcream: '薄荷乳白',
+    mistyrose: '薄雾玫瑰',
     moccasin: '鹿皮色',
     navajowhite: '纳瓦白',
-    navy: '海军色',
+    navy: '海军蓝',
     oldlace: '老花色',
     olive: '橄榄色',
-    olivedrab: '深绿褐色',
+    olivedrab: '橄榄褐',
     orange: '橙色',
-    orangered: '红橙色',
-    orchid: '淡紫色',
-    palegoldenrod: '苍麒麟色',
-    palegreen: '苍绿色',
-    paleturquoise: '苍宝石绿',
-    palevioletred: '苍紫罗兰色',
+    orangered: '橙红色',
+    orchid: '兰花紫',
+    palegoldenrod: '灰菊黄',
+    palegreen: '灰绿',
+    paleturquoise: '灰宝石绿',
+    palevioletred: '灰紫罗兰',
     papayawhip: '番木色',
     peachpuff: '桃色',
     peru: '秘鲁色',
-    pink: '粉红色',
+    pink: '粉红',
     plum: '洋李色',
-    powderblue: '粉蓝色',
+    powderblue: '粉蓝',
     purple: '紫色',
     red: '红色',
-    rosybrown: '褐玫瑰红',
+    rosybrown: '玫瑰褐',
     royalblue: '皇家蓝',
-    saddlebrown: '重褐色',
-    salmon: '鲜肉色',
-    sandybrown: '沙褐色',
-    seagreen: '海绿色',
-    seashell: '海贝色',
+    saddlebrown: '马鞍褐',
+    salmon: '鲑色',
+    sandybrown: '沙褐',
+    seagreen: '海绿',
+    seashell: '贝壳白',
     sienna: '赭色',
     silver: '银色',
-    skyblue: '天蓝色',
-    slateblue: '石蓝色',
-    slategray: '灰石色',
-    slategrey: '灰石色',
-    snow: '雪白色',
-    springgreen: '春绿色',
-    steelblue: '钢兰色',
+    skyblue: '天蓝',
+    slateblue: '板岩蓝',
+    slategray: '板岩灰',
+    snow: '雪白',
+    springgreen: '春绿',
+    steelblue: '钢蓝',
     tan: '茶色',
     teal: '水鸭色',
     thistle: '蓟色',
-    tomato: '西红柿色',
-    turquoise: '青绿色',
-    violet: '紫罗兰色',
-    wheat: '浅黄色',
+    tomato: '番茄红',
+    turquoise: '宝石绿',
+    violet: '紫罗兰',
+    wheat: '小麦色',
     white: '白色',
-    whitesmoke: '烟白色',
+    whitesmoke: '烟白',
     yellow: '黄色',
-    yellowgreen: '黄绿色',
+    yellowgreen: '黄绿',
 };
 
 export function convertToColor(hex) {