Merge remote-tracking branch 'origin/main' into lichang

src/i18n/locales/en-US.ts

@@ -1065,6 +1065,8 @@ export default {
         expression:'Expression',
         description:' Description',
         kpiSet:' Statistical Settings',
+        sixHoursAgo:'Six hours ago',
+        threeHoursAgo:'Three hours ago.',
         delCustomTip:'Confirm deletion of data item with record number {num}?',
         delCustom:' Successfully delete record number {num} custom indicator',
         addCustom:' Add custom indicator',
@@ -1077,6 +1079,9 @@ export default {
         element:'Element',
         granularity:'Granularity',
         unit:'Unit',
+        expressionModal:'Expression Modal',
+        expressionErrorTip:'Please check the expression, the wrong indicator is {kpiId}',
+        expressionNoIdTip:'Please check the expression, no valid indicator is found',
       },
       kpiKeyTarget:{
         "fullWidthLayout":"Full Width",

src/i18n/locales/zh-CN.ts

@@ -1065,6 +1065,8 @@ export default {
         expression:'计算公式',
         description:'描述',
         kpiSet:'统计设置',
+        sixHoursAgo:'6小时前',
+        threeHoursAgo:'3小时前',
         delCustomTip:'确认删除记录编号为 {num} 的数据项?',
         delCustom:'成功删除记录编号为 {num} 自定义指标',
         addCustom:'添加自定义指标',
@@ -1077,6 +1079,9 @@ export default {
         element:'元素',
         granularity:'颗粒度',
         unit:'单位',
+        expressionModal:'表达式模块',
+        expressionErrorTip:'请检查表达式,错误的指标为{kpiId}',
+        expressionNoIdTip:'请检查表达式,没有找到任何有效的指标',
       },
       kpiKeyTarget:{
         "fullWidthLayout":"全宽布局",
@@ -1337,8 +1342,8 @@ export default {
         filter: "全局过滤",
         startTime: '开始时间',
         endTime: '结束时间',
-        today: '昨天',
-        yesterday: '今天',
+        today: '今天',
+        yesterday: '昨天',
         week: '本周',
         month: '本月',
         avgLoad: '平均负载',