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",