浏览代码

merge master

ryan 7 年之前
父节点
当前提交
011b2cdf09
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      packages/grafana-ui/src/utils/processTableData.ts
  2. 1 1
      packages/grafana-ui/src/utils/singlestat.ts

+ 1 - 1
packages/grafana-ui/src/utils/processTableData.ts

@@ -1,6 +1,6 @@
 // Libraries
-import Papa, { ParseError, ParseMeta } from 'papaparse';
 import isNumber from 'lodash/isNumber';
+import Papa, { ParseError, ParseMeta } from 'papaparse';
 
 // Types
 import { TableData, Column, TimeSeries } from '../types';

+ 1 - 1
packages/grafana-ui/src/utils/singlestat.ts

@@ -15,7 +15,7 @@ export function processSingleStatPanelData(options: SingleStatProcessingOptions)
   const timeSeries = processTimeSeries({
     data,
     xColumn: 0,
-    yColumn: 0,
+    yColumn: 1,
     nullValueMode: NullValueMode.Null,
   });