cat-qw-lib 2.6.32 → 2.6.33

package/fesm2022/cat-qw-lib.mjs

@@ -3966,6 +3966,15 @@ class WidgetAdminFormComponent extends BaseFormComponent {
         super.init();
         this.baseStore.setIsApiValidated(null);
         this.recordChange.asObservable().subscribe((record) => {
+            const hasRecord = !!record && (!!record._id ||
+                !!record.apiConfigId ||
+                (record.dataItems?.length ?? 0) > 0 ||
+                (record.badges?.length ?? 0) > 0 ||
+                !!record.headerDictionaryID);
+            // Ignore initial empty emissions to avoid clearing edit values before actual record arrives.
+            if (!hasRecord) {
+                return;
+            }
             // recordChange can emit readonly store objects; clone before normalization/mutation.
             const editableRecord = structuredClone((record || {}));
             const withAliases = this.normalizeIncomingDictionaryAliases(editableRecord);
@@ -4031,8 +4040,29 @@ class WidgetAdminFormComponent extends BaseFormComponent {
                     selectedApiConfigId: apiConfigId
                 });
             }
-            this.dictionaries =
-                allDictionaryRecords?.filter((item) => String(item.apiConfigId ?? item.apiConfigID ?? '') === String(apiConfigId ?? '')) || [];
+            if (apiConfigId) {
+                this.dictionaries =
+                    allDictionaryRecords?.filter((item) => String(item.apiConfigId ?? item.apiConfigID ?? '') === String(apiConfigId ?? '')) || [];
+            }
+            else {
+                // Edit fallback when apiConfigId is not yet available: keep dictionaries needed by currently selected IDs.
+                const selectedDictionaryIds = new Set();
+                if (this.record?.headerDictionaryID)
+                    selectedDictionaryIds.add(String(this.record.headerDictionaryID));
+                if (this.record?.subHeaderDictionaryID)
+                    selectedDictionaryIds.add(String(this.record.subHeaderDictionaryID));
+                (this.record?.dataItems || []).forEach((item) => {
+                    const id = item?.dataDictionaryId || item?.dictionaryID;
+                    if (id)
+                        selectedDictionaryIds.add(String(id));
+                });
+                (this.record?.badges || []).forEach((badge) => {
+                    const id = badge?.dataDictionaryId || badge?.dictionaryID;
+                    if (id)
+                        selectedDictionaryIds.add(String(id));
+                });
+                this.dictionaries = (allDictionaryRecords || []).filter((d) => selectedDictionaryIds.has(String(d?._id)));
+            }
             if (this.enableDictionaryDebugLogs) {
                 console.log('[WidgetAdmin] dictionary records after apiConfigId filter', {
                     selectedApiConfigId: apiConfigId,