diff --git a/console/src/composables/use-setting-form.ts b/console/src/composables/use-setting-form.ts index c2c1defc2..5ca6dd0cc 100644 --- a/console/src/composables/use-setting-form.ts +++ b/console/src/composables/use-setting-form.ts @@ -219,6 +219,14 @@ export function useSettingFormConvert( configMap.value?.data?.[form.group] || "{}" ); }); + + Object.keys(configMap.value?.data || {}).forEach((key) => { + if (!forms?.find((item) => item.group === key)) { + configMapFormData.value[key] = JSON.parse( + configMap.value?.data?.[key] || "{}" + ); + } + }); }, { immediate: true, @@ -236,10 +244,18 @@ export function useSettingFormConvert( [key: string]: string; } = {}; - setting.value?.spec.forms.forEach((item: SettingForm) => { + const { forms } = setting.value?.spec || {}; + + forms?.forEach((item: SettingForm) => { data[item.group] = JSON.stringify(configMapFormData?.value?.[item.group]); }); + Object.keys(configMap.value?.data || {}).forEach((key) => { + if (!forms?.find((item) => item.group === key)) { + data[key] = configMap.value?.data?.[key] || "{}"; + } + }); + configMapToUpdate.data = data; return configMapToUpdate; }