Browse Source

Merge pull request #23659 from abpframework/auto-merge/rel-9-3/3965

Merge branch dev with rel-9.3
pull/23667/head
Ma Liming 1 year ago
committed by GitHub
parent
commit
976c62cfc2
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 11
      npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts

11
npm/ng-packs/packages/theme-shared/src/lib/directives/ngx-datatable-list.directive.ts

@ -111,10 +111,13 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck {
const spinnerRef = this.viewContainerRef.createComponent(SpinnerComponent);
const spinnerElement = spinnerRef.location.nativeElement;
if (placeholder?.parentNode === parent) {
this.renderer.insertBefore(parent, spinnerElement, placeholder);
this.renderer.insertBefore(parent, spinnerElement, parent.firstChild);
const placeholderParent = placeholder?.parentNode as Element | null;
if (placeholderParent) {
this.renderer.removeChild(placeholderParent, placeholder);
}
this.renderer.removeChild(parent, placeholder);
}
protected setInitialValues() {
@ -185,4 +188,4 @@ export class NgxDatatableListDirective implements OnChanges, OnInit, DoCheck {
this.setTablePage(maxPage);
}
}
}
}
Loading…
Cancel
Save