mmhglobal-dynamicform 2.0.0 → 2.0.2

package/README.md

@@ -3,6 +3,15 @@
 This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.13.
 
 ## Changelog
+`2.0.2`<br/>
+[mainservice] - mark form and controls as touched upon updateModel and failed validation.<br/>
+[textarea] - Enhance character count to skip count on empty space, line break and continuous space.<br/>
+Enhance setRequire() to use custom Required Validator that ignore continuous white spaces.<br/>
+
+`2.0.1`<br/>
+[zudf] - fix validation issue.<br/>
+[mainservice] - minor fix for error when navigate.
+
 `2.0.0`<br/>
 Release library version 2.
 [ztree] - Enhanced component to hide all add/remove buttons before UI rendered.<br/>

package/esm2020/lib/components/fieldbase.component.mjs

@@ -24,6 +24,12 @@ export class FieldBase {
         this.setRequire = (status) => {
             this.componentProperties.isRequired = status;
             ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, Validators.required);
+            if (this.data.Type === 'ztexteditor') {
+                ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, ZComponentHelper.requiredValidator_WithoutWhiteSpaces_TextEditor);
+            }
+            else {
+                ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, ZComponentHelper.requiredValidator_WithoutWhiteSpaces);
+            }
         };
     }
     initComponent() {
@@ -90,4 +96,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             }], componentProperties: [{
                 type: Input
             }] } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fieldbase.component.js","sourceRoot":"","sources":["../../../../../projects/mmhglobal-dynamicform/src/lib/components/fieldbase.component.ts"],"names":[],"mappings":"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","sourcesContent":["/********** Angular **********/\r\nimport { Component, Input } from \"@angular/core\";\r\nimport { FormGroup, Validators } from \"@angular/forms\";\r\nimport { ZComponentHelper, ZComponentProperties, ZField, ZGroup } from \"mmhglobal-zcore\";\r\nimport { forkJoin, Observable } from \"rxjs\";\r\nimport { ZComponentService } from \"../services/zcomponent.service\";\r\n\r\n@Component({\r\n  template: ``,\r\n})\r\n\r\n// For: app-error, zgauge, zprogressbar, zreport\r\nexport class FieldBase {\r\n  @Input() data: ZField;\r\n  @Input() group: ZGroup;\r\n  @Input() form: FormGroup;\r\n  @Input() containerField: ZField;\r\n  @Input() componentProperties: ZComponentProperties;\r\n\r\n  public isLoading = true;\r\n  constructor(public compService: ZComponentService) { }\r\n\r\n  public initComponent(): Observable<any> {\r\n    this.isLoading = true;\r\n    this.componentProperties = this.componentProperties || new ZComponentProperties();\r\n    ZComponentHelper.setComponentProperties(this);\r\n    ZComponentHelper.registerComponent(this);\r\n    this.compService.setComponentAdditionalProperties(this);\r\n    this.compService.setCompStylesByIndex(this);\r\n    this.data.ComponentStyleType = this.data.ComponentStyleType || \"style1\";\r\n    return forkJoin([this.compService.translateComponentField(this.data, this.group), this.compService.translateComponentProperties(this.componentProperties, this.group)]);\r\n  }\r\n\r\n  public setupInnerField() {\r\n    ZComponentHelper.registerComponent(this);\r\n  }\r\n\r\n  public isMobileScreen() {\r\n    const v = ZComponentHelper.isMobileScreen();\r\n    return v;\r\n  }\r\n\r\n  public getClass(form: FormGroup, data: ZField) {\r\n    return `${ZComponentHelper.getIon_InvalidClass(form, data)} ${data.DivClass} ${data.Class}`;\r\n  }\r\n\r\n  public getIon_InvalidClass(form: FormGroup, data: ZField) {\r\n    return ZComponentHelper.getIon_InvalidClass(form, data);\r\n  }\r\n\r\n  public setStyle(style: string, ind: string = \"\") {\r\n    this.compService.setStyleByIndex(this, ind, style);\r\n  }\r\n\r\n  public setIcon(icon: string) {\r\n    this.componentProperties.icon = icon;\r\n  }\r\n\r\n  public setLabelText(label: string) {\r\n    this.componentProperties.label = label;\r\n  }\r\n\r\n  public setContainerStyle(style: string, ind: string = \"\") {\r\n    this.compService.setContainerStyleByIndex(this, ind, style);\r\n  }\r\n\r\n  public setEnable = (status: boolean) => {\r\n    const fc = this.group?.form?.controls[this.data.Value];\r\n    if (fc) {\r\n      status ? fc.enable() : fc.disable();\r\n    }\r\n    this.componentProperties.isReadOnly = !status;\r\n  }\r\n\r\n  public setVisible = (status: boolean) => {\r\n    this.componentProperties.isVisible = status;\r\n    this.data.Visible = status;\r\n  }\r\n\r\n  public setRequire = (status: boolean) => {\r\n    this.componentProperties.isRequired = status;\r\n    ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, Validators.required);\r\n  }\r\n\r\n  public getFontAwesome(iconName: any) {\r\n    const iconNameValue = ZComponentHelper.getGroupValue(iconName, this.group);\r\n    if (iconNameValue) {\r\n      return ZComponentHelper.getFontAwesome(iconNameValue);\r\n    }\r\n    return iconName;\r\n  }\r\n\r\n  public toggleEditMode() {\r\n    this.data[`_EditMode`].value = !this.data[`_EditMode`].value;\r\n  }\r\n}\r\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fieldbase.component.js","sourceRoot":"","sources":["../../../../../projects/mmhglobal-dynamicform/src/lib/components/fieldbase.component.ts"],"names":[],"mappings":"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","sourcesContent":["/********** Angular **********/\r\nimport { Component, Input } from \"@angular/core\";\r\nimport { FormGroup, Validators } from \"@angular/forms\";\r\nimport { ZComponentHelper, ZComponentProperties, ZField, ZGroup } from \"mmhglobal-zcore\";\r\nimport { forkJoin, Observable } from \"rxjs\";\r\nimport { ZComponentService } from \"../services/zcomponent.service\";\r\n\r\n@Component({\r\n  template: ``,\r\n})\r\n\r\n// For: app-error, zgauge, zprogressbar, zreport\r\nexport class FieldBase {\r\n  @Input() data: ZField;\r\n  @Input() group: ZGroup;\r\n  @Input() form: FormGroup;\r\n  @Input() containerField: ZField;\r\n  @Input() componentProperties: ZComponentProperties;\r\n\r\n  public isLoading = true;\r\n  constructor(public compService: ZComponentService) { }\r\n\r\n  public initComponent(): Observable<any> {\r\n    this.isLoading = true;\r\n    this.componentProperties = this.componentProperties || new ZComponentProperties();\r\n    ZComponentHelper.setComponentProperties(this);\r\n    ZComponentHelper.registerComponent(this);\r\n    this.compService.setComponentAdditionalProperties(this);\r\n    this.compService.setCompStylesByIndex(this);\r\n    this.data.ComponentStyleType = this.data.ComponentStyleType || \"style1\";\r\n    return forkJoin([this.compService.translateComponentField(this.data, this.group), this.compService.translateComponentProperties(this.componentProperties, this.group)]);\r\n  }\r\n\r\n  public setupInnerField() {\r\n    ZComponentHelper.registerComponent(this);\r\n  }\r\n\r\n  public isMobileScreen() {\r\n    const v = ZComponentHelper.isMobileScreen();\r\n    return v;\r\n  }\r\n\r\n  public getClass(form: FormGroup, data: ZField) {\r\n    return `${ZComponentHelper.getIon_InvalidClass(form, data)} ${data.DivClass} ${data.Class}`;\r\n  }\r\n\r\n  public getIon_InvalidClass(form: FormGroup, data: ZField) {\r\n    return ZComponentHelper.getIon_InvalidClass(form, data);\r\n  }\r\n\r\n  public setStyle(style: string, ind: string = \"\") {\r\n    this.compService.setStyleByIndex(this, ind, style);\r\n  }\r\n\r\n  public setIcon(icon: string) {\r\n    this.componentProperties.icon = icon;\r\n  }\r\n\r\n  public setLabelText(label: string) {\r\n    this.componentProperties.label = label;\r\n  }\r\n\r\n  public setContainerStyle(style: string, ind: string = \"\") {\r\n    this.compService.setContainerStyleByIndex(this, ind, style);\r\n  }\r\n\r\n  public setEnable = (status: boolean) => {\r\n    const fc = this.group?.form?.controls[this.data.Value];\r\n    if (fc) {\r\n      status ? fc.enable() : fc.disable();\r\n    }\r\n    this.componentProperties.isReadOnly = !status;\r\n  }\r\n\r\n  public setVisible = (status: boolean) => {\r\n    this.componentProperties.isVisible = status;\r\n    this.data.Visible = status;\r\n  }\r\n\r\n  public setRequire = (status: boolean) => {\r\n    this.componentProperties.isRequired = status;\r\n    ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, Validators.required);\r\n\r\n    if (this.data.Type === 'ztexteditor') {\r\n      ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, ZComponentHelper.requiredValidator_WithoutWhiteSpaces_TextEditor);\r\n    }\r\n    else {\r\n      ZComponentHelper.changeValidator(status, this.group, this.data.Value, this.componentProperties, ZComponentHelper.requiredValidator_WithoutWhiteSpaces);\r\n    }\r\n  }\r\n\r\n  public getFontAwesome(iconName: any) {\r\n    const iconNameValue = ZComponentHelper.getGroupValue(iconName, this.group);\r\n    if (iconNameValue) {\r\n      return ZComponentHelper.getFontAwesome(iconNameValue);\r\n    }\r\n    return iconName;\r\n  }\r\n\r\n  public toggleEditMode() {\r\n    this.data[`_EditMode`].value = !this.data[`_EditMode`].value;\r\n  }\r\n}\r\n"]}