diff --git a/electron/services/ConfigStore.ts b/electron/services/ConfigStore.ts index acd90a8..f5a627c 100644 --- a/electron/services/ConfigStore.ts +++ b/electron/services/ConfigStore.ts @@ -187,20 +187,16 @@ export class ConfigStore { } } - updateSite(originalName: string, site: any): void { - const sites = this.store.get('sites') - const index = sites.findIndex(s => s.name === originalName) - if (index > -1) { - sites[index] = site - this.store.set('sites', sites) - } - } - updateSite(name: string, site: Partial): void { const sites = this.store.get('sites') const index = sites.findIndex(s => s.name === name) if (index > -1) { - sites[index] = { ...sites[index], ...site } + // 如果传入完整对象则替换,否则合并 + if (site.domain && site.rootPath) { + sites[index] = site as SiteConfig + } else { + sites[index] = { ...sites[index], ...site } + } this.store.set('sites', sites) } } diff --git a/package.json b/package.json index 2e30d5c..28c5f39 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,9 @@ "target": [ { "target": "nsis", - "arch": ["x64"] + "arch": [ + "x64" + ] } ], "requestedExecutionLevel": "requireAdministrator" @@ -66,7 +68,10 @@ "createDesktopShortcut": true, "createStartMenuShortcut": true, "shortcutName": "PHPer开发环境管理器", - "installerLanguages": ["zh_CN", "en_US"], + "installerLanguages": [ + "zh_CN", + "en_US" + ], "language": "2052", "runAfterFinish": true, "deleteAppDataOnUninstall": false, @@ -76,7 +81,9 @@ { "from": "public/", "to": "public/", - "filter": ["**/*"] + "filter": [ + "**/*" + ] } ] }