diff --git a/core/core-frontend/src/locales/en-US.ts b/core/core-frontend/src/locales/en-US.ts index 4dd6aa1b45..58ee6bbf8e 100644 --- a/core/core-frontend/src/locales/en-US.ts +++ b/core/core-frontend/src/locales/en-US.ts @@ -1551,6 +1551,17 @@ export default { data_sub: 'Comparison difference', data_percent: 'Difference percentage', compare_calc_expression: 'Calculation formula', + compare_calc_day_pre: 'Previous Day Data', + compare_calc_day_sub: "Today's Data - Previous Day Data", + compare_calc_day_percent: "(Today's Data / Previous Day Data - 1) * 100%", + compare_calc_month_pre: 'Same Day Last Month Data', + compare_calc_month_sub: "Today's Data - Same Day Last Month Data", + compare_calc_month_percent: "(Today's Data / Same Day Last Month Data - 1) * 100%", + compare_calc_year_pre: 'Same Day Last Year Data', + compare_calc_year_sub: "Today's Data - Same Day Last Year Data", + compare_calc_year_percent: "(Today's Data / Same Day Last Year Data - 1) * 100%", + compare_calc_tip: + 'When filtering is required for comparison dates, please use the filter component to apply the filter; using chart filters, dashboard drilling, and linking functions may lead to inconsistent results.', and: 'And', or: 'Or', logic_exp: 'Logical condition', diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 9b6be95e02..2841372f6c 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1586,6 +1586,17 @@ export default { data_sub: 'Comparison difference', data_percent: 'Difference percentage', compare_calc_expression: 'Calculation formula', + compare_calc_day_pre: 'Previous Day Data', + compare_calc_day_sub: "Today's Data - Previous Day Data", + compare_calc_day_percent: "(Today's Data / Previous Day Data - 1) * 100%", + compare_calc_month_pre: 'Same Day Last Month Data', + compare_calc_month_sub: "Today's Data - Same Day Last Month Data", + compare_calc_month_percent: "(Today's Data / Same Day Last Month Data - 1) * 100%", + compare_calc_year_pre: 'Same Day Last Year Data', + compare_calc_year_sub: "Today's Data - Same Day Last Year Data", + compare_calc_year_percent: "(Today's Data / Same Day Last Year Data - 1) * 100%", + compare_calc_tip: + 'When filtering is required for comparison dates, please use the filter component to apply the filter; using chart filters, dashboard drilling, and linking functions may lead to inconsistent results.', and: 'And', or: 'Or', logic_exp: 'Logical condition', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 8a25c93f70..22d35c50c6 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -1556,6 +1556,17 @@ export default { data_sub: '對比差值', data_percent: '差值百分比', compare_calc_expression: '計算公式', + compare_calc_day_pre: '昨日數據', + compare_calc_day_sub: '當天數據 - 昨日數據', + compare_calc_day_percent: '(當天數據 / 昨日數據 - 1)* 100%', + compare_calc_month_pre: '上月同日數據', + compare_calc_month_sub: '當天數據 - 上月同日數據', + compare_calc_month_percent: '(當天數據 / 上月同日數據 - 1)* 100%', + compare_calc_year_pre: '去年同月同日數據', + compare_calc_year_sub: '當天數據 - 去年同月同日數據', + compare_calc_year_percent: '(當天數據 / 去年同月同日數據 - 1)* 100%', + compare_calc_tip: + '當對比日期需要過濾時,請使用過濾組件實現過濾;使用圖表過濾器,儀表板下鑽和聯動等功能,會導致結果不一致', and: '與', or: '或', logic_exp: '邏輯條件', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 41c7204833..6dc47b5809 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1558,6 +1558,17 @@ export default { data_sub: '对比差值', data_percent: '差值百分比', compare_calc_expression: '计算公式', + compare_calc_day_pre: '昨日数据', + compare_calc_day_sub: '当天数据 - 昨日数据', + compare_calc_day_percent: '(当天数据 / 昨日数据 - 1)* 100%', + compare_calc_month_pre: '上月同日数据', + compare_calc_month_sub: '当天数据 - 上月同日数据', + compare_calc_month_percent: '(当天数据 / 上月同日数据 - 1)* 100%', + compare_calc_year_pre: '去年同月同日数据', + compare_calc_year_sub: '当天数据 - 去年同月同日数据', + compare_calc_year_percent: '(当天数据 / 去年同月同日数据 - 1)* 100%', + compare_calc_tip: + '当对比日期需要过滤时,请使用过滤组件实现过滤;使用图表过滤器,仪表板下钻和联动等功能,会导致结果不一致', and: '与', or: '或', logic_exp: '逻辑条件', diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue index f1a79d22b9..030cfe34ec 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CompareEdit.vue @@ -37,9 +37,9 @@ const state = reactive({ }) const dateFormatterList = [ - { name: '年', value: 'y' }, - { name: '年月', value: 'y_M' }, - { name: '年月日', value: 'y_M_d' } + { name: t('chart.y'), value: 'y' }, + { name: t('chart.y_M'), value: 'y_M' }, + { name: t('chart.y_M_d'), value: 'y_M_d' } ] const changeDateFormatter = () => { @@ -208,18 +208,54 @@ initDateFormatter() - 上期数据 - 本期数据 - 上期数据 + + {{ t('chart.compare_calc_day_pre') }} + + + {{ t('chart.compare_calc_day_sub') }} + + + {{ t('chart.compare_calc_day_percent') }} + + + + - 当对比日期需要过滤时,请使用过滤组件实现过滤;使用图表过滤器,仪表板下钻和联动等功能,会导致结果不一致 + {{ t('chart.compare_calc_tip') }}