Skip to content

Commit 3aa5e5b

Browse files
committed
core&ui: unify balloon color name display
1 parent fc876ce commit 3aa5e5b

File tree

2 files changed

+40
-402
lines changed

2 files changed

+40
-402
lines changed

packages/server/utils/color.ts

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export const HTML_COLORS = {
1414
navy: '#000080',
1515
blue: '#0000FF',
1616
teal: '#008080',
17-
aqua: '#00FFFF',
1817
aliceblue: '#f0f8ff',
1918
antiquewhite: '#faebd7',
2019
aquamarine: '#7fffd4',
@@ -38,7 +37,6 @@ export const HTML_COLORS = {
3837
darkgoldenrod: '#b8860b',
3938
darkgray: '#a9a9a9',
4039
darkgreen: '#006400',
41-
darkgrey: '#a9a9a9',
4240
darkkhaki: '#bdb76b',
4341
darkmagenta: '#8b008b',
4442
darkolivegreen: '#556b2f',
@@ -49,13 +47,11 @@ export const HTML_COLORS = {
4947
darkseagreen: '#8fbc8f',
5048
darkslateblue: '#483d8b',
5149
darkslategray: '#2f4f4f',
52-
darkslategrey: '#2f4f4f',
5350
darkturquoise: '#00ced1',
5451
darkviolet: '#9400d3',
5552
deeppink: '#ff1493',
5653
deepskyblue: '#00bfff',
5754
dimgray: '#696969',
58-
dimgrey: '#696969',
5955
dodgerblue: '#1e90ff',
6056
firebrick: '#b22222',
6157
floralwhite: '#fffaf0',
@@ -65,7 +61,6 @@ export const HTML_COLORS = {
6561
gold: '#ffd700',
6662
goldenrod: '#daa520',
6763
greenyellow: '#adff2f',
68-
grey: '#808080',
6964
honeydew: '#f0fff0',
7065
hotpink: '#ff69b4',
7166
indianred: '#cd5c5c',
@@ -82,13 +77,11 @@ export const HTML_COLORS = {
8277
lightgoldenrodyellow: '#fafad2',
8378
lightgray: '#d3d3d3',
8479
lightgreen: '#90ee90',
85-
lightgrey: '#d3d3d3',
8680
lightpink: '#ffb6c1',
8781
lightsalmon: '#ffa07a',
8882
lightseagreen: '#20b2aa',
8983
lightskyblue: '#87cefa',
9084
lightslategray: '#778899',
91-
lightslategrey: '#778899',
9285
lightsteelblue: '#b0c4de',
9386
lightyellow: '#ffffe0',
9487
limegreen: '#32cd32',
@@ -134,7 +127,6 @@ export const HTML_COLORS = {
134127
skyblue: '#87ceeb',
135128
slateblue: '#6a5acd',
136129
slategray: '#708090',
137-
slategrey: '#708090',
138130
snow: '#fffafa',
139131
springgreen: '#00ff7f',
140132
steelblue: '#4682b4',
@@ -151,36 +143,35 @@ export const HTML_COLORS = {
151143
export const CHINESE_NAME = {
152144
aliceblue: '艾利斯兰',
153145
antiquewhite: '古董白',
154-
aqua: '水绿色',
155-
aquamarine: '碧绿',
156-
azure: '天蓝',
146+
aquamarine: '蓝晶色',
147+
azure: '天蓝色',
157148
beige: '米色',
158-
bisque: '桔黄',
149+
bisque: '桔黄色',
159150
black: '黑色',
160-
blanchedalmond: '白杏',
151+
blanchedalmond: '白杏色',
161152
blue: '蓝色',
162-
blueviolet: '蓝紫色',
153+
blueviolet: '紫罗兰色',
163154
brown: '棕色',
164155
burlywood: '实木色',
165-
cadetblue: '军蓝',
166-
chartreuse: '浅黄绿色',
156+
cadetblue: '军蓝色',
157+
chartreuse: '黄绿色',
167158
chocolate: '巧克力色',
168159
coral: '珊瑚色',
169160
cornflowerblue: '矢车菊蓝',
170161
cornsilk: '玉米丝色',
171162
crimson: '绯红',
172163
cyan: '青色',
173-
darkblue: '深蓝',
174-
darkcyan: '深青',
164+
darkblue: '深蓝色',
165+
darkcyan: '深青色',
175166
darkgoldenrod: '深金黄色',
176-
darkgray: '深灰',
177-
darkgreen: '深绿',
167+
darkgray: '深灰色',
168+
darkgreen: '深绿色',
178169
darkkhaki: '深卡其色',
179170
darkmagenta: '深紫红色',
180171
darkolivegreen: '深橄榄绿',
181172
darkorange: '深橙色',
182173
darkorchid: '深兰花紫',
183-
darkred: '深红',
174+
darkred: '深红色',
184175
darksalmon: '深橙红',
185176
darkseagreen: '深海绿',
186177
darkslateblue: '深板岩蓝',
@@ -189,13 +180,13 @@ export const CHINESE_NAME = {
189180
darkviolet: '深紫罗兰',
190181
deeppink: '深粉红',
191182
deepskyblue: '深天蓝',
192-
dimgray: '暗灰',
183+
dimgray: '暗灰色',
193184
dodgerblue: '道奇蓝',
194185
firebrick: '火砖色',
195-
floralwhite: '花白',
186+
floralwhite: '花白色',
196187
forestgreen: '森林绿',
197-
fuchsia: '紫红',
198-
gainsboro: '亮灰',
188+
fuchsia: '紫红色',
189+
gainsboro: '亮灰色',
199190
ghostwhite: '幽灵白',
200191
gold: '金色',
201192
goldenrod: '金菊黄',
@@ -205,12 +196,12 @@ export const CHINESE_NAME = {
205196
honeydew: '蜜瓜色',
206197
hotpink: '亮粉红',
207198
indianred: '印度红',
208-
indigo: '靛青',
199+
indigo: '靛青色',
209200
ivory: '象牙色',
210201
khaki: '卡其色',
211202
lavender: '薰衣草色',
212203
lavenderblush: '淡紫红',
213-
lawngreen: '草绿',
204+
lawngreen: '草绿色',
214205
lemonchiffon: '柠檬绸色',
215206
lightblue: '淡蓝',
216207
lightcoral: '浅珊瑚色',
@@ -231,9 +222,9 @@ export const CHINESE_NAME = {
231222
magenta: '洋红',
232223
maroon: '栗色',
233224
mediumaquamarine: '中碧绿',
234-
mediumblue: '中蓝',
225+
mediumblue: '中蓝色',
235226
mediumorchid: '中兰花紫',
236-
mediumpurple: '中紫',
227+
mediumpurple: '中紫色',
237228
mediumseagreen: '中海绿',
238229
mediumslateblue: '中板岩蓝',
239230
mediumspringgreen: '中春绿',
@@ -247,37 +238,37 @@ export const CHINESE_NAME = {
247238
navy: '海军蓝',
248239
oldlace: '老花色',
249240
olive: '橄榄色',
250-
olivedrab: '橄榄褐',
241+
olivedrab: '橄榄绿',
251242
orange: '橙色',
252243
orangered: '橙红色',
253244
orchid: '兰花紫',
254245
palegoldenrod: '灰菊黄',
255-
palegreen: '灰绿',
246+
palegreen: '灰绿色',
256247
paleturquoise: '灰宝石绿',
257248
palevioletred: '灰紫罗兰',
258249
papayawhip: '番木色',
259250
peachpuff: '桃色',
260251
peru: '秘鲁色',
261-
pink: '粉红',
252+
pink: '粉红色',
262253
plum: '洋李色',
263-
powderblue: '粉蓝',
254+
powderblue: '粉蓝色',
264255
purple: '紫色',
265256
red: '红色',
266257
rosybrown: '玫瑰褐',
267258
royalblue: '皇家蓝',
268-
saddlebrown: '马鞍褐',
269-
salmon: '鲑色',
270-
sandybrown: '沙褐',
271-
seagreen: '海绿',
259+
saddlebrown: '马鞍棕色',
260+
salmon: '鲜肉色',
261+
sandybrown: '沙棕色',
262+
seagreen: '海绿色',
272263
seashell: '贝壳白',
273264
sienna: '赭色',
274265
silver: '银色',
275-
skyblue: '天蓝',
266+
skyblue: '天蓝色',
276267
slateblue: '板岩蓝',
277268
slategray: '板岩灰',
278-
snow: '雪白',
279-
springgreen: '春绿',
280-
steelblue: '钢蓝',
269+
snow: '雪白色',
270+
springgreen: '春绿色',
271+
steelblue: '钢蓝色',
281272
tan: '茶色',
282273
teal: '水鸭色',
283274
thistle: '蓟色',
@@ -286,9 +277,9 @@ export const CHINESE_NAME = {
286277
violet: '紫罗兰',
287278
wheat: '小麦色',
288279
white: '白色',
289-
whitesmoke: '烟白',
280+
whitesmoke: '烟白色',
290281
yellow: '黄色',
291-
yellowgreen: '黄绿',
282+
yellowgreen: '黄绿色',
292283
};
293284

294285
export function convertToColor(hex) {

0 commit comments

Comments
 (0)