diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html index cca0f284f9..41af1cd714 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.html @@ -1,92 +1,94 @@ - - @if (actionsTemplate || (actionList.length && hasAtLeastOnePermittedAction)) { - - - - - @if (isVisibleActions(row)) { - - } +@if (!ssrService.isSsr) { + + @if (actionsTemplate || (actionList.length && hasAtLeastOnePermittedAction)) { + + + + + @if (isVisibleActions(row)) { + + } + - - - } - @for (prop of propList; track prop.name; let i = $index) { - - - @if (prop.tooltip) { - + + } + @for (prop of propList; track prop.name; let i = $index) { + + + @if (prop.tooltip) { + {{ column.name }} - } @else { - {{ column.name }} - } - - - - - @if (!row['_' + prop.name].component) { - @if (prop.type === 'datetime' || prop.type === 'date' || prop.type === 'time') { -
+ + + @if (!row['_' + prop.name].component) { + @if (prop.type === 'datetime' || prop.type === 'date' || prop.type === 'time') { +
- } @else { -
+ } @else { +
- } - } @else { -
+ } + } @else { + - } + >
+ } +
- -
-
- } -
+ + + } + +} diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts index 3b5c7d36b1..1f90198b75 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-table/extensible-table.component.ts @@ -28,7 +28,7 @@ import { LocalizationModule, PermissionDirective, PermissionService, - TimezoneService, + SSRService, UtcToLocalPipe, } from '@abp/ng.core'; import { @@ -78,9 +78,9 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn protected readonly cdr = inject(ChangeDetectorRef); protected readonly locale = inject(LOCALE_ID); protected readonly config = inject(ConfigStateService); - protected readonly timeZoneService = inject(TimezoneService); protected readonly entityPropTypeClasses = inject(ENTITY_PROP_TYPE_CLASSES); protected readonly permissionService = inject(PermissionService); + protected readonly ssrService = inject(SSRService); protected _actionsText!: string; @Input() @@ -227,8 +227,8 @@ export class ExtensibleTableComponent implements OnChanges, AfterViewIn ngAfterViewInit(): void { this.list?.requestStatus$?.pipe(filter(status => status === 'loading')).subscribe(() => { - this.data = []; - this.cdr.markForCheck(); - }); + this.data = []; + this.cdr.markForCheck(); + }); } }