Browse Source
Merge pull request #13052 from vvlladd28/improvement/map/help-popover-style
Minor improvement in map widget
pull/13059/head
Igor Kulikov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with
16 additions and
7 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-resources-tabs.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-color-settings-panel.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-color-settings-panel.component.scss
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/data-layer-pattern-settings.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/marker-clustering-settings.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/marker-image-settings-panel.component.scss
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/map/trip-timeline-settings.component.html
-
ui-ngx/src/assets/locale/locale.constant-en_US.json
|
|
|
@ -60,7 +60,8 @@ |
|
|
|
[validationArgs]="[]" |
|
|
|
[editorCompleter]="customPrettyActionEditorCompleter" |
|
|
|
functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}" |
|
|
|
[helpId]="helpId"> |
|
|
|
[helpId]="helpId" |
|
|
|
[helpPopupStyle]="{width: '900px'}"> |
|
|
|
</tb-js-func> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
@ -101,7 +101,8 @@ |
|
|
|
[validationArgs]="[]" |
|
|
|
[editorCompleter]="customPrettyActionEditorCompleter" |
|
|
|
functionTitle="{{ 'widget-action.custom-pretty-function' | translate }}" |
|
|
|
[helpId]="helpId"> |
|
|
|
[helpId]="helpId" |
|
|
|
[helpPopupStyle]="{width: '900px'}"> |
|
|
|
</tb-js-func> |
|
|
|
</mat-tab> |
|
|
|
</mat-tab-group> |
|
|
|
|
|
|
|
@ -256,6 +256,7 @@ |
|
|
|
[editorCompleter]="customActionEditorCompleter" |
|
|
|
withModules |
|
|
|
helpId="widget/action/custom_action_fn" |
|
|
|
[helpPopupStyle]="{width: '900px'}" |
|
|
|
></tb-js-func> |
|
|
|
</ng-template> |
|
|
|
<ng-template [ngSwitchCase]="widgetActionType.placeMapItem"> |
|
|
|
|
|
|
|
@ -95,7 +95,8 @@ |
|
|
|
[functionArgs]="['data', 'dsData']" |
|
|
|
[globalVariables]="functionScopeVariables" |
|
|
|
functionTitle="{{ 'widgets.maps.data-layer.color-function' | translate }}" |
|
|
|
[helpId]="helpId"> |
|
|
|
[helpId]="helpId" |
|
|
|
[helpPopupStyle]="{width: '900px'}"> |
|
|
|
</tb-js-func> |
|
|
|
</div> |
|
|
|
</ng-template> |
|
|
|
|
|
|
|
@ -43,6 +43,7 @@ |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
min-height: 0; |
|
|
|
overflow: auto; |
|
|
|
} |
|
|
|
.tb-data-layer-color-settings-panel-buttons { |
|
|
|
height: 40px; |
|
|
|
|
|
|
|
@ -46,7 +46,8 @@ |
|
|
|
[globalVariables]="functionScopeVariables" |
|
|
|
[functionArgs]="['data', 'dsData']" |
|
|
|
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> |
|
|
|
<ng-container *ngIf="patternType === 'tooltip'"> |
|
|
|
<div class="tb-form-row space-between column-xs"> |
|
|
|
|
|
|
|
@ -88,7 +88,8 @@ |
|
|
|
[globalVariables]="functionScopeVariables" |
|
|
|
[functionArgs]="['data', 'childCount']" |
|
|
|
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> |
|
|
|
</ng-template> |
|
|
|
</mat-expansion-panel> |
|
|
|
|
|
|
|
@ -41,6 +41,7 @@ |
|
|
|
display: flex; |
|
|
|
flex-direction: column; |
|
|
|
min-height: 0; |
|
|
|
overflow: auto; |
|
|
|
} |
|
|
|
.tb-marker-image-settings-panel-buttons { |
|
|
|
height: 40px; |
|
|
|
|
|
|
|
@ -70,7 +70,8 @@ |
|
|
|
[globalVariables]="functionScopeVariables" |
|
|
|
[functionArgs]="['data', 'dsData']" |
|
|
|
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> |
|
|
|
</ng-template> |
|
|
|
</mat-expansion-panel> |
|
|
|
|
|
|
|
@ -8013,7 +8013,7 @@ |
|
|
|
"pattern-type-function": "Function", |
|
|
|
"label-pattern": "Label (pattern examples: '${entityName}', '${entityName}: (Text ${keyName} units.)' )", |
|
|
|
"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-trigger": "Tooltip trigger", |
|
|
|
"tooltip-trigger-click": "Show tooltip on click", |
|
|
|
|