Browse Source

Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/queue-entity

pull/6534/head
YevhenBondarenko 4 years ago
parent
commit
7471e73326
  1. 2
      ui-ngx/src/app/modules/common/modules-map.ts
  2. 2
      ui-ngx/src/app/shared/models/settings.models.ts

2
ui-ngx/src/app/modules/common/modules-map.ts

@ -157,6 +157,7 @@ import * as ImageInputComponent from '@shared/components/image-input.component';
import * as FileInputComponent from '@shared/components/file-input.component'; import * as FileInputComponent from '@shared/components/file-input.component';
import * as MessageTypeAutocompleteComponent from '@shared/components/message-type-autocomplete.component'; import * as MessageTypeAutocompleteComponent from '@shared/components/message-type-autocomplete.component';
import * as KeyValMapComponent from '@shared/components/kv-map.component'; import * as KeyValMapComponent from '@shared/components/kv-map.component';
import * as MultipleImageInputComponent from '@shared/components/multiple-image-input.component';
import * as NavTreeComponent from '@shared/components/nav-tree.component'; import * as NavTreeComponent from '@shared/components/nav-tree.component';
import * as LedLightComponent from '@shared/components/led-light.component'; import * as LedLightComponent from '@shared/components/led-light.component';
import * as TbJsonToStringDirective from '@shared/components/directives/tb-json-to-string.directive'; import * as TbJsonToStringDirective from '@shared/components/directives/tb-json-to-string.directive';
@ -441,6 +442,7 @@ class ModulesMap implements IModulesMap {
'@shared/components/file-input.component': FileInputComponent, '@shared/components/file-input.component': FileInputComponent,
'@shared/components/message-type-autocomplete.component': MessageTypeAutocompleteComponent, '@shared/components/message-type-autocomplete.component': MessageTypeAutocompleteComponent,
'@shared/components/kv-map.component': KeyValMapComponent, '@shared/components/kv-map.component': KeyValMapComponent,
'@shared/components/multiple-image-input.component': MultipleImageInputComponent,
'@shared/components/nav-tree.component': NavTreeComponent, '@shared/components/nav-tree.component': NavTreeComponent,
'@shared/components/led-light.component': LedLightComponent, '@shared/components/led-light.component': LedLightComponent,
'@shared/components/directives/tb-json-to-string.directive': TbJsonToStringDirective, '@shared/components/directives/tb-json-to-string.directive': TbJsonToStringDirective,

2
ui-ngx/src/app/shared/models/settings.models.ts

@ -141,7 +141,7 @@ export enum TypeOfNumber {
Abbreviated = 'Abbreviated' Abbreviated = 'Abbreviated'
} }
interface TypeDescriptor { export interface TypeDescriptor {
name: string; name: string;
value: number; value: number;
} }

Loading…
Cancel
Save