Skip to content

Commit f8d156b

Browse files
committed
fix(Appearance Configuration): The display settings of the application do not change with the system theme
1 parent 2c51c37 commit f8d156b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

frontend/src/views/embedded/index.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ onBeforeMount(async () => {
171171
}
172172
173173
for (const key in customSet) {
174-
if (Object.prototype.hasOwnProperty.call(customSet, key)) {
174+
if (
175+
Object.prototype.hasOwnProperty.call(customSet, key) &&
176+
![null, undefined].includes(rawData[key])
177+
) {
175178
customSet[key] = rawData[key]
176179
}
177180
}

frontend/src/views/embedded/page.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ onBeforeMount(async () => {
150150
}
151151
152152
for (const key in customSet) {
153-
if (Object.prototype.hasOwnProperty.call(customSet, key)) {
153+
if (
154+
Object.prototype.hasOwnProperty.call(customSet, key) &&
155+
![null, undefined].includes(rawData[key])
156+
) {
154157
customSet[key] = rawData[key]
155158
}
156159
}

frontend/src/views/system/embedded/SetUi.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ const init = () => {
8585
floatIcon.value = rawData.float_icon
8686
8787
for (const key in sqlBotForm) {
88-
if (Object.prototype.hasOwnProperty.call(sqlBotForm, key)) {
88+
if (
89+
Object.prototype.hasOwnProperty.call(sqlBotForm, key) &&
90+
![null, undefined].includes(rawData[key])
91+
) {
8992
sqlBotForm[key] = rawData[key]
9093
}
9194
}

0 commit comments

Comments
 (0)