Merge pull request #23026 from abpframework/auto-merge/rel-9-2/3769

Merge branch dev with rel-9.2

npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html

@@ -24,9 +24,13 @@
           </div>
           <div class="col-12 col-md-9">
             @if (settings.length) {
-              <div class="tab-content">
-                <div class="tab-pane fade show active" [id]="selected.name + '-tab'" role="tabpanel">
-                  <ng-container *ngComponentOutlet="selected.component"></ng-container>
+              <div class="tab-content pt-0">
+                <div
+                  class="tab-pane fade show active"
+                  [id]="selected.name + '-tab'"
+                  role="tabpanel"
+                >
+                  <ng-container *ngComponentOutlet="selected.component" />
                 </div>
               </div>
             }

npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts

@@ -1,6 +1,6 @@
 import { ABP, ForDirective, LocalizationPipe, PermissionDirective } from '@abp/ng.core';
 import { SettingTabsService } from '@abp/ng.setting-management/config';
-import { Component, OnDestroy, OnInit, TrackByFunction } from '@angular/core';
+import { Component, inject, OnDestroy, OnInit, TrackByFunction } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { PageComponent } from '@abp/ng.components/page';
@@ -11,15 +11,15 @@ import { PageComponent } from '@abp/ng.components/page';
   imports: [CommonModule, PageComponent, LocalizationPipe, PermissionDirective, ForDirective],
 })
 export class SettingManagementComponent implements OnDestroy, OnInit {
+  private settingTabsService = inject(SettingTabsService);
   private subscription = new Subscription();
+
   settings: ABP.Tab[] = [];
 
   selected!: ABP.Tab;
 
   trackByFn: TrackByFunction<ABP.Tab> = (_, item) => item.name;
 
-  constructor(private settingTabsService: SettingTabsService) {}
-
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }