@smartbit4all/ng-client 7.3.15 → 7.3.17

package/fesm2022/smartbit4all-ng-client.mjs

@@ -7632,12 +7632,11 @@ class SmartFormService {
     }
     applyComponentConstraints(widgets, constraints) {
         widgets.forEach((widget) => {
-            let widgetConstraints = constraints?.filter(
-            //(constraint: SmartFormComponentConstraint) => constraint.dataName === widget.key
-            (constraint) => this.antPathMatcher(constraint.dataName, widget.key));
+            let widgetConstraints = constraints?.filter((constraint) => this.antPathMatcher(constraint.dataName, widget.key));
             if (widgetConstraints && widgetConstraints.length) {
                 widgetConstraints.forEach((constraint) => {
-                    if (constraint.visible === undefined) {
+                    // null or undefined: not specified, keep what earlier constraints (or the layout) set
+                    if (constraint.visible == null) {
                         if (widget.isVisible === undefined) {
                             widget.isVisible = true;
                         }
@@ -7660,10 +7659,10 @@ class SmartFormService {
                         let requiredIndex = validators.findIndex((v) => v.validator === Validators.required);
                         let wasMandatory = requiredIndex >= 0;
                         let tobeMandatory = false;
-                        if (constraint.mandatory === undefined) {
-                            // not specified on server, use client state
-                            // if widget is not visible, client should default to not mandatory
-                            tobeMandatory = widget.isVisible && wasMandatory;
+                        if (constraint.mandatory == null) {
+                            // not specified: keep the state left by earlier constraints or the layout;
+                            // a hidden widget is not mandatory unless a constraint says so
+                            tobeMandatory = !!widget.isVisible && wasMandatory;
                         }
                         else {
                             tobeMandatory = constraint.mandatory;
@@ -7692,7 +7691,7 @@ class SmartFormService {
                             }
                             this.addEmptyItemToValueList(widget, emptyLabel);
                         }
-                        if (constraint.enabled === undefined || constraint.enabled === null) {
+                        if (constraint.enabled == null) {
                             if (widget.isDisabled === undefined) {
                                 widget.isDisabled = false;
                             }
@@ -10206,8 +10205,8 @@ class SmartformwidgetComponent {
     }
     onTimePickerBlur(event) {
         event.stopPropagation();
+        this.handleTimeChanged(this.form().controls[`${this.widgetInstance.key}-time`].value, true);
         this.handleBlurEvent(this.widgetInstance);
-        this.handleTimeChanged(this.form().controls[`${this.widgetInstance.key}-time`].value);
     }
     ngAfterViewInit() {
         if (this.widgetInstance.type === SmartFormWidgetType.COMPONENT) {
@@ -10265,7 +10264,7 @@ class SmartformwidgetComponent {
             this.widgetInstance.value = dateFormControl.value;
         }
     }
-    handleTimeChanged(timeValue) {
+    handleTimeChanged(timeValue, fromBlur = false) {
         const isFocused = document.activeElement === this.timeInputChild?.nativeElement;
         const dateFormControl = this.form().controls[this.widgetInstance.key];
         const timeFormControl = this.form().controls[`${this.widgetInstance.key}-time`];
@@ -10280,9 +10279,9 @@ class SmartformwidgetComponent {
             timeValue) {
             dateFormControl.setValidators(Validators.required);
         }
-        // if (isFocused) {
-        //   return;
-        // }
+        if (isFocused && !fromBlur) {
+            return;
+        }
         if (this.hasJustChanged) {
             this.hasJustChanged = false;
             return;
@@ -24378,7 +24377,6 @@ class SmartFilterParamsComponent {
             this.setUp(this.service().model);
         });
         this.setUp(this.service().model);
-        console.log(this.service().model);
     }
     ngOnDestroy() {
         this._destroy$.next();