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

Update style and type

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-05-14 20:54:47 +03:00
parent c24b46996a
commit 140ae29fe6
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
View File

@ -14,22 +14,28 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { MapProviders, UnitedMapSettings, providerSets, hereProviders, defaultSettings } from './map-models'; import { defaultSettings, hereProviders, MapProviders, providerSets, UnitedMapSettings } from './map-models';
import LeafletMap from './leaflet-map'; import LeafletMap from './leaflet-map';
import { import {
commonMapSettingsSchema, commonMapSettingsSchema,
routeMapSettingsSchema, mapPolygonSchema,
markerClusteringSettingsSchema, mapProviderSchema,
markerClusteringSettingsSchemaLeaflet, markerClusteringSettingsSchema,
mapProviderSchema, markerClusteringSettingsSchemaLeaflet,
mapPolygonSchema routeMapSettingsSchema
} from './schemes'; } from './schemes';
import { MapWidgetStaticInterface, MapWidgetInterface } from './map-widget.interface'; import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface';
import { initSchema, addToSchema, mergeSchemes, addCondition, addGroupInfo } from '@core/schema-utils'; import { addCondition, addGroupInfo, addToSchema, initSchema, mergeSchemes } from '@core/schema-utils';
import { of, Subject } from 'rxjs'; import { of, Subject } from 'rxjs';
import { WidgetContext } from '@app/modules/home/models/widget-component.models'; import { WidgetContext } from '@app/modules/home/models/widget-component.models';
import { getDefCenterPosition, parseArray, parseData, parseFunction, parseWithTranslation } from './maps-utils'; import { getDefCenterPosition, parseArray, parseData, parseFunction, parseWithTranslation } from './maps-utils';
import { JsonSettingsSchema, WidgetActionDescriptor, DatasourceType, widgetType, Datasource } from '@shared/models/widget.models'; import {
Datasource,
DatasourceType,
JsonSettingsSchema,
WidgetActionDescriptor,
widgetType
} from '@shared/models/widget.models';
import { EntityId } from '@shared/models/id/entity-id'; import { EntityId } from '@shared/models/id/entity-id';
import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models'; import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
import { AttributeService } from '@core/http/attribute.service'; import { AttributeService } from '@core/http/attribute.service';
@ -39,7 +45,13 @@ import { UtilsService } from '@core/services/utils.service';
// @dynamic // @dynamic
export class MapWidgetController implements MapWidgetInterface { export class MapWidgetController implements MapWidgetInterface {
constructor(public mapProvider: MapProviders, private drawRoutes: boolean, public ctx: WidgetContext, $element: HTMLElement, isEdit?) { constructor(
public mapProvider: MapProviders,
private drawRoutes: boolean,
public ctx: WidgetContext,
$element: HTMLElement,
isEdit?: boolean
) {
if (this.map) { if (this.map) {
this.map.map.remove(); this.map.map.remove();
delete this.map; delete this.map;

2
ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss
View File

@ -126,7 +126,7 @@
} }
.speed-select { .speed-select {
width: 50px; width: 70px;
margin-left: 10px; margin-left: 10px;
margin-top: 10px; margin-top: 10px;
} }