dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add default color for correct work gradient

Browse Source
This commit is contained in:
ArtemDzhereleiko 2021-09-23 18:15:29 +03:00
parent 7e91f2c5e2
commit a83f328092
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/lib/canvas-digital-gauge.ts
View File

@ -276,7 +276,6 @@ export class CanvasDigitalGauge extends BaseGauge {
} }
} }
} }
options.ticksValue = []; options.ticksValue = [];
for (const tick of options.ticks) { for (const tick of options.ticks) {
if (tick !== null) { if (tick !== null) {
@ -836,6 +835,7 @@ function getProgressColor(progress: number, colorsRange: DigitalGaugeColorRange[
return color.toRgbString(); return color.toRgbString();
} }
} }
return colorsRange[colorsRange.length - 1].rgbString;
} }
function drawArcGlow(context: DigitalGaugeCanvasRenderingContext2D, function drawArcGlow(context: DigitalGaugeCanvasRenderingContext2D,

6
ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts
View File

@ -266,7 +266,6 @@ export class TbCanvasDigitalGauge {
init() { init() {
let updateSetting = false; let updateSetting = false;
if (this.localSettings.useFixedLevelColor && this.localSettings.fixedLevelColors?.length > 0) { if (this.localSettings.useFixedLevelColor && this.localSettings.fixedLevelColors?.length > 0) {
this.localSettings.levelColors = this.settingLevelColorsSubscribe(this.localSettings.fixedLevelColors); this.localSettings.levelColors = this.settingLevelColorsSubscribe(this.localSettings.fixedLevelColors);
updateSetting = true; updateSetting = true;
@ -285,6 +284,11 @@ export class TbCanvasDigitalGauge {
let levelColorsDatasource: Datasource[] = []; let levelColorsDatasource: Datasource[] = [];
const predefineLevelColors: ColorLevelSetting[] = []; const predefineLevelColors: ColorLevelSetting[] = [];
predefineLevelColors.push({
value: -Infinity,
color: this.ctx.data[0].dataKey.color
});
function setLevelColor(levelSetting: AttributeSourceProperty, color: string) { function setLevelColor(levelSetting: AttributeSourceProperty, color: string) {
if (levelSetting.valueSource === 'predefinedValue' && isFinite(levelSetting.value)) { if (levelSetting.valueSource === 'predefinedValue' && isFinite(levelSetting.value)) {
predefineLevelColors.push({ predefineLevelColors.push({