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

UI[Map]: Fix help popover styles in settings; make popover body scrollable

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2025-03-27 12:30:10 +02:00
parent 151a087e45
commit 896a7f0b45
10 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
View File

@ -60,7 +60,8 @@
[validationArgs]="[]" [validationArgs]="[]"
[editorCompleter]="customPrettyActionEditorCompleter" [editorCompleter]="customPrettyActionEditorCompleter"
functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}" functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}"
[helpId]="helpId"> [helpId]="helpId"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
</div> </div>
</div> </div>

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html
View File

@ -101,7 +101,8 @@
[validationArgs]="[]" [validationArgs]="[]"
[editorCompleter]="customPrettyActionEditorCompleter" [editorCompleter]="customPrettyActionEditorCompleter"
functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}" functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}"
[helpId]="helpId"> [helpId]="helpId"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>

1
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html
View File

@ -256,6 +256,7 @@
[editorCompleter]="customActionEditorCompleter" [editorCompleter]="customActionEditorCompleter"
withModules withModules
helpId="widget/action/custom_action_fn" helpId="widget/action/custom_action_fn"
[helpPopupStyle]="{width: '900px'}"
></tb-js-func> ></tb-js-func>
</ng-template> </ng-template>
<ng-template [ngSwitchCase]="widgetActionType.placeMapItem"> <ng-template [ngSwitchCase]="widgetActionType.placeMapItem">

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-color-settings-panel.component.html
View File

@ -95,7 +95,8 @@
[functionArgs]="['data', 'dsData']" [functionArgs]="['data', 'dsData']"
[globalVariables]="functionScopeVariables" [globalVariables]="functionScopeVariables"
functionTitle="{{ 'widgets.maps.data-layer.color-function' | translate }}" functionTitle="{{ 'widgets.maps.data-layer.color-function' | translate }}"
[helpId]="helpId"> [helpId]="helpId"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
</div> </div>
</ng-template> </ng-template>

1
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-color-settings-panel.component.scss
View File

@ -43,6 +43,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0; min-height: 0;
overflow: auto;
} }
.tb-data-layer-color-settings-panel-buttons { .tb-data-layer-color-settings-panel-buttons {
height: 40px; height: 40px;

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-pattern-settings.component.html
View File

@ -46,7 +46,8 @@
[globalVariables]="functionScopeVariables" [globalVariables]="functionScopeVariables"
[functionArgs]="['data', 'dsData']" [functionArgs]="['data', 'dsData']"
functionTitle="{{ (patternType === 'label' ? 'widgets.maps.data-layer.label-function' : 'widgets.maps.data-layer.tooltip-function') | translate }}" functionTitle="{{ (patternType === 'label' ? 'widgets.maps.data-layer.label-function' : 'widgets.maps.data-layer.tooltip-function') | translate }}"
[helpId]="helpId"> [helpId]="helpId"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
<ng-container *ngIf="patternType === 'tooltip'"> <ng-container *ngIf="patternType === 'tooltip'">
<div class="tb-form-row space-between column-xs"> <div class="tb-form-row space-between column-xs">

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/marker-clustering-settings.component.html
View File

@ -88,7 +88,8 @@
[globalVariables]="functionScopeVariables" [globalVariables]="functionScopeVariables"
[functionArgs]="['data', 'childCount']" [functionArgs]="['data', 'childCount']"
functionTitle="{{ 'widgets.maps.data-layer.marker.clustering.marker-color-function' | translate }}" functionTitle="{{ 'widgets.maps.data-layer.marker.clustering.marker-color-function' | translate }}"
helpId="widget/lib/map/clustering_color_fn"> helpId="widget/lib/map/clustering_color_fn"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
</ng-template> </ng-template>
</mat-expansion-panel> </mat-expansion-panel>

1
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/marker-image-settings-panel.component.scss
View File

@ -41,6 +41,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 0; min-height: 0;
overflow: auto;
} }
.tb-marker-image-settings-panel-buttons { .tb-marker-image-settings-panel-buttons {
height: 40px; height: 40px;

3
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/trip-timeline-settings.component.html
View File

@ -70,7 +70,8 @@
[globalVariables]="functionScopeVariables" [globalVariables]="functionScopeVariables"
[functionArgs]="['data', 'dsData']" [functionArgs]="['data', 'dsData']"
functionTitle="{{ 'widgets.maps.timeline.location-snap-filter-function' | translate }}" functionTitle="{{ 'widgets.maps.timeline.location-snap-filter-function' | translate }}"
helpId="widget/lib/map/trip_point_as_anchor_fn"> helpId="widget/lib/map/trip_point_as_anchor_fn"
[helpPopupStyle]="{width: '900px'}">
</tb-js-func> </tb-js-func>
</ng-template> </ng-template>
</mat-expansion-panel> </mat-expansion-panel>

2
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -8013,7 +8013,7 @@
"pattern-type-function": "Function", "pattern-type-function": "Function",
"label-pattern": "Label (pattern examples: '${entityName}', '${entityName}: (Text ${keyName} units.)' )", "label-pattern": "Label (pattern examples: '${entityName}', '${entityName}: (Text ${keyName} units.)' )",
"label-function": "Label function", "label-function": "Label function",
"tooltip-pattern": "Tooltip (for ex. 'Text ${keyName} units.' or <link-act name='my-action'>Link text</link-act>')", "tooltip-pattern": "Tooltip (for ex. 'Text ${keyName} units.' or <link-act name='my-action'>Link text</link-act>)",
"tooltip-function": "Tooltip function", "tooltip-function": "Tooltip function",
"tooltip-trigger": "Tooltip trigger", "tooltip-trigger": "Tooltip trigger",
"tooltip-trigger-click": "Show tooltip on click", "tooltip-trigger-click": "Show tooltip on click",