diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index e71e6ae745..53d5342b49 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -114,6 +114,12 @@
+
{{ 'widget-config.drop-shadow' | translate }}
@@ -126,7 +132,6 @@
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
index 999e7e55ff..1f418224dd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
@@ -224,6 +224,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
color: [null, []],
padding: [null, []],
margin: [null, []],
+ borderRadius: [null, []],
widgetStyle: [null, []],
widgetCss: [null, []],
titleStyle: [null, []],
@@ -484,6 +485,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
color: config.color,
padding: config.padding,
margin: config.margin,
+ borderRadius: config.borderRadius,
widgetStyle: isDefined(config.widgetStyle) ? config.widgetStyle : {},
widgetCss: isDefined(config.widgetCss) ? config.widgetCss : '',
titleStyle: isDefined(config.titleStyle) ? config.titleStyle : {
diff --git a/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts b/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts
index 2c79ef7b68..e9787260bb 100644
--- a/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts
+++ b/ui-ngx/src/app/modules/home/models/dashboard-component.models.ts
@@ -328,6 +328,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
backgroundColor: string;
padding: string;
margin: string;
+ borderRadius: string;
title: string;
customTranslatedTitle: string;
@@ -427,6 +428,7 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
this.backgroundColor = this.widget.config.backgroundColor || '#fff';
this.padding = this.widget.config.padding || '8px';
this.margin = this.widget.config.margin || '0px';
+ this.borderRadius = this.widget.config.borderRadius;
this.title = isDefined(this.widgetContext.widgetTitle)
&& this.widgetContext.widgetTitle.length ? this.widgetContext.widgetTitle : this.widget.config.title;
@@ -478,7 +480,8 @@ export class DashboardWidget implements GridsterItem, IDashboardWidget {
color: this.color,
backgroundColor: this.backgroundColor,
padding: this.padding,
- margin: this.margin};
+ margin: this.margin,
+ borderRadius: this.borderRadius};
if (this.widget.config.widgetStyle) {
this.style = {...this.style, ...this.widget.config.widgetStyle};
}
diff --git a/ui-ngx/src/app/shared/components/json-object-edit.component.ts b/ui-ngx/src/app/shared/components/json-object-edit.component.ts
index ad2e3abd2f..f7e3116b0f 100644
--- a/ui-ngx/src/app/shared/components/json-object-edit.component.ts
+++ b/ui-ngx/src/app/shared/components/json-object-edit.component.ts
@@ -14,7 +14,16 @@
/// limitations under the License.
///
-import { Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import {
+ ChangeDetectorRef,
+ Component,
+ ElementRef,
+ forwardRef,
+ Input,
+ OnDestroy,
+ OnInit,
+ ViewChild
+} from '@angular/core';
import { ControlValueAccessor, UntypedFormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR, Validator } from '@angular/forms';
import { Ace } from 'ace-builds';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
@@ -104,7 +113,8 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
constructor(public elementRef: ElementRef,
protected store: Store,
- private raf: RafService) {
+ private raf: RafService,
+ private cd: ChangeDetectorRef) {
}
ngOnInit(): void {
@@ -283,6 +293,7 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
}
this.modelValue = data;
this.propagateChange(data);
+ this.cd.markForCheck();
}
}
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index 55a1070c41..de4c5332f7 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -637,6 +637,7 @@ export interface WidgetConfig {
backgroundColor?: string;
padding?: string;
margin?: string;
+ borderRadius?: string;
widgetStyle?: {[klass: string]: any};
widgetCss?: string;
titleStyle?: {[klass: string]: any};
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 ac78048f16..85497e004b 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4190,6 +4190,7 @@
"enable-fullscreen": "Enable fullscreen",
"background-color": "Background color",
"text-color": "Text color",
+ "border-radius": "Border radius",
"padding": "Padding",
"margin": "Margin",
"widget-style": "Widget style",