Merge branch 'fix_043'

Merge branch 'fix_043'

Author: Jet

nodemon.json

@@ -1,5 +1,6 @@
 {
   "verbose": true,
   "ignore": ["node_modules/", "dist/"],
-  "ext": "js,json,html,css"
+  "ext": "js,json,html,css",
+  "delay": 1000
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "notewizard",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "description": "NoteWizard Installer",
   "license": "MIT License",

package.json

@@ -1,7 +1,11 @@
 ### [0.4.3] - 2025-12-07
+#### 修复
+- 修复在某些场景下导致加密笔记内容丢失的问题。
+- 修复加密状态导入首选项配置重启后笔记内容无法解密的问题。
 #### 优化
-- 优化笔记右键菜单。
-- 优化笔记列表交互体验。
+- 优化预览体验。
+- 优化笔记列表的交互体验。
+- 优化笔记右键菜单选项。
 
 ### [0.4.2] - 2025-11-30
 #### 新增

src/assets/changelog/history_cn.md

@@ -1,119 +1,128 @@
+### [0.4.3] - 2025-12-07
+#### Fixes
+- Fixed an issue that could cause encrypted note content to be lost in certain scenarios.
+- Fixed an issue where encrypted notes could not be decrypted after importing preference settings and restarting the app.
+#### Improvements
+- Improved preview experience.
+- Improved the interaction experience of the notes list.
+- Improved the options in the notes context menu.
+
 ### [0.4.2] - 2025-11-30
-#### Added
+#### New
 - Added an emergency decryption feature for local notes to restore encrypted content in special scenarios.
-#### Fixed
+#### Fixes
 - Fixed an issue where content in the Recycle Bin could not be encrypted properly.
-#### Improved
+#### Improvements
 - Enhanced the interaction experience of the preferences pane.
 
 ### [0.4.1] - 2025-11-28
-#### Fixed
+#### Fixes
 - Fixed an issue where the search bar could not perform searches.
 - Fixed an issue where encryption could not be disabled in certain scenarios.
-#### Improved
+#### Improvements
 - Improved the interaction experience of security-related features.
 - Improved the interaction experience when exporting the .nwp format.
 
 ### [0.4.0] - 2025-11-24
-#### Added
+#### New
 - Added local note encryption using the AES-256-GCM algorithm for on-device data protection.
-#### Fixed
+#### Fixes
 - Fixed an issue where the Windows version could leave a background process running after uninstallation in certain scenarios.
 - Fixed translation issues in several non-English languages.
-#### Improved
+#### Improvements
 - Optimized view rendering performance.
 - Improved default language initialization.
 - Optimized application startup speed.
 - Improved the interaction experience of exporting the .nwp format.
 
 ### [0.3.2] - 2025-10-26
-#### Improved
+#### Improvements
 - Optimized the performance of the editor.
 
 ### [0.3.1] - 2025-10-25
-#### Fixed
+#### Fixes
 - Fixed missing translation issues in other languages.
-#### Improved
+#### Improvements
 - Improved the interactive experience of the Check for Updates panel.
 
 ### [0.3.0] - 2025-10-24
-#### Added
+#### New
 - Added note import and export functionality, supporting the import and export of NoteWizard Package (.nwp) and Markdown (.md) formats.
-#### Fixed
+#### Fixes
 - Fixed known issues.
 - Fixed translation issues in other languages.
-#### Improved
+#### Improvements
 - Refactored the Preferences panel code.
 - Improved the Recycle Bin experience.
 - Optimized the update log module loading performance.
 - Optimized VFS performance.
 - Optimized the IPC module.
 
 ### [0.2.6] - 2025-10-04
-#### Improved
+#### Improvements
 - Improved the editor experience.
 
 ### [0.2.5] - 2025-10-03
-#### Fixed
+#### Fixes
 - Fixed an issue introduced in version 0.2.2 that caused the note list in the workspace not to refresh in real time after restarting.
 
 ### [0.2.4] - 2025-10-03
-#### Added
+#### New
 - Added automatic software update feature.
-#### Fixed
+#### Fixes
 - Fixed an issue where the workspace was incorrectly collapsed when closing the preview panel.
 
 ### [0.2.2] - 2025-10-02
-#### Fixed
+#### Fixes
 - Fixed hardcoded internationalization issues.
 - Fixed an issue where the menu bar language did not update after switching languages and restarting.
-#### Improved
+#### Improvements
 - Optimized logic for importing, exporting, and resetting preferences configuration.
 
 ### [0.2.1] - 2025-10-01
-#### Added
+#### New
 - Added automatic build support for Windows, macOS, and Linux installers.
 - Added view switching functionality.
 - Added AI service settings for input delay, minimum input length, system prompt, and network connectivity test for AI service endpoints.
-#### Fixed
+#### Fixes
 - Fixed context menu issues.
 - Fixed several known translation issues.
 - Fixed several known UI issues.
 - Fixed cursor position issue in AI suggestions.
 - Fixed an outline display error introduced in version 0.1.0.
-#### Improved
+#### Improvements
 - Improved interaction experience in the Preferences interface.
 - Refactored AI service interfaces to support all AI services compatible with the OpenAI API.
 
 ### [0.1.0] - 2025-09-20
-#### Fixed
+#### Fixes
 - Fixed scrollbar issue in the note list.
 - Fixed deletion logic issue in the Recycle Bin.
 - Fixed registry residue issue after disabling startup on boot.
-#### Improved
+#### Improvements
 - Improved Recycle Bin interface and interaction.
 
 ### [0.0.9-dev] - 2025-09-15
-#### Improved
+#### Improvements
 - Improved high-resolution display adaptation.
 
 ### [0.0.8-dev] - 2025-09-13
-#### Fixed
+#### Fixes
 - Fixed inaccurate translations in some languages.
 - Fixed untranslated text on some pages.
 - Fixed layout misalignment on some pages when switching languages.
 - Fixed an issue introduced in version 0.0.7 where language switching caused import/export settings to fail.
 
 ### [0.0.7-dev] - 2025-09-11
-#### Added
+#### New
 - Added support for 18 languages and regions: English, French, Russian, German, Italian, etc.
 - Added system tray icon and startup on boot.
-#### Fixed
+#### Fixes
 - Fixed incorrect file size display in note properties dialog.
 - Fixed rare cases where icons or changelog content failed to load on startup.
 - Fixed incorrect file path display in some cases when creating a new note in the workspace.
 - Fixed rare cases where canceling a rename operation was not properly recognized.
-#### Improved
+#### Improvements
 - Upgraded Electron framework to version 37.4.0.
 - Optimized installer package size.
 - Improved notebook expand/collapse state.
@@ -123,51 +132,51 @@
 - Dropped support for Windows 32-bit (x86). Now only supports **Windows 10 and later 64-bit operating systems**.
 
 ### [0.0.6-dev] - 2025-08-30
-#### Added
+#### New
 - Added user guide module.
 
 ### [0.0.5-dev] - 2025-08-29
-#### Added
+#### New
 - Added context menu option to open file location.
 - Added import/export for user preferences configuration.
 - Added custom save path option for note files.
 - Added preferences shortcut key.
 - Added support for the latest AI models.
-#### Fixed
+#### Fixes
 - Fixed incorrect version number display on the About page.
 - Fixed AI service provider list loading failure in some cases.
 - Fixed content security policy issue introduced in version 0.0.4.
-#### Improved
+#### Improvements
 - Improved interaction logic and experience for custom note file save path.
 
 ### [0.0.4-dev] - 2025-08-03
-#### Added
+#### New
 - Added developer tools module.
 
 ### [0.0.3-dev] - 2025-07-29
-#### Added
+#### New
 - Added font size and font family settings.
 - Added About panel, Changelog page, and Check for Updates module.
-#### Fixed
+#### Fixes
 - Fixed misaligned UI elements in some cases.
 - Fixed reset actions not taking effect when switching to English interface.
 - Fixed note save failure in certain cases.
 - Fixed window size memory function failure.
 - Fixed incorrect path when creating notes via context menu in some cases.
 - Fixed AI configuration panel language not updating in real time when switching app language.
-#### Improved
+#### Improvements
 - Improved default window size to support more display devices.
 - Improved page transition and animation effects.
 - Improved interaction experience across multiple UI elements.
 - Improved application startup speed.
 
 ### [0.0.2-dev] - 2025-05-27
-#### Added
+#### New
 - Added dark mode support.
 - Added configuration support for AI providers such as OpenAI ChatGPT, xAI Grok, DeepSeek, Qwen, etc.
 
 ### [0.0.1-dev] - 2025-05-22
-#### Added
+#### New
 - Initial release of the application.
 - Implemented core Markdown editor with real-time preview.
 - Added support for Windows 7 and later operating systems.

src/assets/changelog/history_en.md

@@ -97,13 +97,13 @@
   "startupEnabled": "已启用开机自启动",
   "startupDisabled": "已关闭开机自启动",
   "setStartupFailed": "设置开机自启动失败",
-  "importConfirm": "导入配置将覆盖当前首选项设置，是否继续？",
+  "importConfirm": "导入新的首选项配置将覆盖当前设置，并在应用重启后生效。\n是否继续导入？",
   "restartAppNotify": "设置需要重启应用才能生效，是否现在重启？",
   "importFailed": "导入失败: ",
   "importSuccess": "导入成功: ",
   "exportFailed": "导出失败: ",
   "exportSuccess": "导出成功: ",
-  "resetConfirmNotify": "确定要重置所有设置为默认值吗？此操作不可撤销!",
+  "resetConfirmNotify": "即将重置首选项至默认配置。此操作将清除所有当前设置且不可恢复。\n是否继续？",
   "labelAISystemPrompt": "系统提示词",
   "hintAISystemPrompt": "自定义 AI 辅助写作行为和风格，留空使用默认提示词",
   "placeholderAISystemPrompt": "你是一位AI写作助手，请根据用户提供的上下文，续写或完善文本。只需要返回续写的部分，不要重复用户的文本。每次最多返回一句话。",

src/locales/zh-CN.json

@@ -185,21 +185,36 @@ export function createPreferencesManager(deps) {
           app.getPath("userData"),
           "preferences.json"
         );
+        let existingEncryption = null;
+        
         if (fs.existsSync(settingsPath)) {
           const currentData = await fs.promises.readFile(settingsPath, "utf8");
-          currentSettings.settings = JSON.parse(currentData);
+          const currentPrefs = JSON.parse(currentData);
+          currentSettings.settings = currentPrefs;
           currentSettings.backupDate = new Date().toISOString();
+          
+          // 保存现有的加密配置，导入时不覆盖
+          if (currentPrefs.encryption) {
+            existingEncryption = currentPrefs.encryption;
+          }
+          
           await fs.promises.writeFile(
             backupPath,
             JSON.stringify(currentSettings, null, 2),
             "utf8"
           );
         }
 
-        // 保存新设置
+        // 合并设置：保留原有的加密配置
+        const mergedSettings = { ...preferences.settings };
+        if (existingEncryption) {
+          mergedSettings.encryption = existingEncryption;
+        }
+
+        // 保存合并后的设置
         await fs.promises.writeFile(
           path.join(app.getPath("userData"), "preferences.json"),
-          JSON.stringify(preferences.settings, null, 2),
+          JSON.stringify(mergedSettings, null, 2),
           "utf8"
         );
 

src/modules/preferences/preferences-ipc.js

@@ -67,6 +67,31 @@ function setupEditorEventListeners(editor, aiAssistant) {
     });
     window.dispatchEvent(event);
   });
