@smartbit4all/ng-client 3.0.9 → 3.0.11

package/fesm2020/smartbit4all-ng-client.mjs

@@ -2992,7 +2992,11 @@ class SmartFormService {
                 deepModel.push(tempModel[splittedKeys[index]]);
             }
             if (index === splittedKeys.length - 1) {
-                tempModel[splittedKeys[index]] = value;
+                let oldValue = tempModel[splittedKeys[index]];
+                // if (value === '' && (oldValue === null || oldValue === undefined) then don't change value.
+                if (value !== '' || (oldValue !== null && oldValue !== undefined)) {
+                    tempModel[splittedKeys[index]] = value;
+                }
                 break;
             }
         }
@@ -3044,35 +3048,7 @@ class SmartFormService {
                             widget.showLabel = true;
                         }
                     }
-                    if (widget.type === SmartFormWidgetType.SELECT ||
-                        widget.type === SmartFormWidgetType.TEXT_FIELD) {
-                        if (widget.selection && smartForm.componentModel.valueSets) {
-                            if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
-                                !widget.selection.mapping.length) {
-                                let valueSetData = smartForm.componentModel.valueSets[widget.selection.valueSetName].valueSetData;
-                                widget.valueList = valueSetData.values.map((value) => {
-                                    return {
-                                        key: value[valueSetData.keyProperty],
-                                        label: value[widget.selection?.displayProperty ?? 'displayValue'],
-                                        type: SmartFormWidgetType.ITEM,
-                                        value: value[valueSetData.keyProperty],
-                                    };
-                                });
-                            }
-                            else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
-                                !widget.selection.mapping.length) {
-                                let valueSetData = smartForm.componentModel.valueSets[widget.selection.valueSetName].valueSetData;
-                                widget.valueList = valueSetData.values.map((value, index) => {
-                                    return {
-                                        key: `${index}`,
-                                        label: value[widget.selection?.displayProperty ?? 'displayValue'],
-                                        type: SmartFormWidgetType.ITEM,
-                                        value: value,
-                                    };
-                                });
-                            }
-                        }
-                    }
+                    this.copyFromValueSetToValuesList(widget, smartForm.componentModel.valueSets);
                     if (widget &&
                         widget.type === SmartFormWidgetType.CHECK_BOX &&
                         widget.valueList.length === 1) {
@@ -3088,17 +3064,54 @@ class SmartFormService {
                     let splittedKeys = key.split('.');
                     splittedKeys.splice(splittedKeys.length - 1, 1);
                     widget = this.findSmartFormWidgetByKey(smartForm.widgets, splittedKeys.join('.'));
-                    if (widget && widget.type === SmartFormWidgetType.CHECK_BOX_2 && widget.valueList) {
-                        widget.valueList = widget.valueList.map((item) => {
-                            let value = this.getValueDeeply(data, `${widget?.key}.${item.key}`);
-                            item.value = value;
-                            return item;
-                        });
+                    if (widget && widget.type === SmartFormWidgetType.CHECK_BOX_2) {
+                        this.copyFromValueSetToValuesList(widget, smartForm.componentModel.valueSets);
+                        if (widget.valueList) {
+                            widget.valueList = widget.valueList.map((item) => {
+                                let value = this.getValueDeeply(data, `${widget?.key}.${item.key}`);
+                                item.value = value;
+                                return item;
+                            });
+                        }
                     }
                 }
             }
         }
     }
+    copyFromValueSetToValuesList(widget, valueSets) {
+        if (widget.type === SmartFormWidgetType.SELECT ||
+            widget.type === SmartFormWidgetType.SELECT_MULTIPLE ||
+            widget.type === SmartFormWidgetType.RADIO_BUTTON ||
+            widget.type === SmartFormWidgetType.CHECK_BOX ||
+            widget.type === SmartFormWidgetType.TEXT_FIELD) {
+            if (widget.selection && valueSets) {
+                if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
+                    !widget.selection.mapping.length) {
+                    let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
+                    widget.valueList = valueSetData.values.map((value) => {
+                        return {
+                            key: value[valueSetData.keyProperty],
+                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            type: SmartFormWidgetType.ITEM,
+                            value: value[valueSetData.keyProperty],
+                        };
+                    });
+                }
+                else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
+                    !widget.selection.mapping.length) {
+                    let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
+                    widget.valueList = valueSetData.values.map((value, index) => {
+                        return {
+                            key: `${index}`,
+                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            type: SmartFormWidgetType.ITEM,
+                            value: value,
+                        };
+                    });
+                }
+            }
+        }
+    }
     toFormGroup() {
         this.createFormControls(this.smartForm.widgets);
         let formGroup = new FormGroup(this.group);
@@ -12616,11 +12629,14 @@ let SmartComponentApiClient = class SmartComponentApiClient {
                 deepModel.push(tempModel[splittedKeys[index]]);
             }
             if (index === splittedKeys.length - 1) {
-                tempModel[splittedKeys[index]] = value;
+                let oldValue = tempModel[splittedKeys[index]];
+                // if (value === '' && (oldValue === null || oldValue === undefined) then don't change value.
+                if (value !== '' || (oldValue !== null && oldValue !== undefined)) {
+                    tempModel[splittedKeys[index]] = value;
+                }
                 break;
             }
         }
-        return model;
     }
     handleDataChange(changes, changeKey) {
         this.setValueDeeply(this.model, changeKey, changes[changeKey]);