@eqproject/eqp-dynamic-module 2.10.75 → 2.10.77

package/fesm2020/eqproject-eqp-dynamic-module.mjs

@@ -15779,10 +15779,18 @@ class AddFormFieldComponent {
         if (data == null && this.field.DataGetter.DataGetterValue != null) {
             data = this.field.DataGetter.DataGetterValue;
         }
-        if (data != null && typeof data != "undefined" && typeof data.selectedFields != "undefined") {
+        if (data == null || typeof data === "undefined")
+            return;
+        // V2 (DataGetterCodeVersion === 2): selectedFields è dentro queryCommandDatabaseConfiguration
+        const isV2 = data.DataGetterCodeVersion === 2;
+        const selectedFields = isV2
+            ? data.queryCommandDatabaseConfiguration?.selectedFields
+            : data.selectedFields;
+        if (selectedFields != null && typeof selectedFields != "undefined") {
             this.columnKeys = new Array();
-            data.selectedFields.forEach((key) => {
-                this.columnKeys.push({ key: key.DatabaseTableName + "_" + key.PropertyName + "__" + key.CurrentTranslate.replace(" ", "_"), value: key.CurrentTranslate });
+            selectedFields.forEach((key) => {
+                const label = key.CurrentTranslate || key.PropertyName;
+                this.columnKeys.push({ key: key.DatabaseTableName + "_" + key.PropertyName + "__" + label.replace(" ", "_"), value: label });
             });
         }
     }
@@ -18367,19 +18375,17 @@ class EqpDynamicModuleConfiguratorComponent {
         this.currentAiDataGetterField.DataGetter.DataGetterValue = data;
         this.currentAiDataGetterField.DataGetter.DataGetterCardinality = 1;
         this.currentAiDataGetterField.DataGetter.DataGetterHasResetButton = true;
-        // V2: DataGetterColumnForce già incluso nel QueryCommandDTO dal server AI
-        // V1 fallback: calcolato dai selectedFields flat
+        // DataGetterColumnForce deve essere la stringa chiave (non l'oggetto) per funzionare con eqp-select
         const columnForce = data?.DataGetterColumnForce;
         if (columnForce) {
-            this.currentAiDataGetterField.DataGetter.DataGetterColumnForce = columnForce;
+            // V2 server restituisce { key, value, keyProperty } — estraiamo solo il key string
+            this.currentAiDataGetterField.DataGetter.DataGetterColumnForce =
+                typeof columnForce === 'object' ? columnForce.key : columnForce;
         }
         else if (data?.selectedFields?.length === 1) {
             const sf = data.selectedFields[0];
-            this.currentAiDataGetterField.DataGetter.DataGetterColumnForce = {
-                key: sf.DatabaseTableName + "_" + sf.PropertyName + "__" + sf.CurrentTranslate.replace(/ /g, '_'),
-                value: sf.CurrentTranslate,
-                keyProperty: "key"
-            };
+            this.currentAiDataGetterField.DataGetter.DataGetterColumnForce =
+                sf.DatabaseTableName + "_" + sf.PropertyName + "__" + sf.CurrentTranslate.replace(/ /g, '_');
         }
         this.currentAiDataGetterField.DataGetter.DataGetterSpeechText = null;
         // Azzera DataGetterSpeechText dal config object per evitare che "Modifica" lo rilanci