Merge pull request #20490 from abpframework/auto-merge/rel-8-2/2891

Merge branch rel-8.3 with rel-8.2

npm/ng-packs/packages/components/extensible/src/lib/components/date-time-picker/extensible-date-time-picker.component.ts

@@ -2,11 +2,13 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  inject,
   Input,
   Optional,
   SkipSelf,
   ViewChild,
 } from '@angular/core';
+import { CommonModule } from '@angular/common';
 import { ControlContainer, ReactiveFormsModule } from '@angular/forms';
 import {
   NgbDateAdapter,
@@ -16,15 +18,21 @@ import {
   NgbTimepicker,
   NgbTimepickerModule,
 } from '@ng-bootstrap/ng-bootstrap';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
+import { DateTimeAdapter } from '@abp/ng.theme.shared';
 import { FormProp } from '../../models/form-props';
 import { selfFactory } from '../../utils/factory.util';
-import { DateTimeAdapter } from '@abp/ng.theme.shared';
-import { CommonModule } from '@angular/common';
 
 @Component({
   exportAs: 'abpExtensibleDateTimePicker',
   standalone: true,
-  imports: [CommonModule, NgbDatepickerModule, ReactiveFormsModule, NgbTimepickerModule],
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    NgbDatepickerModule,
+    NgbTimepickerModule,
+    NgxValidateCoreModule,
+  ],
   selector: 'abp-extensible-date-time-picker',
   template: `
     <input
@@ -63,14 +71,14 @@ import { CommonModule } from '@angular/common';
   ],
 })
 export class ExtensibleDateTimePickerComponent {
+  public readonly cdRef = inject(ChangeDetectorRef);
+
   @Input() prop!: FormProp;
   @Input() meridian = false;
 
   @ViewChild(NgbInputDatepicker) date!: NgbInputDatepicker;
   @ViewChild(NgbTimepicker) time!: NgbTimepicker;
 
-  constructor(public readonly cdRef: ChangeDetectorRef) {}
-
   setDate(dateStr: string) {
     this.date.writeValue(dateStr);
   }

npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.ts

@@ -15,10 +15,11 @@ import {
   inject,
   Injector,
   Input,
-  OnChanges, Optional,
+  OnChanges,
+  Optional,
   SimpleChanges,
   SkipSelf,
-  ViewChild
+  ViewChild,
 } from '@angular/core';
 import {
   ControlContainer,
@@ -124,10 +125,10 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
   search = (text$: Observable<string>) =>
     text$
       ? text$.pipe(
-        debounceTime(300),
-        distinctUntilChanged(),
-        switchMap(text => this.prop?.options?.(this.data, text) || of([])),
-      )
+          debounceTime(300),
+          distinctUntilChanged(),
+          switchMap(text => this.prop?.options?.(this.data, text) || of([])),
+        )
       : of([]);
 
   typeaheadFormatter = (option: ABP.Option<any>) => option.key;