diff --git a/application/src/main/data/json/system/widget_bundles/charts.json b/application/src/main/data/json/system/widget_bundles/charts.json index 14c09d3fc4..07929028ff 100644 --- a/application/src/main/data/json/system/widget_bundles/charts.json +++ b/application/src/main/data/json/system/widget_bundles/charts.json @@ -2,16 +2,16 @@ "widgetsBundle": { "alias": "charts", "title": "Charts", - "image": "data:image/png;base64,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", + "image": "tb-image:Y2hhcnRzX3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkNoYXJ0cyIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==;data:image/png;base64,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", "description": "Display time series data using customizable line and bar charts. Use various pie charts to display the latest values.", "order": 1000, - "externalId": null, "name": "Charts" }, "widgetTypeFqns": [ "charts.basic_timeseries", "charts.state_chart", "range_chart", + "bar_chart_with_labels", "charts.timeseries_bars_flot", "cards.aggregated_value_card", "charts.bars", diff --git a/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json new file mode 100644 index 0000000000..06ee881c0a --- /dev/null +++ b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json @@ -0,0 +1,30 @@ +{ + "fqn": "bar_chart_with_labels", + "name": "Bar chart with labels", + "deprecated": false, + "image": "tb-image:QmFyLWNoYXJ0LXdpdGgtbGFiZWxzLnN2Zw==:IkJhciBjaGFydCB3aXRoIGxhYmVscyIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="201" height="160" fill="none"><path fill="#000" fill-opacity=".5" d="M2.8 4.3V10h-.7V5.2l-1.4.5v-.6l2-.8h.1Zm5.9 2.4v.9l-.1 1.2-.4.7c-.2.2-.3.4-.6.4a2 2 0 0 1-.7.2l-.6-.1c-.2 0-.4-.1-.5-.3-.2 0-.3-.2-.4-.4l-.2-.8-.1-1v-.8l.1-1.2.4-.7c.1-.2.3-.4.5-.4l.8-.2.6.1a1.4 1.4 0 0 1 .9.7l.2.7v1Zm-.7 1V5.9l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.5 0l-.3.3-.2.6v2.6l.1.5.2.3.3.2h.9l.3-.3.2-.6v-.8Zm5.3-1v2.1l-.5.7c-.1.2-.3.4-.5.4a2 2 0 0 1-.8.2L11 10c-.2 0-.3-.1-.5-.3l-.3-.4-.3-.8v-3l.4-.7c.2-.2.4-.4.6-.4l.7-.2.6.1a1.4 1.4 0 0 1 1 .7l.1.7.1 1Zm-.7 1V5.9l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.4 0c-.2 0-.3.2-.4.3l-.2.6v2.6l.1.5.3.3c0 .1.1.2.3.2h.8l.3-.3.2-.6.1-.8Zm1.7-2v-.3c0-.2 0-.4.2-.6 0-.2.2-.3.4-.4l.6-.2c.3 0 .5 0 .6.2l.4.4.2.6v.3c0 .2 0 .4-.2.6 0 .2-.2.3-.4.4l-.6.2c-.2 0-.4 0-.6-.2a1 1 0 0 1-.4-.4l-.2-.6Zm.6-.3V6l.3.3.3.1h.4L16 6V5.1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4l-.1.3ZM17 9v-.3c0-.2 0-.4.2-.6 0-.2.2-.3.4-.4l.6-.2c.2 0 .4 0 .6.2l.4.4.1.6V9l-.1.6c0 .2-.2.3-.4.4l-.6.2c-.3 0-.5 0-.6-.2-.2 0-.3-.2-.4-.4l-.2-.6Zm.6-.3v.7l.2.2.4.1h.3l.2-.3.1-.4v-.6a.6.6 0 0 0-.6-.4.6.6 0 0 0-.6.4v.3Zm.8-3.5-2.8 4.5-.4-.3L18 5l.4.2ZM6 36c0 .4 0 .7-.2 1l-.6.5-1 .2c-.3 0-.6 0-.9-.2-.2-.1-.5-.3-.6-.6-.2-.2-.3-.5-.3-.8a1.5 1.5 0 0 1 1.1-1.5l.7-.1c.4 0 .7 0 1 .2.2.1.5.3.6.6.2.2.3.5.3.8Zm-.7 0-.1-.5a1 1 0 0 0-.4-.4l-.6-.1-.5.1a1 1 0 0 0-.4.4l-.1.5v.6l.5.4h1.1l.4-.4.1-.6Zm.6-2.6c0 .3 0 .5-.2.7-.1.3-.3.4-.6.6l-.8.2a2 2 0 0 1-1-.2c-.2-.2-.4-.3-.5-.6-.2-.2-.2-.4-.2-.7 0-.3 0-.6.2-.9.1-.2.3-.4.6-.5l.8-.2 1 .2.5.5c.2.3.2.6.2.9Zm-.7 0-.1-.5c-.1-.1-.2-.3-.4-.3a1 1 0 0 0-.5-.2 1 1 0 0 0-.5.1l-.3.4-.1.5.1.5c0 .2.2.3.4.4h.9l.4-.4.1-.5Zm5.5.9v.9l-.1 1.1-.4.8c-.2.2-.3.4-.6.4a2 2 0 0 1-.7.2l-.6-.1c-.2 0-.4-.1-.5-.3-.2 0-.3-.2-.4-.4l-.2-.8-.1-1v-.8l.1-1.2.4-.7c.1-.2.3-.4.5-.4l.8-.2.6.1a1.4 1.4 0 0 1 .9.7l.2.7v1Zm-.7 1v-1.8l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.5 0l-.3.3-.2.6V36l.1.5.2.3.3.2h.9l.3-.3.2-.6v-.8Zm1.7-2V33l.1-.6.4-.4.7-.2c.2 0 .4 0 .6.2l.4.4.1.6v.3l-.1.6-.4.4-.6.2c-.3 0-.5 0-.7-.2a1 1 0 0 1-.4-.4l-.1-.6Zm.5-.3v.3l.1.3c0 .2.1.2.2.3l.4.1h.3l.2-.4V32.7a.6.6 0 0 0-.5-.4.6.6 0 0 0-.6.4v.3Zm2.3 3.5v-.3l.1-.6.4-.4.6-.2c.3 0 .5 0 .7.2l.4.4.1.6v.3l-.1.6-.4.4-.7.2c-.2 0-.4 0-.6-.2-.2 0-.3-.2-.4-.4l-.1-.6Zm.5-.3v.7l.3.2.3.1h.4c0-.2.2-.2.2-.3v-1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4v.3Zm.8-3.5L13 37.2l-.4-.3 2.8-4.4.4.2ZM5.2 59.5h.1v.6c-.4 0-.8 0-1 .2-.3.1-.5.3-.6.5a2 2 0 0 0-.4.7v2.3l.3.5.3.3h.9l.3-.3.2-.4a1.8 1.8 0 0 0 0-1c0-.2 0-.3-.2-.4a1 1 0 0 0-.7-.4l-.6.1-.4.4a1 1 0 0 0-.2.5h-.4l.2-.7.4-.5c.1-.2.3-.3.5-.3a1.9 1.9 0 0 1 1.3 0l.5.5c.2.1.3.3.3.6A2.4 2.4 0 0 1 6 64l-.3.6-.6.4-.8.2c-.3 0-.5 0-.8-.2l-.5-.5-.4-.7v-2.3l.5-1c.2-.4.4-.6.8-.8a3 3 0 0 1 1.3-.3Zm5.5 2.4v.9l-.1 1.2-.4.7c-.2.2-.3.4-.6.4a2 2 0 0 1-.7.2l-.6-.1c-.2 0-.4-.1-.5-.3-.2 0-.3-.2-.4-.4l-.2-.8-.1-1V62l.1-1.2.4-.7c.1-.2.3-.4.5-.4l.8-.2.6.1a1.4 1.4 0 0 1 .9.7l.2.7v1Zm-.7 1V61l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.5 0l-.3.3-.2.6v2.6l.1.5.2.3.3.2h.9l.3-.3.2-.6V63Zm1.7-2v-.3l.1-.6.4-.4.7-.2c.2 0 .4 0 .6.2l.4.4.1.6v.3l-.1.6-.4.4-.6.2c-.3 0-.5 0-.7-.2a1 1 0 0 1-.4-.4l-.1-.6Zm.5-.3v.3l.1.3c0 .2.1.2.2.3l.4.1h.3l.2-.4V60.3a.6.6 0 0 0-.5-.4l-.4.1-.2.3v.3Zm2.3 3.5v-.3l.1-.6.4-.4.6-.2c.3 0 .5 0 .7.2l.4.4.1.6v.3l-.1.6-.4.4-.7.2c-.2 0-.4 0-.6-.2-.2 0-.3-.2-.4-.4l-.1-.6Zm.5-.3v.7l.3.2.3.1h.4c0-.2.2-.2.2-.3v-1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4v.3Zm.8-3.5L13 64.8l-.4-.3 2.8-4.4.4.2ZM6.3 90.9v.6h-4V91l2.5-4h.5l-.6 1.2L3 90.9h3.3ZM5.5 87v5.7h-.7v-5.7h.7Zm5.2 2.4v.9l-.1 1.1-.4.8c-.2.2-.3.4-.6.4a2 2 0 0 1-.7.2l-.6-.1c-.2 0-.4-.1-.5-.3-.2 0-.3-.2-.4-.4l-.2-.8-.1-1v-.8l.1-1.2.4-.7c.1-.2.3-.4.5-.4L9 87l.6.1a1.4 1.4 0 0 1 .9.7l.2.7v1Zm-.7 1v-1.8l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.5 0l-.3.3-.2.6v2.6l.1.5.2.3.3.2h.9l.3-.3.2-.6v-.8Zm1.7-2v-.3l.1-.6.4-.4.7-.2c.2 0 .4 0 .6.2l.4.4.1.6v.3l-.1.6-.4.4-.6.2c-.3 0-.5 0-.7-.2a1 1 0 0 1-.4-.4l-.1-.6Zm.5-.3v.3l.1.3c0 .2.1.2.2.3l.4.1h.3l.2-.4V88a.6.6 0 0 0-.5-.4l-.4.1-.2.3v.3Zm2.3 3.5v-.3l.1-.6.4-.4.6-.2c.3 0 .5 0 .7.2l.4.4.1.6v.3l-.1.6-.4.4-.7.2c-.2 0-.4 0-.6-.2-.2 0-.3-.2-.4-.4l-.1-.6Zm.5-.3v.7l.3.2.3.1h.4c0-.2.2-.2.2-.3v-1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4v.3Zm.8-3.5L13 92.4l-.4-.3 2.8-4.4.4.2ZM6.2 119.8v.6H2.5v-.5l1.8-2 .6-.7.2-.5.1-.5-.1-.5-.3-.3a1 1 0 0 0-.6-.2c-.2 0-.4 0-.6.2a1 1 0 0 0-.4.4l-.1.6h-.7c0-.3 0-.6.2-.9.1-.3.3-.5.6-.6a2 2 0 0 1 1-.3l1 .2c.2.2.4.3.5.6.2.2.2.4.2.8v.5l-.3.5a7.8 7.8 0 0 1-.8 1l-1.5 1.6h2.9Zm4.5-2.7v.9l-.1 1.2-.4.7c-.2.2-.3.4-.6.4a2 2 0 0 1-.7.2l-.6-.1c-.2 0-.4-.1-.5-.3-.2 0-.3-.2-.4-.4l-.2-.8-.1-1v-.8l.1-1.2.4-.7c.1-.2.3-.4.5-.4l.8-.2.6.1a1.4 1.4 0 0 1 .9.7l.2.7v1Zm-.7 1v-1.8l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.5 0l-.3.3-.2.6v2.6l.1.5.2.3.3.2h.9l.3-.3.2-.6v-.8Zm1.7-2v-.3l.1-.6.4-.4.7-.2c.2 0 .4 0 .6.2l.4.4.1.6v.3l-.1.6-.4.4-.6.2c-.3 0-.5 0-.7-.2a1 1 0 0 1-.4-.4l-.1-.6Zm.5-.3v.3l.1.3c0 .2.1.2.2.3l.4.1h.3l.2-.4V115.5a.6.6 0 0 0-.5-.4.6.6 0 0 0-.6.4v.3Zm2.3 3.5v-.3l.1-.6.4-.4.6-.2c.3 0 .5 0 .7.2l.4.4.1.6v.3l-.1.6-.4.4-.7.2c-.2 0-.4 0-.6-.2-.2 0-.3-.2-.4-.4l-.1-.6Zm.5-.3v.7l.3.2.3.1h.4c0-.2.2-.2.2-.3v-1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4v.3Zm.8-3.5L13 120l-.4-.3 2.8-4.4.4.2ZM8.5 144.7v2.1l-.4.7c-.2.2-.4.4-.6.4a2 2 0 0 1-.8.2l-.6-.1-.5-.3-.3-.4-.3-.8v-3l.4-.7c.2-.2.4-.4.6-.4l.7-.2.7.1a1.4 1.4 0 0 1 .8.7l.3.7v1Zm-.7 1v-1.8l-.2-.5a1 1 0 0 0-.2-.3l-.3-.2a1 1 0 0 0-.4 0 1 1 0 0 0-.4 0l-.4.3-.2.6v2.6l.2.5c0 .1 0 .2.2.3l.3.2h.8l.3-.3.3-.6v-.8Zm1.8-2v-.3l.1-.6c0-.2.2-.3.4-.4l.6-.2c.3 0 .5 0 .6.2.2.1.4.2.4.4l.2.6v.3c0 .2 0 .4-.2.6 0 .2-.2.3-.4.4l-.6.2c-.2 0-.4 0-.6-.2a1 1 0 0 1-.4-.4l-.1-.6Zm.5-.3v.6l.3.3.3.1h.4l.2-.4V143.1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.5.4l-.1.3Zm2.2 3.5v-.3c0-.2 0-.4.2-.6 0-.2.2-.3.4-.4l.6-.2c.2 0 .4 0 .6.2l.4.4.2.6v.3c0 .2 0 .4-.2.6 0 .2-.2.3-.4.4l-.6.2c-.2 0-.5 0-.6-.2-.2 0-.3-.2-.4-.4l-.2-.6Zm.6-.3v.7l.2.2.4.1h.3l.3-.3v-1a.6.6 0 0 0-.6-.4.6.6 0 0 0-.6.4v.3Zm.8-3.5-2.8 4.5-.4-.3 2.8-4.4.4.2Z"/><path stroke="#000" stroke-linecap="square" stroke-opacity=".1" stroke-width=".4" d="M24.2 6.8h175.6M24.2 34.6h175.6M24.2 62.4h175.6M24.2 90.2h175.6M24.2 118h175.6"/><path stroke="#000" stroke-linecap="square" stroke-opacity=".5" stroke-width=".4" d="M24.2 145.8h175.6"/><path fill="#7D8EFF" d="M30 25.5h18v120H30z"/><path fill="#000" fill-opacity=".9" d="M40.4 135.4c.4 0 .7 0 1 .2l.5.7.2 1c0 .3 0 .6-.2.9-.1.3-.3.5-.6.7l-.9.2a1.5 1.5 0 0 1-1-.5l-.4-.6-.1-.8c0-.3 0-.7.2-1l.5-.6c.3-.2.5-.2.8-.2Zm0 .9a1 1 0 0 0-.5.1l-.3.3-.1.5v.5c.1.2.3.3.4.3l.5.2c.2 0 .4 0 .5-.2l.3-.3.1-.5v-.5l-.4-.3a1 1 0 0 0-.5-.1Zm-2.6-.8c.3 0 .5 0 .8.2l.5.6.2 1c0 .3 0 .6-.2.8l-.5.7-.8.2c-.3 0-.6-.1-.8-.3-.3-.1-.5-.3-.6-.6l-.2-.9.2-.9.6-.6.8-.2Zm0 1a1 1 0 0 0-.4 0 .7.7 0 0 0-.4.7v.5l.4.2.4.1h.5l.3-.3.1-.5-.1-.4-.3-.3a1 1 0 0 0-.5 0Zm1.6-3-.2.7-2.9-.3v-3h.8v2.2l1.4.2a1.8 1.8 0 0 1-.2-1l.1-.7c0-.2.2-.4.4-.5.1-.2.3-.3.6-.3a2.5 2.5 0 0 1 1.5 0l.6.3.4.6.2.8-.1.7-.3.6a1.6 1.6 0 0 1-1.2.6v-1l.4-.1c.2 0 .3-.2.3-.3l.1-.5v-.4l-.3-.3a1 1 0 0 0-.4-.2 1.8 1.8 0 0 0-.9 0 1 1 0 0 0-.4.2l-.2.4v.9l.3.3Z"/><path fill="#000" fill-opacity=".5" d="M38.8 123.8h.6v3h-.6v-3Zm-2.5 3H42v.7h-5.7v-.7Zm0-3.6H42v.7h-5.7v-.7Zm4.7-4h-3.2v-.7H42v.7h-1Zm-.9 0v-.4l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H37.8v-.7H41l.3-.2.1-.3v-.2l-.1-.8a1 1 0 0 0-.5-.4h-.7Zm-1.5-2.6H42v.7h-4.2v-.6h.8Zm1.1.2v.3l-.8-.1a2 2 0 0 1-.6-.3l-.5-.6-.1-.7v-.6a1.1 1.1 0 0 1 .8-.7H42v.6h-2.8a1 1 0 0 0-.5.1l-.3.4-.1.4.1.6.3.3.5.2h.5Zm-.4-2.8.2.5-.7-.1-.6-.3-.4-.6-.1-.7v-.6l.4-.4.4-.3H42v.6h-2.8l-.5.1c-.2.1-.3.2-.3.4a1.3 1.3 0 0 0 0 .9l.2.3.3.2h.4Zm-1.5-4.6H42v.8h-4.2v-.8Zm-1.1.8h-.3l-.2-.4c0-.1 0-.2.2-.3l.3-.1h.2l.2.4c0 .1 0 .2-.2.3l-.2.1Zm4.5-4.7H36v-.7h6v.7h-.8Zm-1.3 2.9a3 3 0 0 1-1-.1l-.6-.4-.4-.5c-.2-.2-.2-.5-.2-.7l.1-.7.4-.5c.2-.1.4-.3.7-.3l.8-.2h.4c.3 0 .6 0 .8.2.3 0 .5.2.6.3l.4.5a1.7 1.7 0 0 1 0 1.4c0 .2-.2.4-.4.5l-.7.4a3 3 0 0 1-.9 0Zm0-.8h.6l.5-.2c.2-.1.3-.2.3-.4l.2-.5c0-.2 0-.4-.2-.6l-.4-.3-.5-.3h-1l-.4.2-.3.2a1 1 0 0 0-.3.3l-.1.5.1.5.4.4.5.2h.6Zm-2.1-4.8H42v.7h-4.2v-.7Zm-1.1.8-.3-.1-.2-.3c0-.2 0-.3.2-.4h.5l.2.4s0 .2-.2.3h-.2Zm1-3.8h.6v2.3h-.5v-2.3Zm-1 1.5v-.7H41l.3-.1.1-.2v-.2a1.2 1.2 0 0 0 0-.3h.6v1l-.4.4h-4.9Zm4.9-3.6-3.8-1.2v-.8l4.9 1.7a2.7 2.7 0 0 1 .6.4 1.2 1.2 0 0 1 .4.9v.4H43a1.7 1.7 0 0 0 0-.7l-.3-.2-.4-.2-.8-.3Zm-3.8.8 3.3-1 .7-.3.3.6-4.3 1.5v-.8Z"/><path fill="#F96FFF" d="M48 48.5h18v97H48z"/><path fill="#000" fill-opacity=".9" d="M54.3 135.3h.5l5.2 2.3v1l-5-2.3v3h-.7v-4Zm2.4-4.6h1c.4 0 .7 0 1 .2.4 0 .6.2.8.3.2.2.4.4.4.6l.2.8-.1.6a1.5 1.5 0 0 1-.8 1l-.6.2h-3a2 2 0 0 1-.8-.5l-.4-.5-.2-.8.1-.6a1.5 1.5 0 0 1 .8-1l.6-.2h1Zm1 1h-1.2a4 4 0 0 0-.6 0l-.4.1-.3.2-.2.3v.7l.3.3.5.2h2.5l.5-.1.3-.2.2-.3v-.7l-.3-.3-.5-.2a4 4 0 0 0-.8 0Z"/><path fill="#000" fill-opacity=".5" d="M58.6 124.5a1 1 0 0 0-.4 0l-.3.3-.2.4-.2.6-.3.8-.4.6-.4.4h-.6a1.4 1.4 0 0 1-1.1-.4c-.2-.2-.3-.4-.3-.7l-.2-.7c0-.5.1-.8.3-1.1.1-.3.4-.6.6-.7.3-.2.6-.2.9-.2v.7l-.6.1a1 1 0 0 0-.4.5l-.1.7v.6l.4.4.5.1h.3l.3-.3.2-.4.2-.6.3-.8c.1-.3.2-.5.4-.6.1-.2.3-.3.5-.3l.6-.2c.2 0 .4 0 .6.2.2 0 .3.2.5.4l.3.6a3 3 0 0 1 0 1.6l-.4.7-.5.5-.7.2v-.8h.5c0-.2.2-.3.3-.4l.2-.5a2.2 2.2 0 0 0 0-1.1l-.4-.5a.8.8 0 0 0-.4-.1Zm-.7-1.5-.9-.1a2 2 0 0 1-.7-.4l-.4-.6-.2-.8c0-.3 0-.6.2-.8 0-.2.2-.4.4-.6l.7-.4.8-.1h.1l.9.1.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.1Zm0-.7h.6l.5-.3.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2-.6-.1h-.6l-.5.3a1 1 0 0 0-.5.9l.1.5.4.4.5.2.5.1Zm-2.1-4.9H60v.8h-4.2v-.8Zm-1.1.8h-.3l-.2-.4c0-.2 0-.3.2-.3l.3-.1h.2l.2.4c0 .1 0 .2-.2.3l-.2.1Zm-.7-2.8h6v.8h-6v-.8Zm2.6-4H60v.8h-4.2v-.7h.8Zm1.1.2v.3H57a2 2 0 0 1-.6-.4l-.5-.5-.1-.8v-.5a1.1 1.1 0 0 1 .8-.7l.7-.1H60v.7h-2.8a1 1 0 0 0-.5.1l-.3.3-.1.5.1.5c0 .2.2.3.3.4l.5.2h.5Zm-.4-2.7.2.5c-.3 0-.5 0-.7-.2l-.6-.3-.4-.5-.1-.7v-.6l.4-.5.4-.3H60v.7h-2.8l-.5.1c-.2 0-.3.2-.3.3a1.3 1.3 0 0 0 0 1l.2.2.3.2h.4Zm.6-3.6-.9-.1a2 2 0 0 1-.7-.4l-.4-.6-.2-.8c0-.3 0-.6.2-.8 0-.3.2-.5.4-.6l.7-.4.8-.1h1l.7.5a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .5-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.1Zm0-.7.6-.1.5-.2.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2-.6-.1h-.6l-.5.3a1 1 0 0 0-.5.9l.1.5.4.4.5.2h.5Zm-2.1-4.9H60v.7h-4.2v-.7Zm-1.1.8-.3-.1-.2-.3c0-.2 0-.3.2-.4h.5l.2.4c0 .1 0 .2-.2.3h-.2Zm4.2-4.5-.3.1-.3.3-.2.6-.1.6-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0L56 98c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-1l.5-.5.6-.1v.7h-.3l-.3.4-.1.5v.4l.3.3a.6.6 0 0 0 .5 0h.2l.1-.4.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .5l.2.5v.6l-.1 1-.5.6-.7.2v-.8l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Zm-3.1-3.5h.5v2.3h-.5v-2.3Zm-1 1.5v-.7h4.5l.1-.2v-.2a1.2 1.2 0 0 0 0-.4h.6v1.1l-.4.3-.7.1h-4.2Zm4.2-5h-3.2v-.7H60v.7h-1Zm-.9 0v-.4l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H55.8V91H59l.3-.2.1-.3v-.3l-.1-.7a1 1 0 0 0-.5-.4h-.7Zm-1.7-2.6H60v.8h-4.2v-.7h.6Zm-.6-1.3h.6v.8l.3.3.3.3h.4l.2.3-.8-.1a2 2 0 0 1-.5-.3c-.2 0-.4-.2-.5-.4a1.1 1.1 0 0 1 0-.9Zm4.3-2.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2H58c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.4-2c0-.3.2-.5.4-.6l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.3h1.4l.5-.3.3-.4V82l-.5-.4.4-.5.4.4.3.5v.7Z"/><path fill="#FFA389" d="M66 34.5h18v111H66z"/><path fill="#000" fill-opacity=".9" d="M76.4 135.4c.4 0 .7 0 1 .2l.5.7.2 1c0 .3 0 .6-.2.9-.1.3-.3.5-.6.7l-.9.2a1.5 1.5 0 0 1-1-.5l-.4-.6-.1-.8c0-.3 0-.7.2-1l.5-.6c.3-.2.5-.2.8-.2Zm0 .9a1 1 0 0 0-.5.1l-.3.3-.1.5v.5c.1.2.3.3.4.3l.5.2c.2 0 .4 0 .5-.2l.3-.3.1-.5v-.5l-.4-.3a1 1 0 0 0-.5-.1Zm-2.6-.8c.3 0 .5 0 .8.2l.5.6.2 1c0 .3 0 .6-.2.8l-.5.7-.8.2c-.3 0-.6-.1-.8-.3-.3-.1-.5-.3-.6-.6l-.2-.9.2-.9.6-.6.8-.2Zm0 1a1 1 0 0 0-.4 0 .7.7 0 0 0-.4.7v.5l.4.2.4.1h.5l.3-.3.1-.5-.1-.4-.3-.3a1 1 0 0 0-.5 0Zm.9-5.8h1c.4 0 .7 0 1 .2.4 0 .6.2.8.3.2.2.4.4.4.6l.2.8-.1.6a1.5 1.5 0 0 1-.8 1l-.6.2h-3a2 2 0 0 1-.8-.5l-.4-.5-.2-.8.1-.6a1.5 1.5 0 0 1 .8-1l.6-.2h1Zm1 1h-1.2a4 4 0 0 0-.6 0l-.4.1-.3.2-.2.3v.7l.3.3.5.2h2.5l.5-.1.3-.2.2-.3v-.7l-.3-.3-.5-.2a4 4 0 0 0-.8 0Z"/><path fill="#000" fill-opacity=".5" d="M77.4 124h.6v3h-.6v-3Zm-5 2.8H78v.7h-5.7v-.7Zm5.7-5.3c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2H76c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.4-2c0-.3.2-.5.4-.6l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.2.7.1h.7l.5-.3a1.2 1.2 0 0 0 .4-1c0-.2 0-.4-.2-.6l-.4-.4.4-.5.4.4.3.5v.7Zm-.8-5h-2.6c-.2.1-.3.2-.3.4l-.1.5v.5l.3.3h.3v.8a1 1 0 0 1-.4-.1c-.2 0-.3-.2-.4-.3l-.3-.6a2 2 0 0 1-.1-.7c0-.3 0-.5.2-.8 0-.2.2-.4.4-.5.2-.2.5-.2.8-.2h2.4l.4-.2h.1v.8h-.7Zm-1.9-.1h.5v.7l.1.5.1.4.3.3h.7l.3-.3v-.4a1.2 1.2 0 0 0-.4-1 .7.7 0 0 0-.4-.2l.3-.3.4.2a1.7 1.7 0 0 1 .8 1.4c0 .3 0 .5-.2.7l-.4.5-.7.2-.6-.1-.4-.4-.3-.6v-1.6Zm2.6-3v.8h-4.7c-.3 0-.5 0-.7-.2-.3 0-.4-.2-.5-.4l-.2-.8a2 2 0 0 1 0-.5h.7v.9l.3.2H78Zm-4.2-.8h.5v2.3h-.5v-2.3Zm3.5-4-3.5-1v-.5h.7l3.5 1.2v.4h-.8Zm-3.5.8 3.5-1h.7v.4l-4.2 1.3v-.7Zm3.5-3.4-3.5-.9v-.7l4.2 1.2v.5h-.7Zm-3.5 1 3.4-1.1.8-.1v.4l-3.5 1.2h-.7v-.4Zm4.3-5.1c0 .3 0 .5-.2.8a1.8 1.8 0 0 1-1 1l-.9.1H76l-1-.1a2 2 0 0 1-.6-.5 1.8 1.8 0 0 1-.4-2c0-.2.2-.4.4-.6l.6-.3h1.2v3h-.6V101l-.6.2a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.2h1.4l.5-.2.3-.4v-1.2l-.5-.5.4-.4.4.3c0 .2.2.3.3.5v.8Zm-4.3-4.3h.5v2.2h-.5v-2.2Zm-1 1.5v-.8h4.5l.1-.2V98a1.2 1.2 0 0 0 0-.4h.6v1.1c-.1.1-.2.3-.4.3l-.7.2h-4.2Zm1.9-3.2H78v.8h-4.2V96h.9Zm1 .2v.3l-.8-.1a2 2 0 0 1-.6-.4 1.6 1.6 0 0 1-.6-1.2V94l.3-.4.5-.3H78v.7h-3.3l-.3.3-.1.5a1 1 0 0 0 .4.9 1.6 1.6 0 0 0 1 .3Zm2.4-5.7c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2H76c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.4-2c0-.3.2-.5.4-.6l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.3h1.4l.5-.3.3-.4v-1.2l-.5-.4.4-.5.4.4.3.5v.7Zm-1.2-5h-.3l-.3.4-.2.6-.1.6-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0l-.4-.4c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-1 0-.2.3-.3.5-.5l.6-.2v.8h-.3l-.3.4-.1.5v.4l.3.3a.6.6 0 0 0 .5 0l.2-.1.1-.3.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .4l.2.6v.6l-.1 1-.5.6-.7.2v-.8l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Zm0-4.2-.3.1-.3.3-.2.6-.1.6-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0l-.4-.4c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-.9 0-.2.3-.4.5-.6l.6-.1v.7h-.3l-.3.4-.1.5v.5l.3.2a.6.6 0 0 0 .5 0h.2l.1-.4.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .5l.2.5v.6l-.1 1-.5.6-.7.2V83l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Z"/><path fill="#FFED53" d="M84 56.5h18v89H84z"/><path fill="#000" fill-opacity=".9" d="M90.3 136.2h.7l.2.8a1.6 1.6 0 0 0 1 1l.8.1h1.5l.5-.3.2-.3.1-.4v-.3l-.3-.3-.4-.2a1.7 1.7 0 0 0-.9 0c-.1 0-.3 0-.4.2l-.2.2-.1.4.1.6.4.3.4.2-.1.3a2 2 0 0 1-.7-.1l-.5-.4-.3-.5V136.2l.5-.5.6-.3a2.5 2.5 0 0 1 1.5 0c.2 0 .4.2.6.4.2.1.3.3.4.6l.2.7c0 .3 0 .6-.2.8-.1.3-.3.5-.5.6l-.7.4-.8.2h-.4l-1.3-.2a3 3 0 0 1-1-.5c-.3-.2-.5-.5-.7-.9a3 3 0 0 1-.2-1.3Zm5-5.6h.7v3.8h-.6l-2-1.8-.7-.5a2 2 0 0 0-.4-.2 1.2 1.2 0 0 0-.9 0l-.3.3-.1.4.1.6.4.3.5.1v1l-.9-.3-.6-.6a2 2 0 0 1-.3-1l.2-1c.2-.3.3-.5.6-.6.2-.2.5-.3.8-.3l.5.1.6.3.5.3.5.5 1.3 1.2v-2.6Z"/><path fill="#000" fill-opacity=".5" d="M94.2 124v-.7c.4 0 .7.2 1 .4.2.1.5.4.6.7.2.3.3.6.3 1.1 0 .3 0 .6-.2 1a2 2 0 0 1-.5.6c-.3.2-.5.4-.9.5l-1 .1h-.6l-1.1-.1-.8-.5a2 2 0 0 1-.6-.7l-.2-1c0-.4.1-.8.3-1 .1-.4.4-.6.6-.7l1-.4v.8l-.6.2a1 1 0 0 0-.5.4l-.1.7.1.7c0 .2.2.4.4.5l.6.3h2.2c.3 0 .5-.2.7-.3l.4-.4.2-.7c0-.3 0-.6-.2-.8a1 1 0 0 0-.4-.4l-.7-.2Zm-4.2-2.4h6v.7h-6v-.7Zm4-1h-.2c-.3 0-.5 0-.8-.2a2 2 0 0 1-.7-.4c-.2-.1-.3-.3-.4-.6-.2-.2-.2-.5-.2-.8 0-.3 0-.5.2-.8 0-.2.2-.4.4-.6l.7-.4h1.8l.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.2Zm-.2-.8h.7c.2 0 .4-.2.5-.3.2 0 .3-.2.4-.3V118a1 1 0 0 0-.4-.4l-.5-.2h-1.2l-.5.2a1 1 0 0 0-.5.9l.1.6.4.3.5.3h.5Zm1.2-6.6h-3.2v-.8H96v.7h-1Zm-.9-.2v-.3l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H91.8v-.7H95l.3-.2.1-.2v-.3l-.1-.8a1 1 0 0 0-.5-.3l-.7-.2Zm1-4.4H90v-.7h6v.7h-.8Zm-1.2 2.9a3 3 0 0 1-1-.2l-.6-.3-.4-.5c-.2-.2-.2-.5-.2-.7l.1-.7.4-.5c.2-.1.4-.3.7-.3l.8-.2h.4c.3 0 .6 0 .8.2.3 0 .5.2.6.3l.4.5a1.7 1.7 0 0 1 0 1.4c0 .2-.2.4-.4.5-.2.2-.5.3-.7.3a3 3 0 0 1-.9.2Zm0-.8h.6l.5-.2c.2-.1.3-.2.3-.4l.2-.5c0-.2 0-.4-.2-.6l-.4-.3-.5-.3h-1a2 2 0 0 0-.4.2l-.3.2a1 1 0 0 0-.3.3l-.1.5.1.5.4.4.5.2h.6Zm1.6-7.7-.1-.5a1 1 0 0 0-.3-.3.8.8 0 0 0-.4-.2v-.7l.7.3a1.7 1.7 0 0 1 .7 1.4c0 .3 0 .6-.2.8-.1.3-.3.4-.5.6a2 2 0 0 1-.6.4H93a2 2 0 0 1-.7-.4l-.4-.6a2 2 0 0 1-.2-.8c0-.3 0-.6.2-.9l.5-.6.8-.2v.7a1 1 0 0 0-.4.1 1 1 0 0 0-.5.8l.1.6.4.4.5.2h1.2l.5-.2.4-.4v-.5Zm-1.6-2.4-.9-.1a2 2 0 0 1-.7-.4l-.4-.6c-.2-.2-.2-.5-.2-.8 0-.3 0-.6.2-.8 0-.2.2-.4.4-.6l.7-.4.8-.1h.1l.9.1.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.1Zm0-.7h.6l.5-.3c.2 0 .3-.2.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2h-1.2l-.5.2a1 1 0 0 0-.5.9l.1.5.4.4.5.2.5.1Zm1.4-5.3-3.5-1.2v-.7l4.2 1.5v.5l-.7-.1Zm-3.5 1 3.6-1.2.6-.1v.5l-4.2 1.5v-.7Zm4.3-5.3c0 .2 0 .5-.2.8a1.8 1.8 0 0 1-1 1l-.9.1H94c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.4-2c0-.3.2-.4.4-.6l.6-.3h1.2v3h-.6v-2.4l-.6.1a1 1 0 0 0-.4.4 1 1 0 0 0-.2.5 1 1 0 0 0 .4.9l.5.2h1.4c.2 0 .3-.2.5-.3l.3-.4v-1.1l-.5-.5.4-.4.4.3c0 .2.2.3.3.5v.8ZM92.4 87H96v.7h-4.2V87h.6Zm-.7-1.3h.7v.8l.3.3.3.2.4.1.2.2h-.8a2 2 0 0 1-.5-.3l-.5-.4a1.1 1.1 0 0 1 0-1Z"/><path fill="#7D8EFF" d="M123 36.5h18v109h-18z"/><path fill="#000" fill-opacity=".9" d="M129.3 135.3h.5l5.2 2.3v1l-5-2.3v3h-.7v-4Zm5-1.6v-.1c0-.4 0-.7-.2-.9a1.4 1.4 0 0 0-1-.9h-2.3l-.5.2-.2.3-.1.4v.3l.3.3.4.2a1.8 1.8 0 0 0 1 0c.1 0 .2 0 .3-.2l.3-.2.1-.4a1 1 0 0 0-.3-.8 1.1 1.1 0 0 0-.7-.3l.1-.3h.6a1.8 1.8 0 0 1 .9 1l.1.6-.1.7-.4.5-.7.3a2.5 2.5 0 0 1-1.4 0 2 2 0 0 1-.7-.4c-.2-.1-.3-.3-.4-.6l-.2-.7c0-.4 0-.6.2-.9l.5-.5.7-.4 1-.1h1.3l.8.4.7.5.5.8.1 1v.2h-.7Z"/><path fill="#000" fill-opacity=".5" d="M131.8 123.8h.6v3h-.6v-3Zm-2.5 3h5.7v.7h-5.7v-.7Zm0-3.6h5.7v.7h-5.7v-.7Zm4.7-4h-3.2v-.7h4.2v.7h-1Zm-.9 0v-.4l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H130.8v-.7h3.2l.3-.2.1-.3v-.2l-.1-.8a1 1 0 0 0-.5-.4h-.7Zm-1.5-2.6h3.4v.7h-4.2v-.6h.8Zm1.1.2v.3l-.8-.1-.6-.3-.5-.6-.1-.7v-.6a1.1 1.1 0 0 1 .8-.7h3.5v.6h-2.8a1 1 0 0 0-.5.1l-.3.4v1l.3.3.5.2h.5Zm-.4-2.8.2.5-.7-.1-.6-.3-.4-.6-.1-.7v-.6l.4-.4.4-.3h3.5v.6h-2.8l-.5.1c-.2.1-.3.2-.3.4a1.2 1.2 0 0 0 0 .9l.2.3a1 1 0 0 0 .7.2Zm-1.5-4.6h4.2v.8h-4.2v-.8Zm-1.1.8h-.3l-.2-.4c0-.1 0-.2.2-.3l.3-.1h.2l.2.4c0 .1 0 .2-.2.3l-.2.1Zm4.5-4.7H129v-.7h6v.7h-.8Zm-1.3 2.9a3 3 0 0 1-1-.1l-.6-.4a1.5 1.5 0 0 1-.6-1.2l.1-.7.4-.5c.2-.1.4-.3.7-.3l.8-.2h.4c.3 0 .6 0 .8.2.3 0 .5.2.6.3l.4.5a1.7 1.7 0 0 1 0 1.4c0 .2-.2.4-.4.5l-.7.4a3 3 0 0 1-.9 0Zm0-.8h.6l.5-.2c.2-.1.3-.2.3-.4l.2-.5a1 1 0 0 0-.6-1l-.5-.2h-1l-.4.2-.3.2a1 1 0 0 0-.3.3v1l.4.4.5.2h.6Zm-2.1-4.8h4.2v.7h-4.2v-.7Zm-1.1.8-.3-.1-.2-.3c0-.2 0-.3.2-.4h.5l.2.4s0 .2-.2.3h-.2Zm1-3.8h.6v2.3h-.5v-2.3Zm-1 1.5v-.7h4.3l.3-.1.1-.2v-.5h.6a1.8 1.8 0 0 1 0 .5v.5l-.4.4h-4.9Zm4.9-3.6-3.8-1.2v-.8l4.9 1.7a2.7 2.7 0 0 1 .6.4l.3.4a1 1 0 0 1 0 .7v.2h-.5a1.9 1.9 0 0 0 0-.7l-.3-.2-.4-.2-.8-.3Zm-3.8.8 3.3-1 .7-.3.3.6-4.3 1.5v-.8Z"/><path fill="#F96FFF" d="M141 77.5h18v68h-18z"/><path fill="#000" fill-opacity=".9" d="m150.4 138-.2.8-2.9-.3v-3h.8v2.2l1.4.2a1.8 1.8 0 0 1-.2-.9l.1-.7c0-.2.2-.4.4-.6l.6-.3a2.5 2.5 0 0 1 1.5 0l.6.3.4.6.2.8-.1.7-.3.6-.5.4-.7.2v-1h.4l.3-.4.1-.5v-.4l-.3-.2a1 1 0 0 0-.4-.2 1.8 1.8 0 0 0-1 0 1 1 0 0 0-.3.2l-.2.3v1l.3.3Zm-.7-7.3h1c.4 0 .7 0 1 .2.4 0 .6.2.8.3l.4.6.2.8-.1.6a1.5 1.5 0 0 1-.8 1l-.6.2h-3a2 2 0 0 1-.8-.5l-.4-.5-.2-.8.1-.6a1.5 1.5 0 0 1 .8-1l.6-.2h1Zm1 1h-1.2a4 4 0 0 0-.6 0l-.4.1-.3.2-.2.3v.7l.3.3.5.2h2.5l.5-.1.3-.2.2-.3v-.7l-.3-.3-.5-.2a4 4 0 0 0-.8 0Z"/><path fill="#000" fill-opacity=".5" d="M151.6 124.5a1 1 0 0 0-.4 0l-.3.3-.2.4-.2.6-.3.8-.4.6-.4.4h-.6a1.4 1.4 0 0 1-1.1-.4c-.2-.2-.3-.4-.3-.7l-.2-.7c0-.5.1-.8.3-1.1.1-.3.4-.6.6-.7.3-.2.6-.2.9-.2v.7l-.6.1a1 1 0 0 0-.4.5l-.1.7v.6l.4.4.5.1h.3l.3-.3.2-.4.2-.6.3-.8c.1-.3.2-.5.4-.6.1-.2.3-.3.5-.3l.6-.2c.2 0 .4 0 .6.2.2 0 .3.2.5.4l.3.6a3 3 0 0 1 0 1.6l-.4.7-.5.5-.7.2v-.8h.5c0-.2.2-.3.3-.4l.2-.5a2.2 2.2 0 0 0 0-1.1l-.4-.5a.8.8 0 0 0-.4-.1Zm-.7-1.5-.9-.1a2 2 0 0 1-.7-.4l-.4-.6c-.2-.2-.2-.5-.2-.8 0-.3 0-.6.2-.8 0-.2.2-.4.4-.6l.7-.4.8-.1h.1l.9.1.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.1Zm0-.7h.6l.5-.3.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2-.6-.1h-.6l-.5.3a1 1 0 0 0-.5.9l.1.5.4.4.5.2.5.1Zm-2.1-4.9h4.2v.8h-4.2v-.8Zm-1.1.8h-.3l-.2-.4c0-.2 0-.3.2-.3l.3-.1h.2l.2.4c0 .1 0 .2-.2.3l-.2.1Zm-.7-2.8h6v.8h-6v-.8Zm2.6-4h3.4v.8h-4.2v-.7h.8Zm1.1.2v.3h-.8l-.6-.4-.5-.5-.1-.8v-.5a1.1 1.1 0 0 1 .8-.7l.7-.1h2.8v.7h-2.8a1 1 0 0 0-.5.1l-.3.3v1c0 .2.2.3.3.4l.5.2h.5Zm-.4-2.7.2.5c-.3 0-.5 0-.7-.2l-.6-.3-.4-.5-.1-.7v-.6l.4-.5.4-.3h3.5v.7h-2.8l-.5.1c-.2 0-.3.2-.3.3a1.2 1.2 0 0 0 0 1l.2.2.3.2h.4Zm.6-3.6-.9-.1a2 2 0 0 1-.7-.4l-.4-.6c-.2-.3-.2-.5-.2-.8 0-.3 0-.6.2-.8 0-.3.2-.5.4-.6l.7-.4.8-.1h1l.7.5a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .5-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.1Zm0-.7.6-.1.5-.2.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2-.6-.1h-.6l-.5.3a1 1 0 0 0-.5.9l.1.5.4.4.5.2h.5Zm-2.1-4.9h4.2v.7h-4.2v-.7Zm-1.1.8-.3-.1-.2-.3c0-.2 0-.3.2-.4h.5l.2.4c0 .1 0 .2-.2.3h-.2Zm4.2-4.5-.3.1-.3.3-.2.6-.1.6c0 .2-.2.4-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0l-.4-.4c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-1l.5-.5.6-.1v.7h-.3l-.3.4-.1.5v.4l.3.3a.6.6 0 0 0 .5 0h.2l.1-.4.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .5l.2.5v.6l-.1 1-.5.6-.7.2v-.8l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Zm-3.1-3.5h.5v2.3h-.5v-2.3Zm-1 1.5v-.7h4.5l.1-.2V92.5h.6a1.8 1.8 0 0 1 0 .6v.5l-.4.3-.7.1h-4.2Zm4.2-5h-3.2v-.7h4.2v.7h-1Zm-.9 0v-.4l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H148.8V91h3.2l.3-.2.1-.3v-.3l-.1-.7a1 1 0 0 0-.5-.4h-.7Zm-1.7-2.6h3.6v.8h-4.2v-.7h.6Zm-.7-1.3h.7v.8l.3.3.3.3h.4l.2.3-.8-.1a2 2 0 0 1-.6-.3l-.4-.4a1.1 1.1 0 0 1 0-.9Zm4.4-2.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2h-.1c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.6-1.3c0-.3 0-.5.2-.8 0-.2.2-.4.4-.5l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.3h1.4l.5-.3.3-.4V82l-.5-.4.4-.5.4.4.3.5v.7Z"/><path fill="#FFA389" d="M159 47.5h18v98h-18z"/><path fill="#000" fill-opacity=".9" d="M165.3 135.3h.5l5.2 2.3v1l-5-2.3v3h-.7v-4Zm2.4-4.6h1c.4 0 .7 0 1 .2.4 0 .6.2.8.3l.4.6.2.8-.1.6a1.5 1.5 0 0 1-.8 1l-.6.2h-3a2 2 0 0 1-.8-.5l-.4-.5-.2-.8.1-.6a1.5 1.5 0 0 1 .8-1l.6-.2h1Zm1 1h-1.2a4 4 0 0 0-.6 0l-.4.1-.3.2-.2.3v.7l.3.3.5.2h2.5l.5-.1.3-.2.2-.3v-.7l-.3-.3-.5-.2a4 4 0 0 0-.8 0Z"/><path fill="#000" fill-opacity=".5" d="M170.4 124h.6v3h-.6v-3Zm-5 2.8h5.6v.7h-5.7v-.7Zm5.7-5.3c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2h-.1c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.4-2c0-.3.2-.5.4-.6l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.2.7.1h.7l.5-.3.3-.4v-1.2l-.5-.4.4-.5.4.4.3.5v.7Zm-.8-5h-2.6c-.2.1-.3.2-.3.4l-.1.5v.5l.3.3h.3v.8a1 1 0 0 1-.4-.1c-.2 0-.3-.2-.4-.3l-.3-.6a2 2 0 0 1-.1-.7c0-.3 0-.5.2-.8 0-.2.2-.4.4-.5.2-.2.5-.2.8-.2h2.4l.4-.2h.1v.8h-.7Zm-1.9-.1h.5v.7l.1.5.1.4.3.3h.7l.3-.3v-.4a1.2 1.2 0 0 0-.4-1 .7.7 0 0 0-.4-.2l.3-.3.4.2a1.7 1.7 0 0 1 .6 2.1l-.4.5-.7.2-.6-.1-.4-.4-.3-.6v-1.6Zm2.6-3v.8h-4.7c-.3 0-.5 0-.7-.2-.3 0-.4-.2-.5-.4l-.2-.8a2 2 0 0 1 0-.5h.7v.9l.3.2H171Zm-4.2-.8h.5v2.3h-.5v-2.3Zm3.4-4-3.4-1v-.5h.7l3.5 1.2v.4h-.8Zm-3.4.8 3.5-1h.7v.4l-4.2 1.3v-.7Zm3.5-3.4-3.5-.9v-.7l4.2 1.2v.5h-.7Zm-3.5 1 3.4-1.1.8-.1v.4l-3.5 1.2h-.7v-.4Zm4.3-5.1c0 .3 0 .5-.2.8a1.8 1.8 0 0 1-1 1l-.9.1h-.1l-1-.1a2 2 0 0 1-.6-.5 1.8 1.8 0 0 1-.4-2c0-.2.2-.4.4-.6l.6-.3h1.2v3h-.6V101l-.6.2a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.2h1.4l.5-.2c0-.2.2-.3.3-.4v-1.2l-.5-.5.4-.4.4.3c0 .2.2.3.3.5v.8Zm-4.3-4.3h.5v2.2h-.5v-2.2Zm-1 1.5v-.8h4.5l.1-.2V97.5h.6a1.8 1.8 0 0 1 0 .6v.5c-.1.1-.2.3-.4.3l-.7.2h-4.2Zm1.9-3.2h3.3v.8h-4.2V96h.9Zm1 .2v.3l-.8-.1a2 2 0 0 1-.6-.4 1.6 1.6 0 0 1-.6-1.2V94l.3-.4.5-.3h3.5v.7h-3.3l-.3.3v.5a1 1 0 0 0 .3.9 1.6 1.6 0 0 0 1 .3Zm2.4-5.7c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1 1l-.9.2h-.1c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.6-1.3c0-.3 0-.5.2-.8 0-.2.2-.4.4-.5l.6-.3.9-.1h.3v3.1h-.6v-2.4l-.6.1a1 1 0 0 0-.4.3 1 1 0 0 0-.2.6 1 1 0 0 0 .4.8l.5.3h1.4l.5-.3.3-.4v-1.2l-.5-.4.4-.5.4.4.3.5v.7Zm-1.2-5h-.3l-.3.4-.2.6-.1.6c0 .2-.2.4-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0l-.4-.4c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-1 0-.2.3-.3.5-.5l.6-.2v.8h-.3l-.3.4-.1.5v.4l.3.3a.6.6 0 0 0 .5 0l.2-.1.1-.3.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .4l.2.6v.6l-.1 1-.5.6-.7.2v-.8l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Zm0-4.2-.3.1-.3.3-.2.6-.1.6c0 .2-.2.4-.3.5a1 1 0 0 1-.8.4 1 1 0 0 1-.4 0l-.4-.4c-.2-.1-.2-.3-.3-.5a2 2 0 0 1-.1-.6c0-.4 0-.7.2-.9 0-.2.3-.4.5-.6l.6-.1v.7h-.3l-.3.4-.1.5v.5l.3.2a.6.6 0 0 0 .5 0h.2l.1-.4.2-.5.2-.8.4-.5.6-.2a1.1 1.1 0 0 1 1 .5l.2.5v.6l-.1 1-.5.6-.7.2V83l.5-.1.2-.4a1.5 1.5 0 0 0 0-1l-.2-.3h-.3Z"/><path fill="#FFED53" d="M177 62.5h18v83h-18z"/><path fill="#000" fill-opacity=".9" d="M183.3 136.2h.7l.2.8a1.6 1.6 0 0 0 1 1l.8.1h1.5l.5-.3.2-.3.1-.4v-.3l-.3-.3-.4-.2a1.7 1.7 0 0 0-.9 0c-.1 0-.3 0-.4.2l-.2.2-.1.4.1.6.4.3.4.2-.1.3a2 2 0 0 1-.7-.1l-.5-.4-.3-.5V136.2l.5-.5.6-.3a2.5 2.5 0 0 1 1.5 0c.2 0 .4.2.6.4.2.1.3.3.4.6l.2.7c0 .3 0 .6-.2.8-.1.3-.3.5-.5.6l-.7.4-.8.2h-.4l-1.3-.2a3 3 0 0 1-1-.5c-.3-.2-.5-.5-.7-.9a3 3 0 0 1-.2-1.3Zm2.4-5.5h1c.4 0 .7 0 1 .2.4 0 .6.2.8.3l.4.6.2.8-.1.6a1.5 1.5 0 0 1-.8 1l-.6.2h-3a2 2 0 0 1-.8-.5l-.4-.5-.2-.8.1-.6a1.5 1.5 0 0 1 .8-1l.6-.2h1Zm1 1h-1.2a4 4 0 0 0-.6 0l-.4.1-.3.2-.2.3v.7l.3.3.5.2h2.5l.5-.1.3-.2.2-.3v-.7l-.3-.3-.5-.2a4 4 0 0 0-.8 0Z"/><path fill="#000" fill-opacity=".5" d="M187.2 124v-.7c.4 0 .7.2 1 .4.2.1.5.4.6.7.2.3.3.6.3 1.1 0 .3 0 .6-.2 1a2 2 0 0 1-.5.6l-.9.5-1 .1h-.6l-1.1-.1-.8-.5a2 2 0 0 1-.6-.7l-.2-1c0-.4.1-.8.3-1 .1-.4.4-.6.6-.7l1-.4v.8l-.6.2a1 1 0 0 0-.5.4l-.1.7.1.7c0 .2.2.4.4.5l.6.3h2.2c.3 0 .5-.2.7-.3l.4-.4.2-.7c0-.3 0-.6-.2-.8a1 1 0 0 0-.4-.4l-.7-.2Zm-4.2-2.4h6v.7h-6v-.7Zm4-1h-.2c-.3 0-.5 0-.8-.2a2 2 0 0 1-.7-.4c-.2-.1-.3-.3-.4-.6-.2-.2-.2-.5-.2-.8 0-.3 0-.5.2-.8 0-.2.2-.4.4-.6l.7-.4h1.8l.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8a1.8 1.8 0 0 1-1.1 1l-.9.2Zm-.2-.8h.7c.2 0 .4-.2.5-.3.2 0 .3-.2.4-.3V118a1 1 0 0 0-.4-.4l-.5-.2h-1.2l-.5.2a1 1 0 0 0-.5.9l.1.6.4.3.5.3h.5Zm1.2-6.6h-3.2v-.8h4.2v.7h-1Zm-.9-.2v-.3l.8.1.6.3.4.5.2.8-.1.5a1.1 1.1 0 0 1-.8.8H184.8v-.7h3.2l.3-.2.1-.2v-.3l-.1-.8a1 1 0 0 0-.5-.3l-.7-.2Zm1-4.4H183v-.7h6v.7h-.8Zm-1.2 2.9a3 3 0 0 1-1-.2l-.6-.3a1.5 1.5 0 0 1-.6-1.2l.1-.7.4-.5c.2-.1.4-.3.7-.3l.8-.2h.4c.3 0 .6 0 .8.2.3 0 .5.2.6.3l.4.5a1.7 1.7 0 0 1 0 1.4c0 .2-.2.4-.4.5-.2.2-.5.3-.7.3a3 3 0 0 1-.9.2Zm0-.8h.6l.5-.2c.2-.1.3-.2.3-.4l.2-.5a1 1 0 0 0-.6-1l-.5-.2h-1a2 2 0 0 0-.4.2l-.3.2a1 1 0 0 0-.4.8l.1.5.4.4.5.2h.6Zm1.6-7.7-.1-.5a1 1 0 0 0-.3-.3.8.8 0 0 0-.4-.2v-.7l.7.3a1.7 1.7 0 0 1 .7 1.4c0 .3 0 .6-.2.8-.1.3-.3.4-.5.6a2 2 0 0 1-.6.4H186a2 2 0 0 1-.7-.4l-.4-.6a2 2 0 0 1-.2-.8c0-.3 0-.6.2-.9l.5-.6.8-.2v.7a1 1 0 0 0-.4.1 1 1 0 0 0-.5.8l.1.6.4.4.5.2h1.2l.5-.2c.2 0 .3-.2.4-.4v-.5Zm-1.6-2.4-.9-.1a2 2 0 0 1-.7-.4l-.4-.6c-.2-.2-.2-.5-.2-.8 0-.3 0-.6.2-.8 0-.2.2-.4.4-.6l.7-.4.8-.1h.1l.9.1.7.4a1.8 1.8 0 0 1 .6 1.4c0 .3 0 .6-.2.8 0 .2-.2.4-.4.6a2 2 0 0 1-.7.4l-.9.1Zm0-.7h.6l.5-.3c.2 0 .3-.2.4-.4v-1a1 1 0 0 0-.4-.4l-.5-.2h-1.2l-.5.2a1 1 0 0 0-.5.9l.1.5.4.4.5.2.5.1Zm1.4-5.3-3.5-1.2v-.7l4.2 1.5v.5l-.7-.1Zm-3.5 1 3.6-1.2.6-.1v.5l-4.2 1.5v-.7Zm4.3-5.3c0 .2 0 .5-.2.8a1.8 1.8 0 0 1-1 1l-.9.1h-.1c-.4 0-.7 0-1-.2a2 2 0 0 1-.6-.4 1.8 1.8 0 0 1-.6-1.3c0-.3 0-.5.2-.7 0-.3.2-.4.4-.6l.6-.3h1.2v3h-.6v-2.4l-.6.1a1 1 0 0 0-.4.4 1 1 0 0 0-.2.5 1 1 0 0 0 .4.9l.5.2h1.4c.2 0 .3-.2.5-.3l.3-.4v-1.1l-.5-.5.4-.4.4.3c0 .2.2.3.3.5v.8Zm-3.7-3.3h3.6v.7h-4.2V87h.6Zm-.7-1.3h.7v.8l.3.3.3.2.4.1.2.2h-.8a2 2 0 0 1-.6-.3l-.4-.4a1.1 1.1 0 0 1 0-1ZM61.5 154.3v-4h.8v4c0 .4 0 .7-.2 1l-.7.6a2 2 0 0 1-.9.2c-.3 0-.7 0-1-.2l-.6-.5-.2-1h.8v.6l.5.4a1.3 1.3 0 0 0 1 0l.4-.4.1-.7Zm4.6 1V153l-.1-.4c0-.2-.2-.3-.3-.3a1 1 0 0 0-.5-.1h-.5l-.3.3-.1.3h-.7v-.4l.4-.4.6-.3.7-.1c.3 0 .5 0 .8.2.2 0 .4.2.5.4.2.2.2.5.2.8v2.4l.2.4v.1h-.8v-.3l-.1-.4Zm.1-1.9v.5h-.7l-.5.1-.5.1-.2.3v.7l.3.3h.4a1.2 1.2 0 0 0 1-.4l.2-.4.3.3-.2.4a1.7 1.7 0 0 1-.8.7H64.2l-.5-.5c-.2-.2-.2-.4-.2-.7l.1-.6.4-.4.6-.3h1.6Zm2.6-.7v3.3h-.7v-4.2h.7v.9Zm-.1 1h-.3v-.8l.4-.6a1.6 1.6 0 0 1 1.3-.6h.5l.5.3.2.5.1.7v2.8h-.7v-3.3l-.4-.3a1 1 0 0 0-.4 0 1 1 0 0 0-1 .3 1.6 1.6 0 0 0-.2 1ZM154 150.3v5.7h-.8v-5.7h.7Zm2.3 2.6v.6h-2.6v-.6h2.6Zm.4-2.6v.6h-3v-.6h3Zm2.6 5.8a1.8 1.8 0 0 1-1.8-1.2l-.2-.9v-.1c0-.4 0-.7.2-1l.4-.6a1.8 1.8 0 0 1 2-.4c.3 0 .5.2.6.4l.3.6.1.9v.3h-3.1v-.6h2.4l-.1-.6a1 1 0 0 0-.3-.4 1 1 0 0 0-.6-.2 1 1 0 0 0-.8.4l-.2.5-.1.7v.7l.3.5.4.3h1.2l.4-.5.5.4-.4.4-.5.3a2 2 0 0 1-.7 0Zm2.6-6.1h.7v6h-.7v-6Zm3.6 3.9-.1.9-.3.7-.5.4-.7.2c-.3 0-.6 0-.8-.2-.2 0-.3-.2-.5-.4a2 2 0 0 1-.3-.6 4 4 0 0 1-.2-.8v-.4l.2-.8c0-.3.2-.5.3-.7l.5-.4.7-.1c.3 0 .5 0 .8.2.2 0 .3.2.5.4l.3.7.1.9Zm-.7 0v-.6l-.3-.5a1 1 0 0 0-.8-.5l-.5.1a1 1 0 0 0-.4.3l-.2.3-.1.4v1l.2.5c0 .2.2.3.4.4l.6.2c.2 0 .3 0 .5-.2l.3-.3.2-.5v-.6Z"/></svg>", + "description": "Displays changes to time-series data over time visualized with value bars and labels — for example, daily water consumption for the last month.", + "descriptor": { + "type": "timeseries", + "sizeX": 8, + "sizeY": 5, + "resources": [], + "templateHtml": "\n", + "templateCss": ".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n cursor: crosshair; \n}\n\n", + "controllerScript": "self.onInit = function() {\n self.ctx.$scope.barChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.barChartWidget.onDataUpdated();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '80%',\n embedTitlePanel: true,\n hasAdditionalLatestDataKeys: false,\n defaultDataKeysFunction: function() {\n return [{ name: 'humidity', label: 'Humidity', type: 'timeseries' }];\n }\n };\n}\n", + "settingsSchema": "{}", + "dataKeySettingsSchema": "{}", + "latestDataKeySettingsSchema": "{}", + "settingsDirective": "tb-bar-chart-with-labels-widget-settings", + "dataKeySettingsDirective": "", + "latestDataKeySettingsDirective": "", + "hasBasicMode": true, + "basicModeDirective": "tb-bar-chart-with-labels-basic-config", + "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"rgb(125, 142, 255)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 50) {\\n\\tvalue = 50;\\n} else if (value > 80) {\\n\\tvalue = 80;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Soil moisture\",\"color\":\"rgb(249, 111, 255)\",\"settings\":{},\"_hash\":0.9111685461089025,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 30) {\\n\\tvalue = 30;\\n} else if (value > 90) {\\n\\tvalue = 90;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Leaf wetness\",\"color\":\"rgb(255, 163, 137)\",\"settings\":{},\"_hash\":0.8487533373085416,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 40) {\\n\\tvalue = 40;\\n} else if (value > 70) {\\n\\tvalue = 70;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Cloud cover\",\"color\":\"#FFED53\",\"settings\":{},\"_hash\":0.7690144858984289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 20) {\\n\\tvalue = 20;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":2592000000,\"fixedTimewindow\":{\"startTimeMs\":1704293713163,\"endTimeMs\":1704380113163},\"quickInterval\":\"CURRENT_HALF_YEAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showBarLabel\":true,\"barLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"12px\"},\"barLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showBarValue\":true,\"barValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"700\",\"lineHeight\":\"12px\"},\"barValueColor\":\"rgba(0, 0, 0, 0.76)\",\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":\"MMMM y\",\"lastUpdateAgo\":false,\"custom\":true},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Bar chart with labels\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"public\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"%\",\"decimals\":0,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"24px\"}" + }, + "tags": [ + "bar chart", + "bar", + "bars" + ] +} \ No newline at end of file diff --git a/ui-ngx/src/app/core/api/data-aggregator.ts b/ui-ngx/src/app/core/api/data-aggregator.ts index 72a500e084..9351e410a8 100644 --- a/ui-ngx/src/app/core/api/data-aggregator.ts +++ b/ui-ngx/src/app/core/api/data-aggregator.ts @@ -136,6 +136,8 @@ const none: AggFunction = (aggData: AggData, value?: any) => { aggData.aggValue = value; }; +const MAX_INTERVAL_TIMEOUT = Math.pow(2,31)-1; + export class DataAggregator { constructor(private onDataCb: onAggregatedData, @@ -217,7 +219,7 @@ export class DataAggregator { this.aggregationTimeout = this.isLatestDataAgg ? 1000 : Math.max(this.subsTw.aggregation.interval, 1000); this.resetPending = true; this.updatedData = false; - this.intervalTimeoutHandle = setTimeout(this.onInterval.bind(this), this.aggregationTimeout); + this.intervalTimeoutHandle = setTimeout(this.onInterval.bind(this), Math.min(this.aggregationTimeout, MAX_INTERVAL_TIMEOUT)); } public destroy() { @@ -313,7 +315,7 @@ export class DataAggregator { this.updatedData = false; } if (!history) { - this.intervalTimeoutHandle = setTimeout(this.onInterval.bind(this), intervalTimeout); + this.intervalTimeoutHandle = setTimeout(this.onInterval.bind(this), Math.min(intervalTimeout, MAX_INTERVAL_TIMEOUT)); } } diff --git a/ui-ngx/src/app/core/services/time.service.ts b/ui-ngx/src/app/core/services/time.service.ts index f9ab858b4f..421b81f8bc 100644 --- a/ui-ngx/src/app/core/services/time.service.ts +++ b/ui-ngx/src/app/core/services/time.service.ts @@ -38,7 +38,7 @@ export interface TimeInterval { const MIN_INTERVAL = SECOND; const MAX_INTERVAL = 365 * 20 * DAY; -const MIN_LIMIT = 7; +const MIN_LIMIT = 1; const MAX_DATAPOINTS_LIMIT = 500; diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts index 5e95d162cd..95ce945259 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts @@ -88,6 +88,9 @@ import { import { RangeChartBasicConfigComponent } from '@home/components/widget/config/basic/chart/range-chart-basic-config.component'; +import { + BarChartWithLabelsBasicConfigComponent +} from '@home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component'; @NgModule({ declarations: [ @@ -115,7 +118,8 @@ import { CompassGaugeBasicConfigComponent, LiquidLevelCardBasicConfigComponent, DoughnutBasicConfigComponent, - RangeChartBasicConfigComponent + RangeChartBasicConfigComponent, + BarChartWithLabelsBasicConfigComponent ], imports: [ CommonModule, @@ -147,7 +151,8 @@ import { CompassGaugeBasicConfigComponent, LiquidLevelCardBasicConfigComponent, DoughnutBasicConfigComponent, - RangeChartBasicConfigComponent + RangeChartBasicConfigComponent, + BarChartWithLabelsBasicConfigComponent ] }) export class BasicWidgetConfigModule { @@ -173,5 +178,6 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type + + + + + + + +
+
widget-config.appearance
+
+ + {{ 'widget-config.title' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widget-config.card-icon' | translate }} + +
+ + + + + + + + +
+
+
+
+
widgets.bar-chart.bar-appearance
+
+ + {{ 'widgets.bar-chart.label-on-bar' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.bar-chart.value-on-bar' | translate }} + +
+ + + + +
+
+
+
widget-config.units-short
+ + +
+
+
widget-config.decimals-short
+ + + +
+
+
+ + + + + {{ 'widget-config.legend' | translate }} + + + + +
+
{{ 'legend.position' | translate }}
+ + + + {{ legendPositionTranslationMap.get(pos) | translate }} + + + +
+
+
{{ 'legend.label' | translate }}
+
+ + + + +
+
+ + +
+
+ + + + + {{ 'widget-config.tooltip' | translate }} + + + + +
+
{{ 'tooltip.value' | translate }}
+
+ + + + +
+
+
+ + {{ 'tooltip.date' | translate }} + +
+ + + + + +
+
+
+
{{ 'tooltip.background-color' | translate }}
+ + +
+
+
{{ 'tooltip.background-blur' | translate }}
+ + +
px
+ +
+ + +
+
+
widget-config.card-appearance
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+ + + diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts new file mode 100644 index 0000000000..6b6929a36f --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts @@ -0,0 +1,323 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component, Injector } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models'; +import { WidgetConfigComponentData } from '@home/models/widget-component.models'; +import { + DataKey, + Datasource, + legendPositions, + legendPositionTranslationMap, + WidgetConfig, +} from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { DataKeyType } from '@shared/models/telemetry/telemetry.models'; +import { + getTimewindowConfig, + setTimewindowConfig +} from '@home/components/widget/config/timewindow-config-panel.component'; +import { formatValue, isUndefined } from '@core/utils'; +import { + cssSizeToStrSize, + DateFormatProcessor, + DateFormatSettings, + resolveCssSize +} from '@shared/models/widget-settings.models'; +import { + barChartWithLabelsDefaultSettings, + BarChartWithLabelsWidgetSettings +} from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models'; + +@Component({ + selector: 'tb-bar-chart-with-labels-basic-config', + templateUrl: './bar-chart-with-labels-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigComponent { + + public get datasource(): Datasource { + const datasources: Datasource[] = this.barChartWidgetConfigForm.get('datasources').value; + if (datasources && datasources.length) { + return datasources[0]; + } else { + return null; + } + } + + legendPositions = legendPositions; + + legendPositionTranslationMap = legendPositionTranslationMap; + + barChartWidgetConfigForm: UntypedFormGroup; + + tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this); + + tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this); + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private $injector: Injector, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.barChartWidgetConfigForm; + } + + protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] { + return [{ name: 'temperature', label: 'Temperature', type: DataKeyType.timeseries }]; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: BarChartWithLabelsWidgetSettings = {...barChartWithLabelsDefaultSettings, ...(configData.config.settings || {})}; + const iconSize = resolveCssSize(configData.config.iconSize); + this.barChartWidgetConfigForm = this.fb.group({ + timewindowConfig: [getTimewindowConfig(configData.config), []], + datasources: [configData.config.datasources, []], + series: [this.getSeries(configData.config.datasources), []], + + showTitle: [configData.config.showTitle, []], + title: [configData.config.title, []], + titleFont: [configData.config.titleFont, []], + titleColor: [configData.config.titleColor, []], + + showIcon: [configData.config.showTitleIcon, []], + iconSize: [iconSize[0], [Validators.min(0)]], + iconSizeUnit: [iconSize[1], []], + icon: [configData.config.titleIcon, []], + iconColor: [configData.config.iconColor, []], + + showBarLabel: [settings.showBarLabel, []], + barLabelFont: [settings.barLabelFont, []], + barLabelColor: [settings.barLabelColor, []], + showBarValue: [settings.showBarValue, []], + barValueFont: [settings.barValueFont, []], + barValueColor: [settings.barValueColor, []], + + units: [configData.config.units, []], + decimals: [configData.config.decimals, []], + + showLegend: [settings.showLegend, []], + legendPosition: [settings.legendPosition, []], + legendLabelFont: [settings.legendLabelFont, []], + legendLabelColor: [settings.legendLabelColor, []], + + showTooltip: [settings.showTooltip, []], + tooltipValueFont: [settings.tooltipValueFont, []], + tooltipValueColor: [settings.tooltipValueColor, []], + tooltipShowDate: [settings.tooltipShowDate, []], + tooltipDateFormat: [settings.tooltipDateFormat, []], + tooltipDateFont: [settings.tooltipDateFont, []], + tooltipDateColor: [settings.tooltipDateColor, []], + tooltipBackgroundColor: [settings.tooltipBackgroundColor, []], + tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + setTimewindowConfig(this.widgetConfig.config, config.timewindowConfig); + this.widgetConfig.config.datasources = config.datasources; + this.setSeries(config.series, this.widgetConfig.config.datasources); + + this.widgetConfig.config.showTitle = config.showTitle; + this.widgetConfig.config.title = config.title; + this.widgetConfig.config.titleFont = config.titleFont; + this.widgetConfig.config.titleColor = config.titleColor; + + this.widgetConfig.config.showTitleIcon = config.showIcon; + this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit); + this.widgetConfig.config.titleIcon = config.icon; + this.widgetConfig.config.iconColor = config.iconColor; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.showBarLabel = config.showBarLabel; + this.widgetConfig.config.settings.barLabelFont = config.barLabelFont; + this.widgetConfig.config.settings.barLabelColor = config.barLabelColor; + this.widgetConfig.config.settings.showBarValue = config.showBarValue; + this.widgetConfig.config.settings.barValueFont = config.barValueFont; + this.widgetConfig.config.settings.barValueColor = config.barValueColor; + + this.widgetConfig.config.units = config.units; + this.widgetConfig.config.decimals = config.decimals; + + this.widgetConfig.config.settings.showLegend = config.showLegend; + this.widgetConfig.config.settings.legendPosition = config.legendPosition; + this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont; + this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor; + + this.widgetConfig.config.settings.showTooltip = config.showTooltip; + this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont; + this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor; + this.widgetConfig.config.settings.tooltipShowDate = config.tooltipShowDate; + this.widgetConfig.config.settings.tooltipDateFormat = config.tooltipDateFormat; + this.widgetConfig.config.settings.tooltipDateFont = config.tooltipDateFont; + this.widgetConfig.config.settings.tooltipDateColor = config.tooltipDateColor; + this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor; + this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showTitle', 'showIcon', 'showBarLabel', 'showBarValue', 'showLegend', 'showTooltip', 'tooltipShowDate']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showTitle: boolean = this.barChartWidgetConfigForm.get('showTitle').value; + const showIcon: boolean = this.barChartWidgetConfigForm.get('showIcon').value; + const showBarLabel: boolean = this.barChartWidgetConfigForm.get('showBarLabel').value; + const showBarValue: boolean = this.barChartWidgetConfigForm.get('showBarValue').value; + const showLegend: boolean = this.barChartWidgetConfigForm.get('showLegend').value; + const showTooltip: boolean = this.barChartWidgetConfigForm.get('showTooltip').value; + const tooltipShowDate: boolean = this.barChartWidgetConfigForm.get('tooltipShowDate').value; + + if (showTitle) { + this.barChartWidgetConfigForm.get('title').enable(); + this.barChartWidgetConfigForm.get('titleFont').enable(); + this.barChartWidgetConfigForm.get('titleColor').enable(); + this.barChartWidgetConfigForm.get('showIcon').enable({emitEvent: false}); + if (showIcon) { + this.barChartWidgetConfigForm.get('iconSize').enable(); + this.barChartWidgetConfigForm.get('iconSizeUnit').enable(); + this.barChartWidgetConfigForm.get('icon').enable(); + this.barChartWidgetConfigForm.get('iconColor').enable(); + } else { + this.barChartWidgetConfigForm.get('iconSize').disable(); + this.barChartWidgetConfigForm.get('iconSizeUnit').disable(); + this.barChartWidgetConfigForm.get('icon').disable(); + this.barChartWidgetConfigForm.get('iconColor').disable(); + } + } else { + this.barChartWidgetConfigForm.get('title').disable(); + this.barChartWidgetConfigForm.get('titleFont').disable(); + this.barChartWidgetConfigForm.get('titleColor').disable(); + this.barChartWidgetConfigForm.get('showIcon').disable({emitEvent: false}); + this.barChartWidgetConfigForm.get('iconSize').disable(); + this.barChartWidgetConfigForm.get('iconSizeUnit').disable(); + this.barChartWidgetConfigForm.get('icon').disable(); + this.barChartWidgetConfigForm.get('iconColor').disable(); + } + + if (showBarLabel) { + this.barChartWidgetConfigForm.get('barLabelFont').enable(); + this.barChartWidgetConfigForm.get('barLabelColor').enable(); + } else { + this.barChartWidgetConfigForm.get('barLabelFont').disable(); + this.barChartWidgetConfigForm.get('barLabelColor').disable(); + } + + if (showBarValue) { + this.barChartWidgetConfigForm.get('barValueFont').enable(); + this.barChartWidgetConfigForm.get('barValueColor').enable(); + } else { + this.barChartWidgetConfigForm.get('barValueFont').disable(); + this.barChartWidgetConfigForm.get('barValueColor').disable(); + } + + if (showLegend) { + this.barChartWidgetConfigForm.get('legendPosition').enable(); + this.barChartWidgetConfigForm.get('legendLabelFont').enable(); + this.barChartWidgetConfigForm.get('legendLabelColor').enable(); + } else { + this.barChartWidgetConfigForm.get('legendPosition').disable(); + this.barChartWidgetConfigForm.get('legendLabelFont').disable(); + this.barChartWidgetConfigForm.get('legendLabelColor').disable(); + } + + if (showTooltip) { + this.barChartWidgetConfigForm.get('tooltipValueFont').enable(); + this.barChartWidgetConfigForm.get('tooltipValueColor').enable(); + this.barChartWidgetConfigForm.get('tooltipShowDate').enable({emitEvent: false}); + this.barChartWidgetConfigForm.get('tooltipBackgroundColor').enable(); + this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').enable(); + if (tooltipShowDate) { + this.barChartWidgetConfigForm.get('tooltipDateFormat').enable(); + this.barChartWidgetConfigForm.get('tooltipDateFont').enable(); + this.barChartWidgetConfigForm.get('tooltipDateColor').enable(); + } else { + this.barChartWidgetConfigForm.get('tooltipDateFormat').disable(); + this.barChartWidgetConfigForm.get('tooltipDateFont').disable(); + this.barChartWidgetConfigForm.get('tooltipDateColor').disable(); + } + } else { + this.barChartWidgetConfigForm.get('tooltipValueFont').disable(); + this.barChartWidgetConfigForm.get('tooltipValueColor').disable(); + this.barChartWidgetConfigForm.get('tooltipShowDate').disable({emitEvent: false}); + this.barChartWidgetConfigForm.get('tooltipDateFormat').disable(); + this.barChartWidgetConfigForm.get('tooltipDateFont').disable(); + this.barChartWidgetConfigForm.get('tooltipDateColor').disable(); + this.barChartWidgetConfigForm.get('tooltipBackgroundColor').disable(); + this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').disable(); + } + } + + private getSeries(datasources?: Datasource[]): DataKey[] { + if (datasources && datasources.length) { + return datasources[0].dataKeys || []; + } + return []; + } + + private setSeries(series: DataKey[], datasources?: Datasource[]) { + if (datasources && datasources.length) { + datasources[0].dataKeys = series; + } + } + + private getCardButtons(config: WidgetConfig): string[] { + const buttons: string[] = []; + if (isUndefined(config.enableFullscreen) || config.enableFullscreen) { + buttons.push('fullscreen'); + } + return buttons; + } + + private setCardButtons(buttons: string[], config: WidgetConfig) { + config.enableFullscreen = buttons.includes('fullscreen'); + } + + private _tooltipValuePreviewFn(): string { + const units: string = this.barChartWidgetConfigForm.get('units').value; + const decimals: number = this.barChartWidgetConfigForm.get('decimals').value; + return formatValue(22, decimals, units, false); + } + + private _tooltipDatePreviewFn(): string { + const dateFormat: DateFormatSettings = this.barChartWidgetConfigForm.get('tooltipDateFormat').value; + const processor = DateFormatProcessor.fromSettings(this.$injector, dateFormat); + processor.update(Date.now()); + return processor.formatted; + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html index 00c4929f3c..c12cf02299 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html @@ -145,14 +145,14 @@
{{ 'legend.position' | translate }}
- - {{ doughnutLegendPositionTranslationMap.get(pos) | translate }} + + {{ legendPositionTranslationMap.get(pos) | translate }}
-
{{ 'widgets.doughnut.legend-label' | translate }}
+
{{ 'legend.label' | translate }}
@@ -164,7 +164,7 @@
-
{{ 'widgets.doughnut.legend-value' | translate }}
+
{{ 'legend.value' | translate }}
@@ -184,13 +184,13 @@ - {{ 'widgets.doughnut.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
-
{{ 'widgets.doughnut.tooltip-value' | translate }}
+
{{ 'tooltip.value' | translate }}
@@ -213,14 +213,14 @@
-
{{ 'widgets.doughnut.tooltip-background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
{{ 'widgets.doughnut.tooltip-background-blur' | translate }}
+
{{ 'tooltip.background-blur' | translate }}
px
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts index f8149bc97d..0ab89281bc 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts @@ -25,6 +25,8 @@ import { Datasource, datasourcesHasAggregation, datasourcesHasOnlyComparisonAggregation, + legendPositions, + legendPositionTranslationMap, WidgetConfig } from '@shared/models/widget.models'; import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; @@ -40,8 +42,6 @@ import { doughnutLayoutImages, doughnutLayouts, doughnutLayoutTranslations, - doughnutLegendPositions, - doughnutLegendPositionTranslations, DoughnutTooltipValueType, doughnutTooltipValueTypes, doughnutTooltipValueTypeTranslations, @@ -83,9 +83,9 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent { doughnutLayoutImageMap: Map; - doughnutLegendPositions = doughnutLegendPositions; + legendPositions = legendPositions; - doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations; + legendPositionTranslationMap = legendPositionTranslationMap; doughnutTooltipValueTypes = doughnutTooltipValueTypes; diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html index 66b4054df1..391007d155 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html @@ -49,7 +49,7 @@
- {{ 'widgets.value-chart-card.icon' | translate }} + {{ 'widget-config.card-icon' | translate }}
@@ -127,7 +127,7 @@
-
{{ 'widgets.range-chart.legend-label' | translate }}
+
{{ 'legend.label' | translate }}
@@ -147,13 +147,13 @@ - {{ 'widgets.range-chart.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
-
{{ 'widgets.range-chart.tooltip-value' | translate }}
+
{{ 'tooltip.value' | translate }}
@@ -166,7 +166,7 @@
- {{ 'widgets.range-chart.tooltip-date' | translate }} + {{ 'tooltip.date' | translate }}
@@ -180,14 +180,14 @@
-
{{ 'widgets.range-chart.tooltip-background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
{{ 'widgets.range-chart.tooltip-background-blur' | translate }}
+
{{ 'tooltip.background-blur' | translate }}
px
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html index 4669bf5f82..9edf205d11 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html @@ -117,14 +117,14 @@ - {{ 'widgets.signal-strength.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
- {{ 'widgets.signal-strength.value' | translate }} + {{ 'tooltip.value' | translate }}
@@ -144,7 +144,7 @@
- {{ 'widgets.signal-strength.date' | translate }} + {{ 'tooltip.date' | translate }}
@@ -158,13 +158,13 @@
-
{{ 'widgets.signal-strength.background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
widgets.signal-strength.background-blur
+
tooltip.background-blur
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html new file mode 100644 index 0000000000..b490802022 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html @@ -0,0 +1,36 @@ + +
+
+ +
+
+
+
+
+
+
+
{{ legendItem.label }}
+
+
+
+
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss new file mode 100644 index 0000000000..6e57a12d6c --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss @@ -0,0 +1,105 @@ +/** + * Copyright © 2016-2023 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.tb-bar-chart-panel { + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + gap: 16px; + padding: 20px 24px 24px 24px; + > div:not(.tb-bar-chart-overlay) { + z-index: 1; + } + .tb-bar-chart-overlay { + position: absolute; + top: 12px; + left: 12px; + bottom: 12px; + right: 12px; + } + div.tb-widget-title { + padding: 0; + } + .tb-bar-chart-content { + flex: 1; + min-width: 0; + min-height: 0; + display: flex; + flex-direction: column; + gap: 16px; + &.legend-top { + flex-direction: column-reverse; + } + &.legend-right { + flex-direction: row; + } + &.legend-left { + flex-direction: row-reverse; + } + .tb-bar-chart-shape { + flex: 1; + min-width: 0; + min-height: 0; + display: flex; + align-items: center; + justify-content: center; + } + .tb-bar-chart-legend { + display: flex; + justify-content: center; + align-items: center; + align-self: stretch; + flex-wrap: wrap; + column-gap: 24px; + row-gap: 8px; + .tb-bar-chart-legend-item { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + user-select: none; + cursor: pointer; + .tb-bar-chart-legend-item-label { + display: flex; + align-items: center; + gap: 4px; + color: #ccc; + .tb-bar-chart-legend-item-label-circle { + width: 8px; + height: 8px; + border-radius: 50%; + background-color: #ccc; + } + } + } + } + &.legend-right, &.legend-left { + gap: 24px; + .tb-bar-chart-legend { + flex-direction: column-reverse; + justify-content: flex-end; + align-items: stretch; + .tb-bar-chart-legend-item { + flex-direction: row; + justify-content: space-between; + align-items: center; + } + } + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts new file mode 100644 index 0000000000..c325bb0e73 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts @@ -0,0 +1,483 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + AfterViewInit, + ChangeDetectorRef, + Component, + ElementRef, + Input, + OnDestroy, + OnInit, + Renderer2, + TemplateRef, + ViewChild, + ViewEncapsulation +} from '@angular/core'; +import { WidgetContext } from '@home/models/widget-component.models'; +import { + backgroundStyle, + ComponentStyle, + DateFormatProcessor, + overlayStyle, + textStyle +} from '@shared/models/widget-settings.models'; +import { ResizeObserver } from '@juggle/resize-observer'; +import { formatValue } from '@core/utils'; +import { DataKey } from '@shared/models/widget.models'; +import { Observable } from 'rxjs'; +import { ImagePipe } from '@shared/pipe/image.pipe'; +import { DomSanitizer } from '@angular/platform-browser'; +import { + barChartWithLabelsDefaultSettings, + BarChartWithLabelsWidgetSettings +} from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models'; + +import * as echarts from 'echarts/core'; +import { CustomSeriesOption } from 'echarts/charts'; +import { CallbackDataParams, CustomSeriesRenderItem, LabelLayoutOptionCallback } from 'echarts/types/dist/shared'; + +import { + ECharts, + echartsModule, + EChartsOption, + echartsTooltipFormatter, + NamedDataSet, + toNamedData +} from '@home/components/widget/lib/chart/echarts-widget.models'; + +interface BarChartDataItem { + id: string; + dataKey: DataKey; + data: NamedDataSet; + enabled: boolean; +} + +interface BarChartLegendItem { + id: string; + color: string; + label: string; + enabled: boolean; +} + +@Component({ + selector: 'tb-bar-chart-with-labels-widget', + templateUrl: './bar-chart-with-labels-widget.component.html', + styleUrls: ['./bar-chart-with-labels-widget.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class BarChartWithLabelsWidgetComponent implements OnInit, OnDestroy, AfterViewInit { + + @ViewChild('chartShape', {static: false}) + chartShape: ElementRef; + + settings: BarChartWithLabelsWidgetSettings; + + @Input() + ctx: WidgetContext; + + @Input() + widgetTitlePanel: TemplateRef; + + showLegend: boolean; + legendClass: string; + + backgroundStyle$: Observable; + overlayStyle: ComponentStyle = {}; + + legendItems: BarChartLegendItem[]; + legendLabelStyle: ComponentStyle; + disabledLegendLabelStyle: ComponentStyle; + + private shapeResize$: ResizeObserver; + + private decimals = 0; + private units = ''; + + private dataItems: BarChartDataItem[] = []; + + private drawChartPending = false; + private barChart: ECharts; + private barChartOptions: EChartsOption; + + private tooltipDateFormat: DateFormatProcessor; + + private barRenderItem: CustomSeriesRenderItem; + private barLabelLayoutCallback: LabelLayoutOptionCallback; + + constructor(private imagePipe: ImagePipe, + private sanitizer: DomSanitizer, + private renderer: Renderer2, + private cd: ChangeDetectorRef) { + } + + ngOnInit(): void { + this.ctx.$scope.barChartWidget = this; + this.settings = {...barChartWithLabelsDefaultSettings, ...this.ctx.settings}; + + this.decimals = this.ctx.decimals; + this.units = this.ctx.units; + + this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer); + this.overlayStyle = overlayStyle(this.settings.background.overlay); + + this.showLegend = this.settings.showLegend; + + if (this.showLegend) { + this.legendItems = []; + this.legendClass = `legend-${this.settings.legendPosition}`; + this.legendLabelStyle = textStyle(this.settings.legendLabelFont); + this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont); + this.legendLabelStyle.color = this.settings.legendLabelColor; + } + let counter = 0; + if (this.ctx.datasources.length) { + for (const datasource of this.ctx.datasources) { + const dataKeys = datasource.dataKeys; + for (const dataKey of dataKeys) { + const id = counter++; + const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === dataKey) : null; + const namedData = datasourceData?.data ? toNamedData(datasourceData.data) : []; + this.dataItems.push({ + id: id+'', + dataKey, + data: namedData, + enabled: true + }); + if (this.showLegend) { + this.legendItems.push( + { + id: id+'', + label: dataKey.label, + color: dataKey.color, + enabled: true + } + ); + } + } + } + } + + if (this.settings.showTooltip && this.settings.tooltipShowDate) { + this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat); + } + + const barValueStyle: ComponentStyle = textStyle(this.settings.barValueFont); + delete barValueStyle.lineHeight; + barValueStyle.fontSize = this.settings.barValueFont.size; + barValueStyle.fill = this.settings.barValueColor; + + const barLabelStyle: ComponentStyle = textStyle(this.settings.barLabelFont); + delete barLabelStyle.lineHeight; + barLabelStyle.fontSize = this.settings.barLabelFont.size; + barLabelStyle.fill = this.settings.barLabelColor; + + this.barRenderItem = (params, api) => { + + const interval = this.ctx.defaultSubscription.timeWindow.interval; + const enabledDataItems = this.dataItems.filter(d => d.enabled); + const barInterval = interval / (enabledDataItems.length + 1); + const intervalGap = barInterval / 2; + + const index = enabledDataItems.findIndex(d => d.id === params.seriesId); + const time = api.value(0) as number; + const value = api.value(1); + const start = time - interval / 2; + const startTime = start + intervalGap + barInterval * index; + const delta = barInterval; + const lowerLeft = api.coord([startTime, value]); + const height = api.size([delta, value])[1]; + const width = api.size([delta, 10])[0]; + + const coordSys: {x: number; y: number; width: number; height: number} = params.coordSys as any; + + const rectShape = echarts.graphic.clipRectByRect({ + x: lowerLeft[0], + y: lowerLeft[1], + width, + height + }, { + x: coordSys.x, + y: coordSys.y, + width: coordSys.width, + height: coordSys.height + }); + + const zeroPos = api.coord([0, 0]); + const labelParts: string[] = []; + if (this.settings.showBarValue) { + const labelValue = formatValue(value, this.decimals, '', false); + labelParts.push(`{value|${labelValue}}`); + } + if (this.settings.showBarLabel) { + labelParts.push(`{label|${params.seriesName}}`); + } + const barLabel = labelParts.join(' '); + return rectShape && { + type: 'rect', + id: time + '', + shape: rectShape, + style: { + fill: api.visual('color'), + text: barLabel, + textPosition: 'insideBottom', + textRotation: Math.PI / 2, + textDistance: 15, + textStrokeWidth: 0, + textAlign: 'left', + textVerticalAlign: 'middle', + rich: { + value: barValueStyle, + label: barLabelStyle + } + }, + focus: 'series', + transition: 'all', + enterFrom: { + style: { opacity: 0 }, + shape: { height: 0, y: zeroPos[1] } + } + }; + }; + + this.barLabelLayoutCallback = (params) => { + if (params.rect.width - params.labelRect.width < 2) { + return { + y: '1000%', + }; + } else { + return { + hideOverlap: true + }; + } + }; + } + + ngAfterViewInit() { + if (this.drawChartPending) { + this.drawChart(); + } + } + + ngOnDestroy() { + if (this.shapeResize$) { + this.shapeResize$.disconnect(); + } + if (this.barChart) { + this.barChart.dispose(); + } + } + + public onInit() { + const borderRadius = this.ctx.$widgetElement.css('borderRadius'); + this.overlayStyle = {...this.overlayStyle, ...{borderRadius}}; + if (this.chartShape) { + this.drawChart(); + } else { + this.drawChartPending = true; + } + this.cd.detectChanges(); + } + + public onDataUpdated() { + let minTime = this.ctx.defaultSubscription.timeWindow.minTime; + let maxTime = this.ctx.defaultSubscription.timeWindow.maxTime; + let dataMin = Number.MAX_VALUE; + let dataMax = Number.MIN_VALUE; + for (const item of this.dataItems) { + const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === item.dataKey) : null; + item.data = datasourceData?.data ? toNamedData(datasourceData.data) : []; + if (datasourceData.data.length) { + dataMin = Math.min(datasourceData.data[0][0], dataMin); + dataMax = Math.max(datasourceData.data[datasourceData.data.length-1][0], dataMax); + } + } + if (dataMin !== Number.MAX_VALUE) { + minTime = dataMin - this.ctx.defaultSubscription.timeWindow.interval / 2; + } + if (dataMax !== Number.MIN_VALUE) { + dataMax = dataMax + this.ctx.defaultSubscription.timeWindow.interval / 2; + maxTime = Math.max(dataMax, maxTime); + } + if (this.barChart) { + (this.barChartOptions.xAxis as any).min = minTime; + (this.barChartOptions.xAxis as any).max = maxTime; + (this.barChartOptions.xAxis as any).tbTimewindowInterval = this.ctx.defaultSubscription.timeWindow.interval; + this.barChartOptions.series = this.updateSeries(); + this.barChart.setOption(this.barChartOptions); + } + } + + private updateSeries(): Array { + const series: Array = []; + for (const item of this.dataItems) { + if (item.enabled) { + const seriesOption: CustomSeriesOption = { + type: 'custom', + id: item.id, + name: item.dataKey.label, + color: item.dataKey.color, + data: item.data, + renderItem: this.barRenderItem, + labelLayout: this.barLabelLayoutCallback + }; + series.push(seriesOption); + } + } + return series; + } + + + public onLegendItemEnter(item: BarChartLegendItem) { + this.barChart.dispatchAction({ + type: 'highlight', + seriesId: item.id + }); + } + + public onLegendItemLeave(item: BarChartLegendItem) { + this.barChart.dispatchAction({ + type: 'downplay', + seriesId: item.id + }); + } + + public toggleLegendItem(item: BarChartLegendItem) { + const enable = !item.enabled; + const dataItem = this.dataItems.find(d => d.id === item.id); + if (dataItem) { + dataItem.enabled = enable; + if (!enable) { + this.barChart.dispatchAction({ + type: 'downplay', + seriesId: item.id + }); + } + this.barChartOptions.series = this.updateSeries(); + this.barChart.setOption(this.barChartOptions, {replaceMerge: ['series']}); + item.enabled = enable; + if (enable) { + this.barChart.dispatchAction({ + type: 'highlight', + seriesId: item.id + }); + } + } + } + + private drawChart() { + echartsModule.init(); + this.barChart = echarts.init(this.chartShape.nativeElement, null, { + renderer: 'canvas', + }); + this.barChartOptions = { + tooltip: { + trigger: 'none' + }, + grid: { + containLabel: true, + top: '30', + left: 0, + right: 0, + bottom: 0 + }, + xAxis: { + type: 'time', + scale: true, + axisTick: { + show: false + }, + axisLabel: { + hideOverlap: true, + fontSize: 10 + }, + axisLine: { + onZero: false + }, + min: this.ctx.defaultSubscription.timeWindow.minTime - this.ctx.defaultSubscription.timeWindow.interval / 2, + max: this.ctx.defaultSubscription.timeWindow.maxTime + this.ctx.defaultSubscription.timeWindow.interval / 2 + }, + yAxis: { + type: 'value', + axisLabel: { + formatter: (value: any) => formatValue(value, this.decimals, this.units, false) + } + } + }; + + (this.barChartOptions.xAxis as any).tbTimewindowInterval = this.ctx.defaultSubscription.timeWindow.interval; + + this.barChartOptions.series = this.updateSeries(); + + if (this.settings.showTooltip) { + this.barChartOptions.tooltip = { + trigger: 'axis', + axisPointer: { + type: 'shadow' + }, + formatter: (params: CallbackDataParams[]) => { + const focusedSeriesIndex = this.focusedSeriesIndex(); + return echartsTooltipFormatter(this.renderer, this.tooltipDateFormat, + this.settings, params, this.decimals, this.units, focusedSeriesIndex); + }, + padding: [8, 12], + backgroundColor: this.settings.tooltipBackgroundColor, + borderWidth: 0, + extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);` + }; + } + + this.barChart.setOption(this.barChartOptions); + + this.shapeResize$ = new ResizeObserver(() => { + this.onResize(); + }); + this.shapeResize$.observe(this.chartShape.nativeElement); + this.onResize(); + } + + private focusedSeriesIndex(): number { + let index = - 1; + const views: any[] = (this.barChart as any)._chartsViews; + if (views) { + const hasBlurredView = !!views.find(view => { + const graphicEls: any[] = view._data._graphicEls; + return !!graphicEls.find(el => el?.currentStates.includes('blur')); + }); + if (hasBlurredView) { + const focusedView = views.find(view => { + const graphicEls: any[] = view._data._graphicEls; + return !!graphicEls.find(el => !el?.currentStates.includes('blur')); + }); + if (focusedView) { + index = !!focusedView._model ? + focusedView._model.seriesIndex : (!!focusedView.__model ? focusedView.__model.seriesIndex : -1); + } + } + } + return index; + } + + private onResize() { + const width = this.barChart.getWidth(); + const height = this.barChart.getHeight(); + const shapeWidth = this.chartShape.nativeElement.offsetWidth; + const shapeHeight = this.chartShape.nativeElement.offsetHeight; + if (width !== shapeWidth || height !== shapeHeight) { + this.barChart.resize(); + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts new file mode 100644 index 0000000000..ecb5e8a667 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts @@ -0,0 +1,99 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { BackgroundSettings, BackgroundType, customDateFormat, Font } from '@shared/models/widget-settings.models'; +import { LegendPosition } from '@shared/models/widget.models'; +import { EChartsTooltipWidgetSettings } from '@home/components/widget/lib/chart/echarts-widget.models'; + +export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSettings { + showBarLabel: boolean; + barLabelFont: Font; + barLabelColor: string; + showBarValue: boolean; + barValueFont: Font; + barValueColor: string; + showLegend: boolean; + legendPosition: LegendPosition; + legendLabelFont: Font; + legendLabelColor: string; + background: BackgroundSettings; +} + +export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings = { + showBarLabel: true, + barLabelFont: { + family: 'Roboto', + size: 12, + sizeUnit: 'px', + style: 'normal', + weight: '400', + lineHeight: '12px' + }, + barLabelColor: 'rgba(0, 0, 0, 0.54)', + showBarValue: true, + barValueFont: { + family: 'Roboto', + size: 12, + sizeUnit: 'px', + style: 'normal', + weight: '700', + lineHeight: '12px' + }, + barValueColor: 'rgba(0, 0, 0, 0.76)', + showLegend: true, + legendPosition: LegendPosition.top, + legendLabelFont: { + family: 'Roboto', + size: 12, + sizeUnit: 'px', + style: 'normal', + weight: '400', + lineHeight: '16px' + }, + legendLabelColor: 'rgba(0, 0, 0, 0.76)', + showTooltip: true, + tooltipValueFont: { + family: 'Roboto', + size: 12, + sizeUnit: 'px', + style: 'normal', + weight: '500', + lineHeight: '16px' + }, + tooltipValueColor: 'rgba(0, 0, 0, 0.76)', + tooltipShowDate: true, + tooltipDateFormat: customDateFormat('MMMM y'), + tooltipDateFont: { + family: 'Roboto', + size: 11, + sizeUnit: 'px', + style: 'normal', + weight: '400', + lineHeight: '16px' + }, + tooltipDateColor: 'rgba(0, 0, 0, 0.76)', + tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)', + tooltipBackgroundBlur: 4, + background: { + type: BackgroundType.color, + color: '#fff', + overlay: { + enabled: false, + color: 'rgba(255,255,255,0.72)', + blur: 3 + } + } +}; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts index 928445d316..28550c339e 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts @@ -30,7 +30,6 @@ import { import { doughnutDefaultSettings, DoughnutLayout, - DoughnutLegendPosition, DoughnutTooltipValueType, DoughnutWidgetSettings } from '@home/components/widget/lib/chart/doughnut-widget.models'; @@ -49,25 +48,11 @@ import { TranslateService } from '@ngx-translate/core'; import { PieDataItemOption } from 'echarts/types/src/chart/pie/PieSeries'; import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils'; import { SVG, Svg, Text } from '@svgdotjs/svg.js'; -import { DataKey } from '@shared/models/widget.models'; -import { TooltipComponent, TooltipComponentOption } from 'echarts/components'; -import { PieChart, PieSeriesOption } from 'echarts/charts'; -import { SVGRenderer } from 'echarts/renderers'; +import { DataKey, LegendPosition } from '@shared/models/widget.models'; import { Observable } from 'rxjs'; import { ImagePipe } from '@shared/pipe/image.pipe'; import { DomSanitizer } from '@angular/platform-browser'; - -echarts.use([ - TooltipComponent, - PieChart, - SVGRenderer -]); - -type EChartsOption = echarts.ComposeOption< - | TooltipComponentOption - | PieSeriesOption ->; -type ECharts = echarts.ECharts; +import { ECharts, echartsModule, EChartsOption } from '@home/components/widget/lib/chart/echarts-widget.models'; const shapeSize = 134; const shapeSegmentWidth = 13.4; @@ -178,7 +163,7 @@ export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit if (this.showLegend) { this.legendItems = []; this.legendClass = `legend-${this.settings.legendPosition}`; - this.legendHorizontal = [DoughnutLegendPosition.left, DoughnutLegendPosition.right].includes(this.settings.legendPosition); + this.legendHorizontal = [LegendPosition.left, LegendPosition.right].includes(this.settings.legendPosition); this.legendLabelStyle = textStyle(this.settings.legendLabelFont); this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont); this.legendLabelStyle.color = this.settings.legendLabelColor; @@ -387,6 +372,7 @@ export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit } private drawDoughnut() { + echartsModule.init(); const shapeWidth = this.doughnutShape.nativeElement.getBoundingClientRect().width; const shapeHeight = this.doughnutShape.nativeElement.getBoundingClientRect().height; const size = this.settings.autoScale ? shapeSize : Math.min(shapeWidth, shapeHeight); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts index 1771dbbb8a..52507dc2b5 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts @@ -21,6 +21,7 @@ import { constantColor, Font } from '@shared/models/widget-settings.models'; +import { LegendPosition } from '@shared/models/widget.models'; export enum DoughnutLayout { default = 'default', @@ -50,24 +51,6 @@ export const horizontalDoughnutLayoutImages = new Map( ] ); -export enum DoughnutLegendPosition { - top = 'top', - bottom = 'bottom', - left = 'left', - right = 'right' -} - -export const doughnutLegendPositions = Object.keys(DoughnutLegendPosition) as DoughnutLegendPosition[]; - -export const doughnutLegendPositionTranslations = new Map( - [ - [DoughnutLegendPosition.top, 'widgets.doughnut.legend-position-top'], - [DoughnutLegendPosition.bottom, 'widgets.doughnut.legend-position-bottom'], - [DoughnutLegendPosition.left, 'widgets.doughnut.legend-position-left'], - [DoughnutLegendPosition.right, 'widgets.doughnut.legend-position-right'] - ] -); - export enum DoughnutTooltipValueType { absolute = 'absolute', percentage = 'percentage' @@ -90,7 +73,7 @@ export interface DoughnutWidgetSettings { totalValueFont: Font; totalValueColor: ColorSettings; showLegend: boolean; - legendPosition: DoughnutLegendPosition; + legendPosition: LegendPosition; legendLabelFont: Font; legendLabelColor: string; legendValueFont: Font; @@ -120,7 +103,7 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett }, totalValueColor: constantColor('rgba(0, 0, 0, 0.87)'), showLegend: true, - legendPosition: horizontal ? DoughnutLegendPosition.right : DoughnutLegendPosition.bottom, + legendPosition: horizontal ? LegendPosition.right : LegendPosition.bottom, legendLabelFont: { family: 'Roboto', size: 12, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts new file mode 100644 index 0000000000..3587a246ae --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts @@ -0,0 +1,214 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import * as echarts from 'echarts/core'; +import { Axis } from 'echarts'; +import AxisModel from 'echarts/types/src/coord/cartesian/AxisModel'; +import { formatValue, isNumber } from '@core/utils'; +import TimeScale from 'echarts/types/src/scale/Time'; +import { + DataZoomComponent, DataZoomComponentOption, + GridComponent, GridComponentOption, + MarkLineComponent, MarkLineComponentOption, + TooltipComponent, TooltipComponentOption, + VisualMapComponent, VisualMapComponentOption +} from 'echarts/components'; +import { + BarChart, + LineChart, + CustomChart, + CustomSeriesOption, + LineSeriesOption, + BarSeriesOption, PieSeriesOption, PieChart +} from 'echarts/charts'; +import { LabelLayout } from 'echarts/features'; +import { CanvasRenderer, SVGRenderer } from 'echarts/renderers'; +import { DataSet } from '@shared/models/widget.models'; +import { CallbackDataParams } from 'echarts/types/dist/shared'; +import { Renderer2 } from '@angular/core'; +import { DateFormatProcessor, DateFormatSettings, Font } from '@shared/models/widget-settings.models'; + +class EChartsModule { + private initialized = false; + + init() { + if (!this.initialized) { + const axisGetBandWidth = Axis.prototype.getBandWidth; + + Axis.prototype.getBandWidth = function(){ + const model: AxisModel = this.model; + const axisOption = model.option; + const tbTimewindowInterval = (axisOption as any).tbTimewindowInterval; + if (this.scale.type === 'time' && isNumber(tbTimewindowInterval)) { + const timeScale: TimeScale = this.scale; + const axisExtent: [number, number] = this._extent; + const dataExtent = timeScale.getExtent(); + const size = Math.abs(axisExtent[1] - axisExtent[0]); + return tbTimewindowInterval * (size / (dataExtent[1] - dataExtent[0])); + } else { + return axisGetBandWidth.call(this); + } + }; + + echarts.use([ + TooltipComponent, + GridComponent, + VisualMapComponent, + DataZoomComponent, + MarkLineComponent, + LineChart, + BarChart, + PieChart, + CustomChart, + LabelLayout, + CanvasRenderer, + SVGRenderer + ]); + + this.initialized = true; + } + } +} + +export const echartsModule = new EChartsModule(); + +export type EChartsOption = echarts.ComposeOption< + | TooltipComponentOption + | GridComponentOption + | VisualMapComponentOption + | DataZoomComponentOption + | MarkLineComponentOption + | LineSeriesOption + | CustomSeriesOption + | BarSeriesOption + | PieSeriesOption +>; + +export type ECharts = echarts.ECharts; + +export type NamedDataSet = {name: string; value: [number, any]}[]; + +export const toNamedData = (data: DataSet): NamedDataSet => { + if (!data?.length) { + return []; + } else { + return data.map(d => ({ + name: d[0] + '', + value: d + })); + } +}; + +export interface EChartsTooltipWidgetSettings { + showTooltip: boolean; + tooltipValueFont: Font; + tooltipValueColor: string; + tooltipShowDate: boolean; + tooltipDateFormat: DateFormatSettings; + tooltipDateFont: Font; + tooltipDateColor: string; + tooltipBackgroundColor: string; + tooltipBackgroundBlur: number; +} + +export const echartsTooltipFormatter = (renderer: Renderer2, + tooltipDateFormat: DateFormatProcessor, + settings: EChartsTooltipWidgetSettings, + params: CallbackDataParams[], + decimals: number, + units: string, + focusedSeriesIndex: number): null | HTMLElement => { + if (!params.length || !params[0]) { + return null; + } + const tooltipElement: HTMLElement = renderer.createElement('div'); + renderer.setStyle(tooltipElement, 'display', 'flex'); + renderer.setStyle(tooltipElement, 'flex-direction', 'column'); + renderer.setStyle(tooltipElement, 'align-items', 'flex-start'); + renderer.setStyle(tooltipElement, 'gap', '4px'); + if (settings.tooltipShowDate) { + const dateElement: HTMLElement = renderer.createElement('div'); + const ts = params[0].value[0]; + tooltipDateFormat.update(ts); + renderer.appendChild(dateElement, renderer.createText(tooltipDateFormat.formatted)); + renderer.setStyle(dateElement, 'font-family', settings.tooltipDateFont.family); + renderer.setStyle(dateElement, 'font-size', settings.tooltipDateFont.size + settings.tooltipDateFont.sizeUnit); + renderer.setStyle(dateElement, 'font-style', settings.tooltipDateFont.style); + renderer.setStyle(dateElement, 'font-weight', settings.tooltipDateFont.weight); + renderer.setStyle(dateElement, 'line-height', settings.tooltipDateFont.lineHeight); + renderer.setStyle(dateElement, 'color', settings.tooltipDateColor); + renderer.appendChild(tooltipElement, dateElement); + } + let seriesParams: CallbackDataParams = null; + if (focusedSeriesIndex > -1) { + seriesParams = params.find(param => param.seriesIndex === focusedSeriesIndex); + } + if (seriesParams) { + renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units)); + } else { + for (seriesParams of params) { + renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units)); + } + } + return tooltipElement; +}; + +const constructEchartsTooltipSeriesElement = (renderer: Renderer2, + settings: EChartsTooltipWidgetSettings, + seriesParams: CallbackDataParams, + decimals: number, + units: string): HTMLElement => { + const labelValueElement: HTMLElement = renderer.createElement('div'); + renderer.setStyle(labelValueElement, 'display', 'flex'); + renderer.setStyle(labelValueElement, 'flex-direction', 'row'); + renderer.setStyle(labelValueElement, 'align-items', 'center'); + renderer.setStyle(labelValueElement, 'align-self', 'stretch'); + renderer.setStyle(labelValueElement, 'gap', '12px'); + const labelElement: HTMLElement = renderer.createElement('div'); + renderer.setStyle(labelElement, 'display', 'flex'); + renderer.setStyle(labelElement, 'align-items', 'center'); + renderer.setStyle(labelElement, 'gap', '8px'); + renderer.appendChild(labelValueElement, labelElement); + const circleElement: HTMLElement = renderer.createElement('div'); + renderer.setStyle(circleElement, 'width', '8px'); + renderer.setStyle(circleElement, 'height', '8px'); + renderer.setStyle(circleElement, 'border-radius', '50%'); + renderer.setStyle(circleElement, 'background', seriesParams.color); + renderer.appendChild(labelElement, circleElement); + const labelTextElement: HTMLElement = renderer.createElement('div'); + renderer.appendChild(labelTextElement, renderer.createText(seriesParams.seriesName)); + renderer.setStyle(labelTextElement, 'font-family', 'Roboto'); + renderer.setStyle(labelTextElement, 'font-size', '12px'); + renderer.setStyle(labelTextElement, 'font-style', 'normal'); + renderer.setStyle(labelTextElement, 'font-weight', '400'); + renderer.setStyle(labelTextElement, 'line-height', '16px'); + renderer.setStyle(labelTextElement, 'letter-spacing', '0.4px'); + renderer.setStyle(labelTextElement, 'color', 'rgba(0, 0, 0, 0.76)'); + renderer.appendChild(labelElement, labelTextElement); + const valueElement: HTMLElement = renderer.createElement('div'); + const value = formatValue(seriesParams.value[1], decimals, units, false); + renderer.appendChild(valueElement, renderer.createText(value)); + renderer.setStyle(valueElement, 'flex', '1'); + renderer.setStyle(valueElement, 'text-align', 'end'); + renderer.setStyle(valueElement, 'font-family', settings.tooltipValueFont.family); + renderer.setStyle(valueElement, 'font-size', settings.tooltipValueFont.size + settings.tooltipValueFont.sizeUnit); + renderer.setStyle(valueElement, 'font-style', settings.tooltipValueFont.style); + renderer.setStyle(valueElement, 'font-weight', settings.tooltipValueFont.weight); + renderer.setStyle(valueElement, 'line-height', settings.tooltipValueFont.lineHeight); + renderer.setStyle(valueElement, 'color', settings.tooltipValueColor); + renderer.appendChild(labelValueElement, valueElement); + return labelValueElement; +}; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts index 4625e4a2a9..4ff9c53a71 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts @@ -32,7 +32,8 @@ import { backgroundStyle, ColorRange, ComponentStyle, - DateFormatProcessor, filterIncludingColorRanges, + DateFormatProcessor, + filterIncludingColorRanges, getDataKey, overlayStyle, sortedColorRange, @@ -41,46 +42,18 @@ import { import { ResizeObserver } from '@juggle/resize-observer'; import * as echarts from 'echarts/core'; import { formatValue, isDefinedAndNotNull, isNumber } from '@core/utils'; -import { - DataZoomComponent, - DataZoomComponentOption, - GridComponent, - GridComponentOption, - MarkLineComponent, - MarkLineComponentOption, - TooltipComponent, - TooltipComponentOption, - VisualMapComponent, - VisualMapComponentOption -} from 'echarts/components'; -import { LineChart, LineSeriesOption, } from 'echarts/charts'; -import { CanvasRenderer } from 'echarts/renderers'; import { rangeChartDefaultSettings, RangeChartWidgetSettings } from './range-chart-widget.models'; -import { DataSet } from '@shared/models/widget.models'; import { Observable } from 'rxjs'; import { ImagePipe } from '@shared/pipe/image.pipe'; import { DomSanitizer } from '@angular/platform-browser'; - -echarts.use([ - TooltipComponent, - GridComponent, - VisualMapComponent, - DataZoomComponent, - MarkLineComponent, - LineChart, - CanvasRenderer -]); - -type EChartsOption = echarts.ComposeOption< - | TooltipComponentOption - | GridComponentOption - | VisualMapComponentOption - | DataZoomComponentOption - | MarkLineComponentOption - | LineSeriesOption ->; - -type ECharts = echarts.ECharts; +import { + ECharts, + echartsModule, + EChartsOption, + echartsTooltipFormatter, + toNamedData +} from '@home/components/widget/lib/chart/echarts-widget.models'; +import { CallbackDataParams } from 'echarts/types/dist/shared'; interface VisualPiece { lt?: number; @@ -180,17 +153,6 @@ const toRangeItems = (colorRanges: Array): RangeItem[] => { return rangeItems; }; -const toNamedData = (data: DataSet): {name: string; value: [number, any]}[] => { - if (!data?.length) { - return []; - } else { - return data.map(d => ({ - name: d[0] + '', - value: d - })); - } -}; - const getMarkPoints = (ranges: Array): number[] => { const points = new Set(); for (const range of ranges) { @@ -346,6 +308,7 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn } private drawChart() { + echartsModule.init(); const dataKey = getDataKey(this.ctx.datasources); this.rangeChart = echarts.init(this.chartShape.nativeElement, null, { renderer: 'canvas', @@ -379,7 +342,7 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn yAxis: { type: 'value', axisLabel: { - formatter: value => formatValue(value, this.decimals, this.units, false) + formatter: (value: any) => formatValue(value, this.decimals, this.units, false) } }, series: [{ @@ -442,71 +405,11 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn if (this.settings.showTooltip) { this.rangeChartOptions.tooltip = { trigger: 'axis', - formatter: (params) => { - if (!params.length || !params[0]) { - return null; - } - const seriesParams = params[0]; - const value = formatValue(seriesParams.value[1], this.decimals, this.units, false); - const tooltipElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.setStyle(tooltipElement, 'display', 'flex'); - this.renderer.setStyle(tooltipElement, 'flex-direction', 'column'); - this.renderer.setStyle(tooltipElement, 'align-items', 'flex-start'); - this.renderer.setStyle(tooltipElement, 'gap', '4px'); - if (this.settings.tooltipShowDate) { - const dateElement: HTMLElement = this.renderer.createElement('div'); - const ts = seriesParams.value[0]; - this.tooltipDateFormat.update(ts); - this.renderer.appendChild(dateElement, this.renderer.createText(this.tooltipDateFormat.formatted)); - this.renderer.setStyle(dateElement, 'font-family', this.settings.tooltipDateFont.family); - this.renderer.setStyle(dateElement, 'font-size', this.settings.tooltipDateFont.size + this.settings.tooltipDateFont.sizeUnit); - this.renderer.setStyle(dateElement, 'font-style', this.settings.tooltipDateFont.style); - this.renderer.setStyle(dateElement, 'font-weight', this.settings.tooltipDateFont.weight); - this.renderer.setStyle(dateElement, 'line-height', this.settings.tooltipDateFont.lineHeight); - this.renderer.setStyle(dateElement, 'color', this.settings.tooltipDateColor); - this.renderer.appendChild(tooltipElement, dateElement); - } - const labelValueElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.setStyle(labelValueElement, 'display', 'flex'); - this.renderer.setStyle(labelValueElement, 'flex-direction', 'row'); - this.renderer.setStyle(labelValueElement, 'align-items', 'center'); - this.renderer.setStyle(labelValueElement, 'align-self', 'stretch'); - this.renderer.setStyle(labelValueElement, 'gap', '12px'); - this.renderer.appendChild(tooltipElement, labelValueElement); - const labelElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.setStyle(labelElement, 'display', 'flex'); - this.renderer.setStyle(labelElement, 'align-items', 'center'); - this.renderer.setStyle(labelElement, 'gap', '8px'); - this.renderer.appendChild(labelValueElement, labelElement); - const circleElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.setStyle(circleElement, 'width', '8px'); - this.renderer.setStyle(circleElement, 'height', '8px'); - this.renderer.setStyle(circleElement, 'border-radius', '50%'); - this.renderer.setStyle(circleElement, 'background', seriesParams.color); - this.renderer.appendChild(labelElement, circleElement); - const labelTextElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.appendChild(labelTextElement, this.renderer.createText(seriesParams.seriesName)); - this.renderer.setStyle(labelTextElement, 'font-family', 'Roboto'); - this.renderer.setStyle(labelTextElement, 'font-size', '12px'); - this.renderer.setStyle(labelTextElement, 'font-style', 'normal'); - this.renderer.setStyle(labelTextElement, 'font-weight', '400'); - this.renderer.setStyle(labelTextElement, 'line-height', '16px'); - this.renderer.setStyle(labelTextElement, 'letter-spacing', '0.4px'); - this.renderer.setStyle(labelTextElement, 'color', 'rgba(0, 0, 0, 0.76)'); - this.renderer.appendChild(labelElement, labelTextElement); - const valueElement: HTMLElement = this.renderer.createElement('div'); - this.renderer.appendChild(valueElement, this.renderer.createText(value)); - this.renderer.setStyle(valueElement, 'font-family', this.settings.tooltipValueFont.family); - this.renderer.setStyle(valueElement, 'font-size', this.settings.tooltipValueFont.size + this.settings.tooltipValueFont.sizeUnit); - this.renderer.setStyle(valueElement, 'font-style', this.settings.tooltipValueFont.style); - this.renderer.setStyle(valueElement, 'font-weight', this.settings.tooltipValueFont.weight); - this.renderer.setStyle(valueElement, 'line-height', this.settings.tooltipValueFont.lineHeight); - this.renderer.setStyle(valueElement, 'color', this.settings.tooltipValueColor); - this.renderer.appendChild(labelValueElement, valueElement); - return tooltipElement; - }, + formatter: (params: CallbackDataParams[]) => echartsTooltipFormatter(this.renderer, this.tooltipDateFormat, + this.settings, params, this.decimals, this.units, 0), padding: [8, 12], backgroundColor: this.settings.tooltipBackgroundColor, + borderWidth: 0, extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);` }; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts index 6bcd0c1497..0c8bb73150 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts @@ -18,12 +18,13 @@ import { BackgroundSettings, BackgroundType, ColorRange, - DateFormatSettings, - Font, simpleDateFormat + Font, + simpleDateFormat } from '@shared/models/widget-settings.models'; import { LegendPosition } from '@shared/models/widget.models'; +import { EChartsTooltipWidgetSettings } from '@home/components/widget/lib/chart/echarts-widget.models'; -export interface RangeChartWidgetSettings { +export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings { dataZoom: boolean; rangeColors: Array; outOfRangeColor: string; @@ -32,15 +33,6 @@ export interface RangeChartWidgetSettings { legendPosition: LegendPosition; legendLabelFont: Font; legendLabelColor: string; - showTooltip: boolean; - tooltipValueFont: Font; - tooltipValueColor: string; - tooltipShowDate: boolean; - tooltipDateFormat: DateFormatSettings; - tooltipDateFont: Font; - tooltipDateColor: string; - tooltipBackgroundColor: string; - tooltipBackgroundBlur: number; background: BackgroundSettings; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html new file mode 100644 index 0000000000..5652d626ee --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html @@ -0,0 +1,150 @@ + + +
+
widgets.bar-chart.bar-chart-card-style
+
+ + {{ 'widgets.bar-chart.label-on-bar' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.bar-chart.value-on-bar' | translate }} + +
+ + + + +
+
+
+ + + + + {{ 'widget-config.legend' | translate }} + + + + +
+
{{ 'legend.position' | translate }}
+ + + + {{ legendPositionTranslationMap.get(pos) | translate }} + + + +
+
+
{{ 'legend.label' | translate }}
+
+ + + + +
+
+ + +
+
+ + + + + {{ 'widget-config.tooltip' | translate }} + + + + +
+
{{ 'tooltip.value' | translate }}
+
+ + + + +
+
+
+ + {{ 'tooltip.date' | translate }} + +
+ + + + + +
+
+
+
{{ 'tooltip.background-color' | translate }}
+ + +
+
+
{{ 'tooltip.background-blur' | translate }}
+ + +
px
+ +
+ + +
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+ diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts new file mode 100644 index 0000000000..3eee431476 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts @@ -0,0 +1,170 @@ +/// +/// Copyright © 2016-2023 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component, Injector } from '@angular/core'; +import { + legendPositions, + legendPositionTranslationMap, + WidgetSettings, + WidgetSettingsComponent +} from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { formatValue } from '@core/utils'; +import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models'; +import { + barChartWithLabelsDefaultSettings +} from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models'; + +@Component({ + selector: 'tb-bar-chart-with-labels-widget-settings', + templateUrl: './bar-chart-with-labels-widget-settings.component.html', + styleUrls: [] +}) +export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsComponent { + + legendPositions = legendPositions; + + legendPositionTranslationMap = legendPositionTranslationMap; + + barChartWidgetSettingsForm: UntypedFormGroup; + + tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this); + + tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this); + + constructor(protected store: Store, + private $injector: Injector, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.barChartWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...barChartWithLabelsDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.barChartWidgetSettingsForm = this.fb.group({ + + showBarLabel: [settings.showBarLabel, []], + barLabelFont: [settings.barLabelFont, []], + barLabelColor: [settings.barLabelColor, []], + showBarValue: [settings.showBarValue, []], + barValueFont: [settings.barValueFont, []], + barValueColor: [settings.barValueColor, []], + + showLegend: [settings.showLegend, []], + legendPosition: [settings.legendPosition, []], + legendLabelFont: [settings.legendLabelFont, []], + legendLabelColor: [settings.legendLabelColor, []], + + showTooltip: [settings.showTooltip, []], + tooltipValueFont: [settings.tooltipValueFont, []], + tooltipValueColor: [settings.tooltipValueColor, []], + tooltipShowDate: [settings.tooltipShowDate, []], + tooltipDateFormat: [settings.tooltipDateFormat, []], + tooltipDateFont: [settings.tooltipDateFont, []], + tooltipDateColor: [settings.tooltipDateColor, []], + tooltipBackgroundColor: [settings.tooltipBackgroundColor, []], + tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []], + + background: [settings.background, []] + }); + } + + protected validatorTriggers(): string[] { + return ['showBarLabel', 'showBarValue', 'showLegend', 'showTooltip', 'tooltipShowDate']; + } + + protected updateValidators(emitEvent: boolean) { + const showBarLabel: boolean = this.barChartWidgetSettingsForm.get('showBarLabel').value; + const showBarValue: boolean = this.barChartWidgetSettingsForm.get('showBarValue').value; + const showLegend: boolean = this.barChartWidgetSettingsForm.get('showLegend').value; + const showTooltip: boolean = this.barChartWidgetSettingsForm.get('showTooltip').value; + const tooltipShowDate: boolean = this.barChartWidgetSettingsForm.get('tooltipShowDate').value; + + if (showBarLabel) { + this.barChartWidgetSettingsForm.get('barLabelFont').enable(); + this.barChartWidgetSettingsForm.get('barLabelColor').enable(); + } else { + this.barChartWidgetSettingsForm.get('barLabelFont').disable(); + this.barChartWidgetSettingsForm.get('barLabelColor').disable(); + } + + if (showBarValue) { + this.barChartWidgetSettingsForm.get('barValueFont').enable(); + this.barChartWidgetSettingsForm.get('barValueColor').enable(); + } else { + this.barChartWidgetSettingsForm.get('barValueFont').disable(); + this.barChartWidgetSettingsForm.get('barValueColor').disable(); + } + + if (showLegend) { + this.barChartWidgetSettingsForm.get('legendPosition').enable(); + this.barChartWidgetSettingsForm.get('legendLabelFont').enable(); + this.barChartWidgetSettingsForm.get('legendLabelColor').enable(); + } else { + this.barChartWidgetSettingsForm.get('legendPosition').disable(); + this.barChartWidgetSettingsForm.get('legendLabelFont').disable(); + this.barChartWidgetSettingsForm.get('legendLabelColor').disable(); + } + + if (showTooltip) { + this.barChartWidgetSettingsForm.get('tooltipValueFont').enable(); + this.barChartWidgetSettingsForm.get('tooltipValueColor').enable(); + this.barChartWidgetSettingsForm.get('tooltipShowDate').enable({emitEvent: false}); + this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').enable(); + this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable(); + if (tooltipShowDate) { + this.barChartWidgetSettingsForm.get('tooltipDateFormat').enable(); + this.barChartWidgetSettingsForm.get('tooltipDateFont').enable(); + this.barChartWidgetSettingsForm.get('tooltipDateColor').enable(); + } else { + this.barChartWidgetSettingsForm.get('tooltipDateFormat').disable(); + this.barChartWidgetSettingsForm.get('tooltipDateFont').disable(); + this.barChartWidgetSettingsForm.get('tooltipDateColor').disable(); + } + } else { + this.barChartWidgetSettingsForm.get('tooltipValueFont').disable(); + this.barChartWidgetSettingsForm.get('tooltipValueColor').disable(); + this.barChartWidgetSettingsForm.get('tooltipShowDate').disable({emitEvent: false}); + this.barChartWidgetSettingsForm.get('tooltipDateFormat').disable(); + this.barChartWidgetSettingsForm.get('tooltipDateFont').disable(); + this.barChartWidgetSettingsForm.get('tooltipDateColor').disable(); + this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').disable(); + this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable(); + } + } + + private _tooltipValuePreviewFn(): string { + const units: string = this.widgetConfig.config.units; + const decimals: number = this.widgetConfig.config.decimals; + return formatValue(22, decimals, units, false); + } + + private _tooltipDatePreviewFn(): string { + const dateFormat: DateFormatSettings = this.barChartWidgetSettingsForm.get('tooltipDateFormat').value; + const processor = DateFormatProcessor.fromSettings(this.$injector, dateFormat); + processor.update(Date.now()); + return processor.formatted; + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html index a0e76da09c..3975ee5f98 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html @@ -70,14 +70,14 @@
{{ 'legend.position' | translate }}
- - {{ doughnutLegendPositionTranslationMap.get(pos) | translate }} + + {{ legendPositionTranslationMap.get(pos) | translate }}
-
{{ 'widgets.doughnut.legend-label' | translate }}
+
{{ 'legend.label' | translate }}
@@ -89,7 +89,7 @@
-
{{ 'widgets.doughnut.legend-value' | translate }}
+
{{ 'legend.value' | translate }}
@@ -109,13 +109,13 @@ - {{ 'widgets.doughnut.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
-
{{ 'widgets.doughnut.tooltip-value' | translate }}
+
{{ 'tooltip.value' | translate }}
@@ -138,14 +138,14 @@
-
{{ 'widgets.doughnut.tooltip-background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
{{ 'widgets.doughnut.tooltip-background-blur' | translate }}
+
{{ 'tooltip.background-blur' | translate }}
px
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts index 220fc7c320..e9ad95be1b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts @@ -15,7 +15,12 @@ /// import { Component } from '@angular/core'; -import { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models'; +import { + legendPositions, + legendPositionTranslationMap, + WidgetSettings, + WidgetSettingsComponent +} from '@shared/models/widget.models'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; @@ -26,8 +31,6 @@ import { doughnutLayoutImages, doughnutLayouts, doughnutLayoutTranslations, - doughnutLegendPositions, - doughnutLegendPositionTranslations, DoughnutTooltipValueType, doughnutTooltipValueTypes, doughnutTooltipValueTypeTranslations, @@ -55,9 +58,9 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent { doughnutLayoutImageMap: Map; - doughnutLegendPositions = doughnutLegendPositions; + legendPositions = legendPositions; - doughnutLegendPositionTranslationMap = doughnutLegendPositionTranslations; + legendPositionTranslationMap = legendPositionTranslationMap; doughnutTooltipValueTypes = doughnutTooltipValueTypes; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html index 155d09f53f..e3ce71491c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html @@ -62,7 +62,7 @@
-
{{ 'widgets.range-chart.legend-label' | translate }}
+
{{ 'legend.label' | translate }}
@@ -82,13 +82,13 @@ - {{ 'widgets.range-chart.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
-
{{ 'widgets.range-chart.tooltip-value' | translate }}
+
{{ 'tooltip.value' | translate }}
@@ -101,7 +101,7 @@
- {{ 'widgets.range-chart.tooltip-date' | translate }} + {{ 'tooltip.date' | translate }}
@@ -115,14 +115,14 @@
-
{{ 'widgets.range-chart.tooltip-background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
{{ 'widgets.range-chart.tooltip-background-blur' | translate }}
+
{{ 'tooltip.background-blur' | translate }}
px
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.ts index 562001e3c4..3e7d328adf 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.ts @@ -27,7 +27,7 @@ import { import { PageComponent } from '@shared/components/page.component'; import { commonFonts, - ComponentStyle, + ComponentStyle, cssUnit, Font, fontStyles, fontStyleTranslations, @@ -73,6 +73,9 @@ export class FontSettingsPanelComponent extends PageComponent implements OnInit @coerceBoolean() disabledLineHeight = false; + @Input() + forceSizeUnit: cssUnit; + @Input() popover: TbPopoverComponent; @@ -106,7 +109,8 @@ export class FontSettingsPanelComponent extends PageComponent implements OnInit this.fontFormGroup = this.fb.group( { size: [{value: this.font?.size, disabled: this.autoScale}, [Validators.min(0)]], - sizeUnit: [{ value: (this.font?.sizeUnit || 'px'), disabled: this.autoScale}, []], + sizeUnit: [{ value: (!!this.forceSizeUnit ? + this.forceSizeUnit : (this.font?.sizeUnit || 'px')), disabled: this.autoScale || !!this.forceSizeUnit}, []], family: [this.font?.family, []], weight: [this.font?.weight, []], style: [this.font?.style, []], @@ -150,11 +154,14 @@ export class FontSettingsPanelComponent extends PageComponent implements OnInit } clearFont() { - this.fontFormGroup.reset({sizeUnit: 'px'}); + this.fontFormGroup.reset({sizeUnit: this.forceSizeUnit || 'px'}); this.fontFormGroup.markAsDirty(); } private updatePreviewStyle(font: Font) { + if (!!this.forceSizeUnit) { + font = {...font, ...{sizeUnit: this.forceSizeUnit}}; + } this.previewStyle = {...(this.initialPreviewStyle || {}), ...textStyle(font)}; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings.component.ts index 0fc3b20da1..0530519c2d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings.component.ts @@ -16,7 +16,7 @@ import { Component, forwardRef, Input, OnInit, Renderer2, ViewContainerRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { ComponentStyle, Font } from '@shared/models/widget-settings.models'; +import { ComponentStyle, cssUnit, Font } from '@shared/models/widget-settings.models'; import { MatButton } from '@angular/material/button'; import { TbPopoverService } from '@shared/components/popover.service'; import { FontSettingsPanelComponent } from '@home/components/widget/lib/settings/common/font-settings-panel.component'; @@ -58,6 +58,9 @@ export class FontSettingsComponent implements OnInit, ControlValueAccessor { @coerceBoolean() disabledLineHeight = false; + @Input() + forceSizeUnit: cssUnit; + private modelValue: Font; private propagateChange = null; @@ -97,7 +100,8 @@ export class FontSettingsComponent implements OnInit, ControlValueAccessor { initialPreviewStyle: this.initialPreviewStyle, clearButton: this.clearButton, autoScale: this.autoScale, - disabledLineHeight: this.disabledLineHeight + disabledLineHeight: this.disabledLineHeight, + forceSizeUnit: this.forceSizeUnit }; if (isDefinedAndNotNull(this.previewText)) { const previewText = typeof this.previewText === 'string' ? this.previewText : this.previewText(); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/signal-strength-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/signal-strength-widget-settings.component.html index 808bbe11d9..19d3d98d5d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/signal-strength-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/signal-strength-widget-settings.component.html @@ -70,14 +70,14 @@ - {{ 'widgets.signal-strength.tooltip' | translate }} + {{ 'widget-config.tooltip' | translate }}
- {{ 'widgets.signal-strength.value' | translate }} + {{ 'tooltip.value' | translate }}
- {{ 'widgets.signal-strength.date' | translate }} + {{ 'tooltip.date' | translate }}
@@ -105,13 +105,13 @@
-
{{ 'widgets.signal-strength.background-color' | translate }}
+
{{ 'tooltip.background-color' | translate }}
-
widgets.signal-strength.background-blur
+
tooltip.background-blur
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts index 5d1bce1745..ed53f82ffd 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts @@ -308,6 +308,9 @@ import { import { RangeChartWidgetSettingsComponent } from '@home/components/widget/lib/settings/chart/range-chart-widget-settings.component'; +import { + BarChartWithLabelsWidgetSettingsComponent +} from '@home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component'; @NgModule({ declarations: [ @@ -420,7 +423,8 @@ import { ProgressBarWidgetSettingsComponent, LiquidLevelCardWidgetSettingsComponent, DoughnutWidgetSettingsComponent, - RangeChartWidgetSettingsComponent + RangeChartWidgetSettingsComponent, + BarChartWithLabelsWidgetSettingsComponent ], imports: [ CommonModule, @@ -538,7 +542,8 @@ import { ProgressBarWidgetSettingsComponent, LiquidLevelCardWidgetSettingsComponent, DoughnutWidgetSettingsComponent, - RangeChartWidgetSettingsComponent + RangeChartWidgetSettingsComponent, + BarChartWithLabelsWidgetSettingsComponent ] }) export class WidgetSettingsModule { @@ -622,5 +627,6 @@ export const widgetSettingsComponentsMap: {[key: string]: Type max) { - newIntervalMs = max; + } else if (newIntervalMs >= max && updateToPreferred) { + newIntervalMs = this.timeService.boundMaxInterval(max / 7); } if (!this.advanced) { newIntervalMs = this.timeService.boundToPredefinedInterval(min, max, newIntervalMs); @@ -159,7 +159,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor { } } - updateView() { + updateView(updateToPreferred = false) { if (!this.rendered) { return; } @@ -178,7 +178,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor { } this.modelValue = value; this.propagateChange(this.modelValue); - this.boundInterval(); + this.boundInterval(updateToPreferred); } calculateIntervalMs(): number { diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 12de697bc8..de8d7706d5 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -3159,7 +3159,9 @@ "weeks": "(week ago)", "months": "(month ago)", "years": "(year ago)" - } + }, + "label": "Label", + "value": "Value" }, "login": { "login": "Login", @@ -4276,6 +4278,12 @@ "displayTypePrefix": "Display Realtime/History prefix", "preview": "Preview" }, + "tooltip": { + "value": "Value", + "date": "Date", + "background-color": "Background color", + "background-blur": "Background blur" + }, "unit": { "millimeter": "Millimeter", "centimeter": "Centimeter", @@ -5152,6 +5160,12 @@ "blur": "Blur", "preview": "Preview" }, + "bar-chart": { + "bar-appearance": "Bar appearance", + "label-on-bar": "Label on bar", + "value-on-bar": "Value on bar", + "bar-chart-card-style": "Bar chart card style" + }, "battery-level": { "layout": "Layout", "layout-vertical-solid": "Vertical. Solid", @@ -5177,9 +5191,6 @@ "date": "Date", "active-bars-color": "Active signal bars color", "inactive-bars-color": "Inactive signal bars color", - "tooltip": "Tooltip", - "background-color": "Background color", - "background-blur": "Background blur", "signal-strength-card-style": "Signal strength card style" }, "chart": { @@ -5422,18 +5433,8 @@ "clockwise-layout": "Clockwise layout", "sort-series": "Sort series by label", "central-total-value": "Central total value", - "legend-position-top": "Top", - "legend-position-bottom": "Bottom", - "legend-position-left": "Left", - "legend-position-right": "Right", - "legend-label": "Label", - "legend-value": "Value", - "tooltip": "Tooltip", - "tooltip-value": "Value", "tooltip-value-type-absolute": "Absolute", "tooltip-value-type-percentage": "Percentage", - "tooltip-background-color": "Background color", - "tooltip-background-blur": "Background blur", "doughnut-card-style": "Doughnut card style" }, "entities-hierarchy": { @@ -5915,12 +5916,6 @@ "range-colors": "Range colors", "out-of-range-color": "Out of range color", "fill-area": "Fill area", - "legend-label": "Label", - "tooltip": "Tooltip", - "tooltip-value": "Value", - "tooltip-date": "Date", - "tooltip-background-color": "Background color", - "tooltip-background-blur": "Background blur", "range-chart-card-style": "Range chart card style" }, "rpc": { diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json index f0d07fa506..28c4d20f59 100644 --- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json +++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json @@ -3087,7 +3087,9 @@ "weeks": "（一周前）", "months": "（一个月前）", "years": "（一年前）" - } + }, + "label": "标签", + "value": "值" }, "login": { "login": "登录", @@ -4197,6 +4199,12 @@ "displayTypePrefix": "显示实时/历史前缀", "preview": "预览" }, + "tooltip": { + "value": "值", + "date": "日期", + "background-color": "背景颜色", + "background-blur": "背景模糊" + }, "unit": { "millimeter": "mm", "centimeter": "cm", @@ -5082,9 +5090,6 @@ "date": "日期", "active-bars-color": "活动信号条颜色", "inactive-bars-color": "非活动信号条颜色", - "tooltip": "文字提示", - "background-color": "背景颜色", - "background-blur": "背景模糊", "signal-strength-card-style": "信号强度卡片样式" }, "chart": { @@ -5327,18 +5332,8 @@ "clockwise-layout": "顺时针布局", "sort-series": "按标签对系列排序", "central-total-value": "中央总计值", - "legend-position-top": "顶部", - "legend-position-bottom": "底部", - "legend-position-left": "左侧", - "legend-position-right": "右侧", - "legend-label": "标签", - "legend-value": "值", - "tooltip": "文字提示", - "tooltip-value": "值", "tooltip-value-type-absolute": "绝对值", "tooltip-value-type-percentage": "百分比", - "tooltip-background-color": "背景颜色", - "tooltip-background-blur": "背景模糊", "doughnut-card-style": "圆环样式" }, "entities-hierarchy": { @@ -5820,12 +5815,6 @@ "range-colors": "范围颜色", "out-of-range-color": "超出范围颜色", "fill-area": "填充区域", - "legend-label": "标签", - "tooltip": "文字提示", - "tooltip-value": "值", - "tooltip-date": "日期", - "tooltip-background-color": "背景颜色", - "tooltip-background-blur": "背景模糊", "range-chart-card-style": "范围图表卡片样式" }, "rpc": {