Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ECharts to v5, add support for ECharts gauge & chart widget #814

Merged
merged 8 commits into from
Jan 27, 2021
Merged

Upgrade ECharts to v5, add support for ECharts gauge & chart widget #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0b9208
Adding support for ECharts gauge and added chart widget.
crnjan Jan 16, 2021
2136c01
Embedded chart widget into chart page, added lazy loading of ECharts.
crnjan Jan 18, 2021
cb28852
Show chart related hints on layout pages.
crnjan Jan 18, 2021
21ddf38
Re-added handling of tabs, toolbars, sheets for chart page.
crnjan Jan 18, 2021
671d830
Upgraded ECharts to latest version 5.0.1, background override for cha…
crnjan Jan 19, 2021
0c847d0
Gauges didn't update on initial load when store does not yet contain …
crnjan Jan 21, 2021
9693781
Minor code cleanup.
crnjan Jan 21, 2021
4e04d7c
Some fixes
ghys Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 77 additions & 23 deletions bundles/org.openhab.ui/web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bundles/org.openhab.ui/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"cronstrue": "^1.100.0",
"dayjs": "^1.9.6",
"dom7": "^2.1.5",
"echarts": "^4.9.0",
"echarts": "^5.0.1",
"event-source-polyfill": "^1.0.22",
"expression-eval": "^2.1.0",
"framework7": "^5.7.12",
Expand Down
11 changes: 11 additions & 0 deletions bundles/org.openhab.ui/web/src/assets/definitions/widgets/chart/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,17 @@ export default {
}
},

'oh-data-series': {
label: 'Data Series',
docLink: 'https://echarts.apache.org/en/option.html#series',
props: {
parameterGroups: [],
parameters: [
seriesTypeParameter('gauge')
]
}
},

'oh-time-series': {
label: 'Time Series',
docLink: 'https://echarts.apache.org/en/option.html#series',
Expand Down
32 changes: 3 additions & 29 deletions bundles/org.openhab.ui/web/src/assets/definitions/widgets/chart/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
// definitions for the chart page & widgets

import { WidgetDefinition, po } from '../helpers'
import { WidgetDefinition } from '../helpers'

import ChartParameters from '../system/chart'
export const OhChartPageDefinition = () => new WidgetDefinition('oh-chart-page', 'Chart Page', 'Visualize historical series')
.params([
po('chartType', 'Chart Type', 'Define a fixed period for the chart, aligned at the beginning of the period, e.g. January 1st at midnight for a year chart. If not set (or set to dynamic), the length of the period will be configurable but certain combinations like aggregated series might not work', [
{ value: '', label: 'Dynamic period' },
{ value: 'day', label: 'Day' },
{ value: 'isoWeek', label: 'Week (starting on Monday)' },
{ value: 'week', label: 'Week (starting on Sunday)' },
{ value: 'month', label: 'Month' },
{ value: 'year', label: 'Year' }
]).r(),
po('period', 'Initial Period', 'The initial period for the chart', [
{ value: 'h', label: 'h' },
{ value: '2h', label: '2h' },
{ value: '4h', label: '4h' },
{ value: '12h', label: '12h' },
{ value: 'D', label: 'D' },
{ value: '2D', label: '2D' },
{ value: '3D', label: '3D' },
{ value: 'W', label: 'W' },
{ value: '2W', label: '2W' },
{ value: 'M', label: 'M' },
{ value: '2M', label: '2M' },
{ value: '4M', label: '4M' },
{ value: '6M', label: '6M' },
{ value: 'Y', label: 'Y' }
]).v((value, configuration, configDescription, parameters) => {
return !configuration.chartType
})
])
.params(ChartParameters())
Loading