v2.1.6 | Commit automático

Commit automático realizado via script pós build
SISPROV6 · Oct 2, 2024 · d49d895 · d49d895
1 parent d38d06e
commit d49d895
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/projects/ngx-sp-infra/package-lock.json b/projects/ngx-sp-infra/package-lock.json
diff --git a/projects/ngx-sp-infra/package.json b/projects/ngx-sp-infra/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ngx-sp-infra",
- "version": "2.1.5",
+ "version": "2.1.6",
  "description": "Biblioteca de utilitários da Infra.",
  "author": "P&D",
  "keywords": [

diff --git a/projects/ngx-sp-infra/src/lib/directives/required.directive.ts b/projects/ngx-sp-infra/src/lib/directives/required.directive.ts
@@ -56,7 +56,7 @@ export class RequiredDirective implements OnInit, OnChanges {
  get showMarker(): boolean { return this._showMarker; }
 
  /** Identificador único para o elemento <span> criado. */
- @Input("sisID") spanID: string = "";
+ @Input("requiredID") spanID: string = "";
 
 
  ngOnInit(): void {

diff --git a/projects/ngx-sp-infra/src/lib/widgets/lib-combobox/lib-combobox.component.html b/projects/ngx-sp-infra/src/lib/widgets/lib-combobox/lib-combobox.component.html
@@ -1,4 +1,4 @@
-<label *ngIf="labelText && labelText != ''" [libRequired]="isRequired" class="form-label fw-bold">{{ labelText }}</label>
+<label *ngIf="labelText && labelText != ''" [libRequired]="isRequired" [requiredID]="comboboxID" class="form-label fw-bold">{{ labelText }}</label>
 <div class="input-group dropdown flex-fill glb-max-height-350px">
 
  <!-- Este elemento ng-content com o atributo [btnLeft] permite que o usuário final forneça conteúdo personalizado para ser exibido no lado esquerdo do combobox de pesquisa.

diff --git a/projects/ngx-sp-infra/src/lib/widgets/lib-combobox/lib-combobox.component.ts b/projects/ngx-sp-infra/src/lib/widgets/lib-combobox/lib-combobox.component.ts
@@ -64,6 +64,8 @@ export class LibComboboxComponent implements OnInit, AfterViewInit, OnDestroy {
  protected invalid: boolean = false;
  protected dirty: boolean = false;
  protected touched: boolean = false;
+
+ protected comboboxID: string;
  // #endregion PROTECTED
 
  // #region PRIVATE
@@ -102,9 +104,9 @@ export class LibComboboxComponent implements OnInit, AfterViewInit, OnDestroy {
  @Input() public labelText?: string;
 
  /** (opcional) Define se o campo é obrigatório, vai exibir o '*' vermelho ao lado do label (se ele estiver presente)
- * @type {boolean}
-  * @default false */
- @Input() public libRequired: boolean = false;
+ * @type {boolean} */
+ @Input()
+ public libRequired?: boolean;
 
  /** (opcional) Define se o campo está desabilitado. Deve ser usado para validações de habilitação dinâmica do campo
  * @type {boolean}
@@ -168,6 +170,9 @@ export class LibComboboxComponent implements OnInit, AfterViewInit, OnDestroy {
  constructor() { }
 
  ngOnInit(): void {
+ this.comboboxID = `lib-combobox-${Math.random() * 100}`;
+ console.log("comboboxID: ", this.comboboxID);
+
  this.adjustDropdownWidth();
 
  this.setValidator();
@@ -180,7 +185,7 @@ export class LibComboboxComponent implements OnInit, AfterViewInit, OnDestroy {
 
  ngOnChanges(changes: SimpleChanges): void {
  if (changes["comboboxList"]?.currentValue) this.updateSelectedValue();
- if (changes["libRequired"]?.currentValue) this.setValidator();
+ if (changes["libRequired"]?.currentValue != undefined) this.setValidator();
  if (changes["outerControl"]?.currentValue) {
  this.setValidator();
  this.updateSelectedValue((changes["outerControl"].currentValue as FormControl).value);
@@ -245,16 +250,28 @@ export class LibComboboxComponent implements OnInit, AfterViewInit, OnDestroy {
  }
  }
 
+ /** Serve para aplicar ou remover o Validator.required do controle.
+ * Por padrão ele priorizará a propriedade libRequired para esta validação. */
  private setValidator(): void {
- console.log("Validação validator", this._outerControl.hasValidator(Validators.required) || this.libRequired === true);
-
- if (this._outerControl.hasValidator(Validators.required) || this.libRequired === true) {
- this.innerControl.addValidators(Validators.required);
- this.isRequired = true;
+ if (this.libRequired !== undefined) {
+ if (this.libRequired) {
+ this.innerControl.addValidators(Validators.required);
+ this.isRequired = true;
+ }
+ else {
+ this.innerControl.removeValidators(Validators.required);
+ this.isRequired = false;
+ }
  }
  else {
- this.innerControl.removeValidators(Validators.required);
- this.isRequired = false;
+ if (this._outerControl.hasValidator(Validators.required)) {
+ this.innerControl.addValidators(Validators.required);
+ this.isRequired = true;
+ }
+ else {
+ this.innerControl.removeValidators(Validators.required);
+ this.isRequired = false;
+ }
  }
  }