feat: align with upstream 1.5.9.9
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
From 285dd24463da23395304c9d31d44c6d1ecb5a64e Mon Sep 17 00:00:00 2001
|
||||
From: HenryDu8133 <813367384@qq.com>
|
||||
Date: Fri, 11 Sep 2026 23:01:56 +0800
|
||||
Subject: [PATCH 35/58] fix(system-settings): resolve index.post.ts L844 syntax
|
||||
error Expected ')' but found 'if' - fillDefaults arrow return/object literal
|
||||
close brackets order
|
||||
|
||||
---
|
||||
server/api/admin/system-settings/index.post.ts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/api/admin/system-settings/index.post.ts b/server/api/admin/system-settings/index.post.ts
|
||||
index 9f2ac77..387aa68 100644
|
||||
--- a/server/api/admin/system-settings/index.post.ts
|
||||
+++ b/server/api/admin/system-settings/index.post.ts
|
||||
@@ -841,7 +841,7 @@ export default defineEventHandler(async (event) => {
|
||||
const settingsResult = await db.select().from(systemSettings).limit(1)
|
||||
let settings = settingsResult[0] || null
|
||||
|
||||
- const fillDefaults = (obj: any) => ({ ...obj, ...Object.fromEntries(Object.entries(DEFAULTS).filter(([k]) => !Object.prototype.hasOwnProperty.call(obj || {}, k) || (obj && obj[k] === undefined || obj[k] === null))) }
|
||||
+ const fillDefaults = (obj: any) => ({ ...obj, ...Object.fromEntries(Object.entries(DEFAULTS).filter(([k]) => !Object.prototype.hasOwnProperty.call(obj || {}, k) || (obj && obj[k] === undefined || obj[k] === null)))) })
|
||||
|
||||
if (!settings) {
|
||||
// 如果不存在,创建新设置
|
||||
--
|
||||
2.45.1.windows.1
|
||||
|
||||
Reference in New Issue
Block a user