mmhglobal-dynamicform 2.0.0 → 2.0.2

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -472,6 +472,12 @@ 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() {
@@ -2450,8 +2456,10 @@ class MainService {
             const referenceId = group.parentReferenceId || "0";
             //const pathSegment = this.router.url.split("/");
             //const lastSegment = pathSegment[pathSegment.length - 1];
-            const paramSegment = this.getNavigationCurrentParam().split("/");
-            const actionSegment = group.isCloneNew ? 'new' : paramSegment[paramSegment.length - 1];
+            const currentNavigationParam = this.getNavigationCurrentParam();
+            const navigationSegments = currentNavigationParam ? currentNavigationParam.split('/') : null;
+            const defaultAction = group.isCloneNew ? 'new' : 'edit';
+            const actionSegment = group.isCloneNew ? (navigationSegments ? navigationSegments[navigationSegments.length - 1] : 'new') : defaultAction;
             if (group.isListForm) {
                 this.tryUpdateGroupTrigger(false);
                 this.setNavigationParams([referenceId, 'new']);
@@ -2741,6 +2749,8 @@ class MainService {
         }
         if (!fg.valid) {
             this.componentErrorHandler.showFormGroupErrorMessage(group, fg);
+            fg.markAsTouched();
+            fg.markAllAsTouched();
             return false;
         }
         return true;
@@ -7482,7 +7492,7 @@ class ZtextareaComponent extends InputFieldBase {
         super.focusOnDefault(this.focus.bind(this));
     }
     setCharCounterDisplayStr() {
-        const characterCount = this.group.zModel[this.data.Value]?.length || 0;
+        const characterCount = ZComponentHelper.getValueWithoutContinuousSpaces(this.group.zModel[this.data.Value]).length;
         this.charCounterDisplayStr = `${characterCount} ${this.data.MaxLength ? (' / ' + this.data.MaxLength) : ''}`;
     }
     onChange(event, fieldValue) {
@@ -8967,6 +8977,12 @@ class ZgridComponent extends DataListingFieldBase {
             const validators = [];
             if (col.IsRequired) {
                 validators.push(Validators.required);
+                if (col.Type === 'ztexteditor') {
+                    validators.push(ZComponentHelper.requiredValidator_WithoutWhiteSpaces_TextEditor);
+                }
+                else {
+                    validators.push(ZComponentHelper.requiredValidator_WithoutWhiteSpaces);
+                }
             }
             if (col.ValidatorPattern) {
                 validators.push(Validators.pattern(col.ValidatorPattern));
@@ -9034,6 +9050,12 @@ class ZgridComponent extends DataListingFieldBase {
             const validators = [];
             if (col.IsRequired) {
                 validators.push(Validators.required);
+                if (col.Type === 'ztexteditor') {
+                    validators.push(ZComponentHelper.requiredValidator_WithoutWhiteSpaces_TextEditor);
+                }
+                else {
+                    validators.push(ZComponentHelper.requiredValidator_WithoutWhiteSpaces);
+                }
             }
             if (col.ValidatorPattern) {
                 validators.push(Validators.pattern(col.ValidatorPattern));
@@ -11605,6 +11627,12 @@ class ZudfComponent {
         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);
+            }
         };
     }
     ngOnInit() {
@@ -11805,7 +11833,7 @@ class ZudfComponent {
                 }
                 else {
                     // before generate FormControl, we need to add 2 attribute to the field when render.
-                    // this for later on, we can easily know this field belong to which zudf and under which container. 
+                    // this for later on, we can easily know this field belong to which zudf and under which container.
                     if (containerName) {
                         field['containerName'] = containerName;
                         ;
@@ -11824,7 +11852,7 @@ class ZudfComponent {
                                 zudfGroup[containerName].push(field.Value);
                             }
                         }
-                        // set the list of dropdown option to the variable 
+                        // set the list of dropdown option to the variable
                         if (this.isDropdownType(field.Type) && field.ZDataOptionName && field.DropdownOptions) {
                             this.group.zData[field.ZDataOptionName] = Object.assign([], eval('this.' + field.DropdownOptions));
                         }
@@ -11847,7 +11875,7 @@ class ZudfComponent {
                             if (!zudfGroup['fieldRequiredDefaultUser']) {
                                 zudfGroup['fieldRequiredDefaultUser'] = [];
                             }
-                            // keep a list of default user need to be filled in the scope 
+                            // keep a list of default user need to be filled in the scope
                             zudfGroup['fieldRequiredDefaultUser'].push({
                                 fieldName: field.Name,
                                 childFields: field.ChildFields
@@ -11957,7 +11985,7 @@ class ZudfComponent {
                 updatedModelData[prefixedPropertyName] = updatedNestedObject;
             }
             else {
-                // Add the property to the output object with the component prefix 
+                // Add the property to the output object with the component prefix
                 let prefixedPropertyName;
                 if (containerPrefix) {
                     prefixedPropertyName = `${this.componentPrefix}_${containerPrefix}_${propertyName}`;
@@ -12192,7 +12220,7 @@ class ZudfComponent {
         }
     }
     clearContainerRelatedFieldValue(group, containerName) {
-        // after set to grid, clear the zmodel. 
+        // after set to grid, clear the zmodel.
         this.clearContainerFieldElementValue(containerName);
     }
     removeGridRow(gridValue, gridDataSource, dataItem, index) {
@@ -12220,6 +12248,10 @@ class ZudfComponent {
             for (const key of Object.keys(fg.controls)) {
                 this.setContainerFieldErrorAsNull(fg, key);
             }
+            // Check is the formgroup value again.
+            if (fg.valid) {
+                return true;
+            }
             // Show the error message for the form
             this.componentErrorHandlerService.showFormGroupErrorMessage(this.group, fg);
             // Return false to indicate that the form is not valid