@smartbit4all/ng-client 3.3.237 → 3.3.239

package/fesm2020/smartbit4all-ng-client.mjs

@@ -6834,6 +6834,19 @@ class SmartObjectUtility {
         }
         return undefined;
     }
+    static compareByProps(o1, o2, props) {
+        for (let prop of props) {
+            if (prop in o1 && prop in o2) {
+                if (!deepEqual(o1[prop], o2[prop])) {
+                    return false;
+                }
+            }
+            else {
+                return false;
+            }
+        }
+        return true;
+    }
 }
 
 class Table {
@@ -14597,7 +14610,7 @@ class SmartFilterEditorContentComponent {
             }
             if (filterExpressionField.widgetType === 'SELECT_MULTIPLE') {
                 key = index + '.expressionData.operand2.selectedValues';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? '', filterExpressionField.toolbarId));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.selectedValues ?? [], filterExpressionField.toolbarId));
                 return;
             }
             if (filterExpressionField.expressionData?.currentOperation === 'BETWEEN') {
@@ -14608,16 +14621,12 @@ class SmartFilterEditorContentComponent {
                 return;
             }
             if (filterExpressionField.expressionData?.operand2) {
-                if (key !== index + '.expressionData.operand2.selectedValues') {
-                    key = index + '.expressionData.operand2.valueAsString';
-                }
+                key = index + '.expressionData.operand2.valueAsString';
                 widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
             if (filterExpressionField?.expressionData?.operand3) {
-                if (key !== index + '.selectedValues') {
-                    key = index + '.expressionData.operand3.valueAsString';
-                }
+                key = index + '.expressionData.operand3.valueAsString';
                 widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
@@ -14632,7 +14641,7 @@ class SmartFilterEditorContentComponent {
         if (this.simpleFilterRef?.instance) {
             // we already have a SmartFormComponent, use that
             let comp = this.simpleFilterRef?.instance;
-            if (comp.smartForm && deepEqual(comp.smartForm.widgets, smartForm.widgets)) {
+            if (comp.smartForm && this.compareWidgets(comp.smartForm.widgets, smartForm.widgets)) {
                 // there's no structural change, don't recreate SmartFormComponent
                 comp.smartForm.componentModel = smartForm.componentModel;
                 comp.constructForm();
@@ -14644,6 +14653,29 @@ class SmartFilterEditorContentComponent {
         this.simpleFilterRef = this.cfService.createComponent(this.simpleFilterVcRef, SmartformComponent, new Map([['smartForm', smartForm]]));
         this.subsrcibeSimpleFormChildrenEvents();
     }
+    compareWidgets(ws1, ws2) {
+        if (ws1.length !== ws2.length) {
+            return false;
+        }
+        for (let i = 0; i < ws1.length; i++) {
+            if (!this.compareWidget(ws1[i], ws2[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    compareWidget(w1, w2) {
+        return SmartObjectUtility.compareByProps(w1, w2, [
+            'error',
+            'key',
+            'label',
+            'type',
+            'value',
+            'showLabel',
+            'valueList',
+            'toolbarId',
+        ]);
+    }
     extractFilterFieldFromFormModel() {
         let simpleFilter = this.simpleFilterRef?.instance?.submitForm(false).componentModel.data;
         let result = [];