소스 검색

Merge branch 'feature-add-tomorrow' of oscarleiva/energylink into development

Merge branch feature-add-tomorrow
Oscar Alfredo Leiva Salomón 6 년 전
부모
커밋
feef7689fc
2개의 변경된 파일2개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      packages/grafana-data/src/datetime/rangeutil.ts
  2. 1 0
      packages/grafana-ui/src/components/TimePicker/TimePicker.tsx

+ 1 - 0
packages/grafana-data/src/datetime/rangeutil.ts

@@ -18,6 +18,7 @@ const spans: { [key: string]: { display: string; section?: number } } = {
 
 const rangeOptions = [
   { from: 'now/d', to: 'now/d', display: 'Today', section: 2 },
+  { from: 'now+1d/d', to: 'now+1d/d', display: 'Tomorrow', section: 2 },
   { from: 'now/d', to: 'now', display: 'Today so far', section: 2 },
   { from: 'now/w', to: 'now/w', display: 'This week', section: 2 },
   { from: 'now/w', to: 'now', display: 'This week so far', section: 2 },

+ 1 - 0
packages/grafana-ui/src/components/TimePicker/TimePicker.tsx

@@ -49,6 +49,7 @@ export const defaultSelectOptions: TimeOption[] = [
   { from: 'now-1w/w', to: 'now-1w/w', display: 'Previous week', section: 3 },
   { from: 'now-1M/M', to: 'now-1M/M', display: 'Previous month', section: 3 },
   { from: 'now-1y/y', to: 'now-1y/y', display: 'Previous year', section: 3 },
+  { from: 'now+1d/d', to: 'now+1d/d', display: 'Tomorrow', section: 3 },
   { from: 'now/d', to: 'now/d', display: 'Today', section: 3 },
   { from: 'now/d', to: 'now', display: 'Today so far', section: 3 },
   { from: 'now/w', to: 'now/w', display: 'This week', section: 3 },