diff --git a/frontend/src/views/embedded/index.vue b/frontend/src/views/embedded/index.vue index 11308d6e..a6fc0db8 100644 --- a/frontend/src/views/embedded/index.vue +++ b/frontend/src/views/embedded/index.vue @@ -171,7 +171,10 @@ onBeforeMount(async () => { } for (const key in customSet) { - if (Object.prototype.hasOwnProperty.call(customSet, key)) { + if ( + Object.prototype.hasOwnProperty.call(customSet, key) && + ![null, undefined].includes(rawData[key]) + ) { customSet[key] = rawData[key] } } diff --git a/frontend/src/views/embedded/page.vue b/frontend/src/views/embedded/page.vue index bf44133b..adcbeb10 100644 --- a/frontend/src/views/embedded/page.vue +++ b/frontend/src/views/embedded/page.vue @@ -150,7 +150,10 @@ onBeforeMount(async () => { } for (const key in customSet) { - if (Object.prototype.hasOwnProperty.call(customSet, key)) { + if ( + Object.prototype.hasOwnProperty.call(customSet, key) && + ![null, undefined].includes(rawData[key]) + ) { customSet[key] = rawData[key] } } diff --git a/frontend/src/views/system/embedded/SetUi.vue b/frontend/src/views/system/embedded/SetUi.vue index 0be2975a..ec362471 100644 --- a/frontend/src/views/system/embedded/SetUi.vue +++ b/frontend/src/views/system/embedded/SetUi.vue @@ -85,7 +85,10 @@ const init = () => { floatIcon.value = rawData.float_icon for (const key in sqlBotForm) { - if (Object.prototype.hasOwnProperty.call(sqlBotForm, key)) { + if ( + Object.prototype.hasOwnProperty.call(sqlBotForm, key) && + ![null, undefined].includes(rawData[key]) + ) { sqlBotForm[key] = rawData[key] } }