Browse Source
Merge pull request #19164 from abpframework/auto-merge/rel-8-1/2546
Merge branch dev with rel-8.1
pull/19180/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
4 additions and
7 deletions
-
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
|
|
@ -1,7 +1,4 @@ |
|
|
<ng-container |
|
|
<ng-container [ngSwitch]="getComponent(prop)" *abpPermission="prop.permission; runChangeDetection: false"> |
|
|
[ngSwitch]="getComponent(prop)" |
|
|
|
|
|
*abpPermission="prop.permission; runChangeDetection: false" |
|
|
|
|
|
> |
|
|
|
|
|
<ng-template ngSwitchCase="template"> |
|
|
<ng-template ngSwitchCase="template"> |
|
|
<ng-container *ngComponentOutlet="prop.template; injector: injectorForCustomComponent"> |
|
|
<ng-container *ngComponentOutlet="prop.template; injector: injectorForCustomComponent"> |
|
|
</ng-container> |
|
|
</ng-container> |
|
|
@ -178,8 +175,8 @@ |
|
|
{{ prop.displayName | abpLocalization }} |
|
|
{{ prop.displayName | abpLocalization }} |
|
|
} |
|
|
} |
|
|
{{ asterisk }} |
|
|
{{ asterisk }} |
|
|
|
|
|
@if (prop.tooltip) { |
|
|
|
|
|
<i [ngbTooltip]="prop.tooltip.text | abpLocalization" [placement]="prop.tooltip.placement || 'auto'" container="body" class="bi bi-info-circle"></i> |
|
|
|
|
|
} |
|
|
</label> |
|
|
</label> |
|
|
@if (prop.tooltip) { |
|
|
|
|
|
<i [ngbTooltip]="prop.tooltip.text | abpLocalization" [placement]="prop.tooltip.placement || 'auto'" container="body" class="bi bi-info-circle ms-1"></i> |
|
|
|
|
|
} |
|
|
|
|
|
</ng-template> |
|
|
</ng-template> |
|
|
|
