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

UI: Refactoring

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-03-10 18:36:17 +02:00
parent 7a4493887a
commit 1dbd022e89
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View File

@ -47,7 +47,7 @@ import {
} from '@app/shared/models/dashboard.models'; } from '@app/shared/models/dashboard.models';
import { WINDOW } from '@core/services/window.service'; import { WINDOW } from '@core/services/window.service';
import { WindowMessage } from '@shared/models/window-message.model'; import { WindowMessage } from '@shared/models/window-message.model';
import { deepClone, isDefined } from '@app/core/utils'; import { deepClone, isDefined, isDefinedAndNotNull } from '@app/core/utils';
import { import {
DashboardContext, DashboardContext,
DashboardPageLayout, DashboardPageLayout,
@ -892,10 +892,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
const config: WidgetConfig = JSON.parse(widgetTypeInfo.defaultConfig); const config: WidgetConfig = JSON.parse(widgetTypeInfo.defaultConfig);
config.title = 'New ' + widgetTypeInfo.widgetName; config.title = 'New ' + widgetTypeInfo.widgetName;
config.datasources = []; config.datasources = [];
if (isDefinedAndNotNull(config.alarmSource)) {
config.alarmSource = { config.alarmSource = {
type: DatasourceType.entity, type: DatasourceType.entity,
dataKeys: config.alarmSource.dataKeys dataKeys: config.alarmSource.dataKeys || []
}; };
}
const newWidget: Widget = { const newWidget: Widget = {
isSystemType: widget.isSystemType, isSystemType: widget.isSystemType,
bundleAlias: widget.bundleAlias, bundleAlias: widget.bundleAlias,

1
ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
View File

@ -526,6 +526,7 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, Cont
const datasourceFormGroup = this.fb.group( const datasourceFormGroup = this.fb.group(
{ {
type: [datasource ? datasource.type : null, [Validators.required]], type: [datasource ? datasource.type : null, [Validators.required]],
name: [datasource ? datasource.name : null, []],
entityAliasId: [datasource ? datasource.entityAliasId : null, entityAliasId: [datasource ? datasource.entityAliasId : null,
datasource && (datasource.type === DatasourceType.entity || datasource && (datasource.type === DatasourceType.entity ||
datasource.type === DatasourceType.entityCount) ? [Validators.required] : []], datasource.type === DatasourceType.entityCount) ? [Validators.required] : []],