Merge branch 'release/3.83.2'

Author: purocean

README.md

@@ -76,9 +76,9 @@ For more information on how to use the following functions, please see [characte
 
 ## Changelogs
 
-### [v3.83.1](https://github.com/purocean/yn/releases/tag/v3.83.1) 2025-07-14
+### [v3.83.2](https://github.com/purocean/yn/releases/tag/v3.83.2) 2025-07-15
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-win-x64-3.83.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-mac-arm64-3.83.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-mac-x64-3.83.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-linux-x86_64-3.83.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-linux-amd64-3.83.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-win-x64-3.83.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-mac-arm64-3.83.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-mac-x64-3.83.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-linux-x86_64-3.83.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-linux-amd64-3.83.2.deb)
 
 1. feat: Added configuration for editor scroll wheel sensitivity
 2. feat: Added configuration for editor ruler settings

README_ZH-CN.md

@@ -76,9 +76,9 @@
 
 ## 更新日志
 
-### [v3.83.1](https://github.com/purocean/yn/releases/tag/v3.83.1) 2025-07-14
+### [v3.83.2](https://github.com/purocean/yn/releases/tag/v3.83.2) 2025-07-15
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-win-x64-3.83.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-mac-arm64-3.83.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-mac-x64-3.83.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-linux-x86_64-3.83.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.83.1/Yank-Note-linux-amd64-3.83.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-win-x64-3.83.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-mac-arm64-3.83.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-mac-x64-3.83.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-linux-x86_64-3.83.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.83.2/Yank-Note-linux-amd64-3.83.2.deb)
 
 1. feat: 增加配置编辑器滚轮敏感度配置
 2. feat: 增加配置编辑器标尺配置

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "3.83.1",
+  "version": "3.83.2",
   "description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
   "main": "dist/main/app.js",
   "license": "AGPL-3.0",

src/renderer/components/Setting.vue

@@ -5,7 +5,7 @@
     <div v-show="isReady" ref="refEditor" class="editor" @click="onClick" />
     <div class="action">
       <a href="javascript:void(0)" @click="showKeyboardShortcuts">{{ $t('setting-panel.change-keyboard-shortcuts') }}</a>
-      <button class="btn tr" @click="cancel">{{$t('cancel')}}</button>
+      <button class="btn tr" @click="close">{{$t('cancel')}}</button>
       <button class="btn primary tr" @click="ok">{{$t('ok')}}</button>
     </div>
   </div>
@@ -175,7 +175,8 @@ export default defineComponent({
       removeHook('I18N_CHANGE_LANGUAGE', setLanguage)
     })
 
-    const cancel = () => {
+    const close = async () => {
+      await triggerHook('SETTING_PANEL_BEFORE_CLOSE', { editor }, { breakable: true })
       emit('close')
     }
 
@@ -208,7 +209,7 @@ export default defineComponent({
 
         await writeSettings({ ...value })
       }
-      emit('close')
+      close()
     }
 
     const onClick = async (e: Event) => {
@@ -253,13 +254,13 @@ export default defineComponent({
     }
 
     function showKeyboardShortcuts () {
-      emit('close')
+      close()
       getActionHandler('keyboard-shortcuts.show-manager')()
     }
 
     watch(tab, updateTab)
 
-    return { isReady, tab, tabs, show, refEditor, cancel, ok, onClick, showKeyboardShortcuts }
+    return { isReady, tab, tabs, show, refEditor, close, ok, onClick, showKeyboardShortcuts }
   },
 })
 </script>

src/renderer/plugins/custom-styles.ts

@@ -73,8 +73,14 @@ export default {
 
       editor.watch('root.render.extra-css-style', () => {
         const value = editor.getEditor('root.render.extra-css-style').getValue()
-        debouncedUpdate(value)
+        updateRenderExtraStyle(value)
       })
     })
+
+    ctx.registerHook('SETTING_PANEL_BEFORE_CLOSE', async () => {
+      await ctx.utils.sleep(100)
+      const extraStyle = ctx.setting.getSetting('render.extra-css-style', '')
+      updateRenderExtraStyle(extraStyle)
+    })
   }
 } as Plugin

src/renderer/services/editor.ts

@@ -102,7 +102,7 @@ export const getDefaultOptions = (): Monaco.editor.IStandaloneEditorConstruction
   lightbulb: { enabled: 'on' as any },
   fontLigatures: getSetting('editor.font-ligatures', false),
   wordSeparators: '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?。？！，、；：“”‘’（）《》〈〉【】『』「」﹃﹄〔〕',
-  rulers: getSetting('editor.rulers', '').split(',').map(Number),
+  rulers: getSetting('editor.rulers', '').split(',').filter(Boolean).map(Number),
   mouseWheelScrollSensitivity: getSetting('editor.mouse-wheel-scroll-sensitivity', 1.0),
 })
 

src/renderer/types.ts

@@ -530,6 +530,7 @@ export type BuildInHookTypes = {
   I18N_CHANGE_LANGUAGE: { lang: LanguageName, currentLang: Language },
   SETTING_PANEL_BEFORE_SHOW: {},
   SETTING_PANEL_AFTER_SHOW: { editor: any },
+  SETTING_PANEL_BEFORE_CLOSE: { editor: any },
   SETTING_CHANGED: { schema: SettingSchema, changedKeys: (keyof BuildInSettings)[], oldSettings: BuildInSettings, settings: BuildInSettings }
   SETTING_FETCHED: { settings: BuildInSettings, oldSettings: BuildInSettings },
   SETTING_BEFORE_WRITE: { settings: Partial<BuildInSettings> },