Peter Holmberg 6 лет назад
Родитель
Сommit
9c33a9410f
2 измененных файлов с 9 добавлено и 2 удалено
  1. 3 1
      packages/grafana-ui/src/types/datasource.ts
  2. 6 1
      public/app/types/explore.ts

+ 3 - 1
packages/grafana-ui/src/types/datasource.ts

@@ -3,9 +3,11 @@ import { PluginMeta } from './plugin';
 import { TableData, TimeSeries } from './data';
 
 export interface DataQueryResponse {
-  data: TimeSeries[] | [TableData] | any;
+  data: DataQueryResponseData;
 }
 
+export type DataQueryResponseData = TimeSeries[] | [TableData] | any;
+
 export interface DataQuery {
   /**
    * A - Z

+ 6 - 1
public/app/types/explore.ts

@@ -4,6 +4,7 @@ import {
   RawTimeRange,
   TimeRange,
   DataQuery,
+  DataQueryResponseData,
   DataSourceSelectItem,
   DataSourceApi,
   QueryHint,
@@ -322,7 +323,11 @@ export interface QueryTransaction {
 
 export type RangeScanner = () => RawTimeRange;
 
-export type ResultGetter = (result: any, transaction: QueryTransaction, allTransactions: QueryTransaction[]) => any;
+export type ResultGetter = (
+  result: DataQueryResponseData,
+  transaction: QueryTransaction,
+  allTransactions: QueryTransaction[]
+) => any;
 
 export interface TextMatch {
   text: string;