Skip to content

Commit 7ffe68a

Browse files
CuiyansongCuiyansong
committed
refactor(chart): add reference position translation
1 parent 7114559 commit 7ffe68a

File tree

4 files changed

+102
-35
lines changed

4 files changed

+102
-35
lines changed

‎frontend/src/app/components/FormGenerator/Customize/DataReferencePanel.tsx‎

Lines changed: 79 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,24 @@ const defaultRows = [
5555
default: 'constant',
5656
comType: 'select',
5757
options: {
58+
translateItemLabel: true,
5859
items: [
59-
{ label: '常量', value: 'constant' },
60-
{ label: '平均值', value: 'average' },
61-
{ label: '最大值', value: 'max' },
62-
{ label: '最小值', value: 'min' },
60+
{
61+
label: 'viz.palette.setting.reference.constant',
62+
value: 'constant',
63+
},
64+
{
65+
label: 'viz.palette.setting.reference.avg',
66+
value: 'average',
67+
},
68+
{
69+
label: 'viz.palette.setting.reference.max',
70+
value: 'max',
71+
},
72+
{
73+
label: 'viz.palette.setting.reference.min',
74+
value: 'min',
75+
},
6376
],
6477
},
6578
},
@@ -116,15 +129,25 @@ const defaultRows = [
116129
options: [],
117130
},
118131
{
119-
label: 'viz.palette.setting.reference.position',
132+
label: 'viz.palette.setting.reference.position.title',
120133
key: 'position',
121134
comType: 'select',
122135
default: 'start',
123136
options: {
137+
translateItemLabel: true,
124138
items: [
125-
{ label: '起始', value: 'start' },
126-
{ label: '中点', value: 'middle' },
127-
{ label: '结束', value: 'end' },
139+
{
140+
label: 'viz.palette.setting.reference.position.start',
141+
value: 'start',
142+
},
143+
{
144+
label: 'viz.palette.setting.reference.position.middle',
145+
value: 'middle',
146+
},
147+
{
148+
label: 'viz.palette.setting.reference.position.end',
149+
value: 'end',
150+
},
128151
],
129152
},
130153
},
@@ -169,11 +192,24 @@ const defaultRows = [
169192
default: 'constant',
170193
comType: 'select',
171194
options: {
195+
translateItemLabel: true,
172196
items: [
173-
{ label: '常量', value: 'constant' },
174-
{ label: '平均值', value: 'average' },
175-
{ label: '最大值', value: 'max' },
176-
{ label: '最小值', value: 'min' },
197+
{
198+
label: 'viz.palette.setting.reference.constant',
199+
value: 'constant',
200+
},
201+
{
202+
label: 'viz.palette.setting.reference.avg',
203+
value: 'average',
204+
},
205+
{
206+
label: 'viz.palette.setting.reference.max',
207+
value: 'max',
208+
},
209+
{
210+
label: 'viz.palette.setting.reference.min',
211+
value: 'min',
212+
},
177213
],
178214
},
179215
},
@@ -226,11 +262,24 @@ const defaultRows = [
226262
default: 'constant',
227263
comType: 'select',
228264
options: {
265+
translateItemLabel: true,
229266
items: [
230-
{ label: '常量', value: 'constant' },
231-
{ label: '平均值', value: 'average' },
232-
{ label: '最大值', value: 'max' },
233-
{ label: '最小值', value: 'min' },
267+
{
268+
label: 'viz.palette.setting.reference.constant',
269+
value: 'constant',
270+
},
271+
{
272+
label: 'viz.palette.setting.reference.avg',
273+
value: 'average',
274+
},
275+
{
276+
label: 'viz.palette.setting.reference.max',
277+
value: 'max',
278+
},
279+
{
280+
label: 'viz.palette.setting.reference.min',
281+
value: 'min',
282+
},
234283
],
235284
},
236285
},
@@ -283,15 +332,25 @@ const defaultRows = [
283332
comType: 'checkbox',
284333
},
285334
{
286-
label: 'viz.palette.setting.reference.position',
335+
label: 'viz.palette.setting.reference.position.title',
287336
key: 'position',
288337
comType: 'select',
289338
default: 'start',
290339
options: {
340+
translateItemLabel: true,
291341
items: [
292-
{ label: '起始', value: 'start' },
293-
{ label: '中点', value: 'middle' },
294-
{ label: '结束', value: 'end' },
342+
{
343+
label: 'viz.palette.setting.reference.position.start',
344+
value: 'start',
345+
},
346+
{
347+
label: 'viz.palette.setting.reference.position.middle',
348+
value: 'middle',
349+
},
350+
{
351+
label: 'viz.palette.setting.reference.position.end',
352+
value: 'end',
353+
},
295354
],
296355
},
297356
},

‎frontend/src/app/utils/chartHelper.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -493,16 +493,6 @@ export function getReference2(
493493
'rows',
494494
);
495495

496-
console.log(
497-
`getMarkArea2(
498-
referenceTabs,
499-
dataSetRows,
500-
dataConfig,
501-
isHorizonDisplay,
502-
), ---> `,
503-
getMarkArea2(referenceTabs, dataSetRows, dataConfig, isHorizonDisplay),
504-
);
505-
506496
return {
507497
markLine: getMarkLine2(
508498
referenceTabs,

‎frontend/src/locales/en/translation.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,11 +688,20 @@
688688
"endMetric": "End Reference Metric",
689689
"font": "Font",
690690
"showLabel": "Show",
691-
"position": "Position",
691+
"position": {
692+
"title": "Position",
693+
"start": "Start",
694+
"middle": "Middle",
695+
"end": "End"
696+
},
692697
"lineStyle": "Line Style",
693698
"opacity": "Opacity",
694699
"backgroundColor": "Background Color",
695-
"borderStyle": "Border Style"
700+
"borderStyle": "Border Style",
701+
"constant": "Constant",
702+
"avg": "AVG",
703+
"max": "Max",
704+
"min": "Min"
696705
},
697706
"paging": {
698707
"title": "Common",
@@ -1333,4 +1342,4 @@
13331342
"haveCharts": "The chart already exists in the dashboard and cannot be added repeatedly"
13341343
}
13351344
}
1336-
}
1345+
}

‎frontend/src/locales/zh/translation.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,11 +688,20 @@
688688
"endMetric": "结束关联指标",
689689
"font": "字体",
690690
"showLabel": "显示标签",
691-
"position": "标签位置",
691+
"position": {
692+
"title": "标签位置",
693+
"start": "开始",
694+
"middle": "中间",
695+
"end": "结尾"
696+
},
692697
"lineStyle": "线条样式",
693698
"opacity": "透明度",
694699
"backgroundColor": "背景颜色",
695-
"borderStyle": "边框样式"
700+
"borderStyle": "边框样式",
701+
"constant": "常量",
702+
"avg": "平均值",
703+
"max": "最大值",
704+
"min": "最小值"
696705
},
697706
"paging": {
698707
"title": "常规",

0 commit comments

Comments
 (0)