fix: setting config not working when deleting property (#309)

DTStack · Aug 5, 2021 · 23116af · 23116af
1 parent 3370b0f
commit 23116af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/controller/settings.ts b/src/controller/settings.ts
@@ -9,7 +9,12 @@ import {
     PanelService,
     SettingsService,
 } from 'mo/services';
-import { SettingsEvent, BuiltInSettingsTab } from 'mo/model/settings';
+import {
+    SettingsEvent,
+    BuiltInSettingsTab,
+    initialEditorSetting,
+    initialWorkbenchSetting,
+} from 'mo/model/settings';
 
 export interface ISettingsController {}
 
@@ -37,6 +42,11 @@ export class SettingsController
                 const config = this.settingsService.normalizeFlatObject(
                     tab.data?.value || ''
                 );
+                config.editor = { ...initialEditorSetting, ...config.editor };
+                config.workbench = {
+                    ...initialWorkbenchSetting,
+                    ...config.workbench,
+                };
                 this.settingsService.update(config);
             }
         });

diff --git a/src/model/settings.ts b/src/model/settings.ts
@@ -17,11 +17,11 @@ export enum SettingsEvent {
     OnChange = 'settings.onchange',
 }
 
-const initialWorkbenchSetting = {
+export const initialWorkbenchSetting = {
     colorTheme: 'Default Dark+',
 };
 
-const initialEditorSetting: IEditorSettings = {
+export const initialEditorSetting: IEditorSettings = {
     renderWhitespace: 'none',
     tabSize: 4,
     fontSize: 14,
@@ -47,8 +47,8 @@ export class SettingsModel implements ISettings {
     editor: IEditorSettings;
 
     constructor(
-        workbench: IWorkbenchSettings = initialWorkbenchSetting,
-        editor: IEditorSettings = initialEditorSetting
+        workbench: IWorkbenchSettings = { ...initialWorkbenchSetting },
+        editor: IEditorSettings = { ...initialEditorSetting }
     ) {
         this.workbench = workbench;
         this.editor = editor;