@eqproject/eqp-dynamic-module 2.10.74 → 2.10.76

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,7 +18375,13 @@ class EqpDynamicModuleConfiguratorComponent {
         this.currentAiDataGetterField.DataGetter.DataGetterValue = data;
         this.currentAiDataGetterField.DataGetter.DataGetterCardinality = 1;
         this.currentAiDataGetterField.DataGetter.DataGetterHasResetButton = true;
-        if (data?.selectedFields?.length === 1) {
+        // V2: DataGetterColumnForce già incluso nel QueryCommandDTO dal server AI
+        // V1 fallback: calcolato dai selectedFields flat
+        const columnForce = data?.DataGetterColumnForce;
+        if (columnForce) {
+            this.currentAiDataGetterField.DataGetter.DataGetterColumnForce = 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, '_'),
@@ -18376,6 +18390,8 @@ class EqpDynamicModuleConfiguratorComponent {
             };
         }
         this.currentAiDataGetterField.DataGetter.DataGetterSpeechText = null;
+        // Azzera DataGetterSpeechText dal config object per evitare che "Modifica" lo rilanci
+        this.QueryEditorComponent.inputParams.config.DataGetterSpeechText = null;
         this.currentAiDataGetterField = null;
         this.aiDataGetterLoading = false;
         if (this.pendingAiDataGetterFields.length > 0) {