minor: 解决冲突

Author: xiaolicheng-github

src/common/lang/en.json

@@ -76,6 +76,7 @@
   "开启": "on",
   "关闭": "off",
   "降采样": "Down Sampling",
+  "最新数据点": "Latest data points",
   "方法": "Formula",
   "数据名称": "Data name",
   "数据类型": "Data types",

src/timeseries/src/components/addvance-setting.tsx

@@ -31,7 +31,7 @@ import type { EditMode } from '../typings/metric';
 import { t } from 'common/utils/utils';
 import AliasInput from './alias-input';
 import EditorForm from './editor-form';
-export type AddvanceSettingKey = 'enableDownSampling' | 'format' | 'promqlAlias' | 'step' | 'type';
+export type AddvanceSettingKey = 'enableDownSampling' | 'format' | 'promqlAlias' | 'step' | 'type' | 'showLastPoint';
 export interface IAddvanceSettingProps {
   format: string;
   mode: EditMode;
@@ -44,6 +44,7 @@ export interface IAddvanceSettingProps {
   step: string;
   type: string;
   enableDownSampling: boolean;
+  showLastPoint: boolean;
 }
 
 interface IAddvanceState {
@@ -89,7 +90,7 @@ export default class AddvanceSetting extends React.PureComponent<IAddvanceSettin
 
   render(): JSX.Element {
     const { showContent } = this.state;
-    const { format, mode, onChange, promqlAlias, step, type, enableDownSampling } = this.props;
+    const { format, mode, onChange, promqlAlias, step, type, enableDownSampling, showLastPoint } = this.props;
     const getHeaderContent = () => (
       <div className='header-content'>
         {mode === 'code' && <span className='header-content-item'>Min Step: {step || 'auto'}</span>}
@@ -107,6 +108,9 @@ export default class AddvanceSetting extends React.PureComponent<IAddvanceSettin
         <span className='header-content-item'>
           {t('降采样')}: {enableDownSampling ? t('开启') : t('关闭')}
         </span>
+        <span className='header-content-item'>
+          {t('最新数据点')}: {showLastPoint ? t('开启') : t('关闭')}
+        </span>
       </div>
     );
     const uiForm = () => (
@@ -152,6 +156,17 @@ export default class AddvanceSetting extends React.PureComponent<IAddvanceSettin
               />
             </div>
           </EditorForm>
+          <EditorForm title={t('最新数据点')}>
+            <div className='down-sample-wrapper'>
+              <Switch
+                checked={showLastPoint}
+                checkedChildren={t('开启')}
+                size='small'
+                unCheckedChildren={t('关闭')}
+                onChange={v => onChange('showLastPoint', v)}
+              />
+            </div>
+          </EditorForm>
         </EditorForm>
       </>
     );
@@ -229,6 +244,17 @@ export default class AddvanceSetting extends React.PureComponent<IAddvanceSettin
                   />
                 </div>
               </EditorForm>
+              <EditorForm title={t('最新数据点')}>
+                <div className='down-sample-wrapper'>
+                  <Switch
+                    checked={showLastPoint}
+                    checkedChildren={t('开启')}
+                    size='small'
+                    unCheckedChildren={t('关闭')}
+                    onChange={v => onChange('showLastPoint', v)}
+                  />
+                </div>
+              </EditorForm>
             </EditorForm>
           ) : (
             uiForm()

src/timeseries/src/components/query-editor.tsx

@@ -99,6 +99,7 @@ interface IQueryEditorState {
   enableDownSampling: boolean;
   showErrorAlert: boolean;
   errorAlertMessage: string;
+  showLastPoint: boolean;
 }
 export default class MonitorQueryEditor extends React.PureComponent<IQueryEditorProps, IQueryEditorState> {
   constructor(props, context) {
@@ -140,6 +141,8 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
     if (enableDownSampling === undefined) {
       enableDownSampling = stateMode !== 'code';
     }
+    let showLastPoint = ['true', true].includes(query?.showLastPoint);
+
     this.state = {
       cluster,
       editorStatus: 'default',
@@ -159,6 +162,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
       source,
       step,
       enableDownSampling,
+      showLastPoint,
       type: query.type ?? 'range',
       showErrorAlert: false,
       errorAlertMessage: '',
@@ -992,7 +996,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
     return letter;
   }
   handleGetQueryData(metricList: MetricDetail[]) {
-    const { cluster, expressionList, host, module, promqlAlias, enableDownSampling } = this.state;
+    const { cluster, expressionList, host, module, promqlAlias, enableDownSampling, showLastPoint } = this.state;
     // const curExpression = typeof expression === 'undefined' ? this.state.expression : expression;
     // const curDisplay = typeof display === 'undefined' ? this.state.display : display;
     return {
@@ -1008,6 +1012,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
       module,
       promqlAlias,
       enableDownSampling,
+      showLastPoint,
       query_configs: metricList
         .filter(item => item.metricMetaId)
         .map(item => {
@@ -1479,6 +1484,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
                 {
                   <AddvanceSetting
                     enableDownSampling={this.state.enableDownSampling}
+                    showLastPoint={this.state.showLastPoint}
                     format={this.state.format}
                     mode={mode}
                     promqlAlias={promqlAlias}

src/timeseries/src/datasource/datasource.ts

@@ -181,6 +181,12 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
         text,
         value,
       };
+      if (key?.includes?.('.')) {
+        monitorScopedVars[`${keyPrefix}${key}`.replace(/\./g, '_')] = {
+          text,
+          value,
+        };
+      }
     }
     if (rawKey && !(rawKey in monitorScopedVars)) {
       monitorScopedVars[rawKey] = {
@@ -843,6 +849,7 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
                 data: {
                   display: config.display,
                   down_sample_range: item.enableDownSampling !== false ? down_sample_range : undefined,
+                  time_alignment: item.showLastPoint === true ? false : undefined,
                   end_time: options.range.to.unix(),
                   expression: config.refId || '',
                   format: item.format,
@@ -881,6 +888,7 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
           const params = {
             data: {
               down_sample_range: item.enableDownSampling === true ? down_sample_range : undefined, // promql 原来默认是不开启的
+              time_alignment: item.showLastPoint === true ? false : undefined,
               end_time: options.range.to.unix(),
               format: item.format,
               promql: this.buildPromqlVariables(item.source!, replaceScopedVars),
@@ -909,14 +917,15 @@ export default class DashboardDatasource extends DataSourceApi<QueryData, QueryO
               }),
           );
         } else {
-          const { cluster, expressionList, host, module, enableDownSampling } = item;
+          const { cluster, expressionList, host, module, enableDownSampling, showLastPoint } = item;
           // biome-ignore lint/complexity/noForEach: <explanation>
           expressionList?.forEach(exp => {
             if (exp.expression && exp.active) {
               const p = {
                 data: {
                   display: exp.active,
                   down_sample_range: enableDownSampling !== false ? down_sample_range : undefined,
+                  time_alignment: showLastPoint === true ? false : undefined,
                   end_time: options.range.to.unix(),
                   expression: exp.expression,
                   format: item.format,

src/timeseries/src/typings/datasource.ts

@@ -69,6 +69,7 @@ export interface QueryData extends DataQuery {
   step?: string;
   type?: string;
   enableDownSampling?: boolean;
+  showLastPoint?: boolean;
 }
 
 export const DIM_NULL_ID = '';