+
+  // 滚动同步：编辑器滚动时同步预览面板
+  const scrollElement = editor.getScrollerElement();
+  if (scrollElement) {
+    let isSyncing = false;
+    scrollElement.addEventListener('scroll', function() {
+      if (isSyncing) return;
+      
+      const previewContainer = document.getElementById('preview-container');
+      if (!previewContainer) return;
+      
+      const scrollTop = scrollElement.scrollTop;
+      const scrollHeight = scrollElement.scrollHeight - scrollElement.clientHeight;
+      if (scrollHeight <= 0) return;
+      
+      const scrollRatio = scrollTop / scrollHeight;
+      
+      const previewScrollHeight = previewContainer.scrollHeight - previewContainer.clientHeight;
+      if (previewScrollHeight > 0) {
+        isSyncing = true;
+        previewContainer.scrollTop = scrollRatio * previewScrollHeight;
+        requestAnimationFrame(() => { isSyncing = false; });
+      }
+    });
+  }
 }
 
 function handleTabKey(cm) {

src/renderer/editor/editor.js

@@ -5,8 +5,10 @@ <h2 id="pref-title" data-i18n="preferencesTitle"></h2>
       <button id="pref-export" class="exportSetting-btn" data-i18n="btnExportSetting"></button>
       <button id="pref-import" class="importSetting-btn" data-i18n="btnImportSetting"></button>
       <button id="pref-reset" class="resetSetting-btn" data-i18n="btnResetSetting"></button>
+      </br>
       <span class="close" id="pref-close" data-i18n="btnClose"></span>
     </div>
+    
   </div>
   <div class="pref-layout">
     <nav class="pref-sidebar">