diff --git a/README.md b/README.md index 4745393..b336702 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Markdown 文档自动即时渲染为微信图文,让你不再为微信文章 - [x] 支持自定义 CSS 样式 - [x] 支持 Markdown 所有基础语法 - [x] 支持浅色、暗黑两种主题模式 -- [x] 支持 Ctrl + F 快速格式化文档 +- [x] 支持 Alt + Shift + F 快速格式化文档 - [x] 支持色盘取色,快速替换文章整体色调 - [x] 支持多图上传,可自定义配置图床 - [x] 支持自定义上传逻辑 diff --git a/src/assets/example/theme-css.txt b/src/assets/example/theme-css.txt index 4e2a287..cadc8c2 100644 --- a/src/assets/example/theme-css.txt +++ b/src/assets/example/theme-css.txt @@ -1,5 +1,5 @@ /* - 按Ctrl/Command+F可格式化 + 按 Alt/Option + Shift + F 可格式化 */ /* 一级标题样式 */ h1 { diff --git a/src/components/CodemirrorEditor/EditorHeader/index.vue b/src/components/CodemirrorEditor/EditorHeader/index.vue index 2eb412a..b1f8c23 100644 --- a/src/components/CodemirrorEditor/EditorHeader/index.vue +++ b/src/components/CodemirrorEditor/EditorHeader/index.vue @@ -20,6 +20,7 @@ import { DropdownMenuTrigger, } from '@/components/ui/dropdown-menu' +import { altSign, ctrlKey, ctrlSign, shiftSign } from '@/config' import { mergeCss, solveWeChatImage } from '@/utils' import { useStore } from '@/stores' @@ -29,42 +30,36 @@ const emit = defineEmits([ `startCopy`, `endCopy`, ]) -const defaultKeyMap = CodeMirror.keyMap.default -const modPrefix - = defaultKeyMap === CodeMirror.keyMap.macDefault ? `Cmd` : `Ctrl` - -const kbdIcon - = defaultKeyMap === CodeMirror.keyMap.macDefault ? `⌘` : `Ctrl` const formatItems = [ { label: `加粗`, - kbd: [kbdIcon, `B`], - emitArgs: [`addFormat`, `${modPrefix}-B`], + kbd: [ctrlSign, `B`], + emitArgs: [`addFormat`, `${ctrlKey}-B`], }, { label: `斜体`, - kbd: [kbdIcon, `I`], - emitArgs: [`addFormat`, `${modPrefix}-I`], + kbd: [ctrlSign, `I`], + emitArgs: [`addFormat`, `${ctrlKey}-I`], }, { label: `删除线`, - kbd: [kbdIcon, `D`], - emitArgs: [`addFormat`, `${modPrefix}-D`], + kbd: [ctrlSign, `D`], + emitArgs: [`addFormat`, `${ctrlKey}-D`], }, { label: `超链接`, - kbd: [kbdIcon, `K`], - emitArgs: [`addFormat`, `${modPrefix}-K`], + kbd: [ctrlSign, `K`], + emitArgs: [`addFormat`, `${ctrlKey}-K`], }, { label: `行内代码`, - kbd: [kbdIcon, `E`], - emitArgs: [`addFormat`, `${modPrefix}-E`], + kbd: [ctrlSign, `E`], + emitArgs: [`addFormat`, `${ctrlKey}-E`], }, { label: `格式化`, - kbd: [kbdIcon, `F`], + kbd: [altSign, shiftSign, `F`], emitArgs: [`formatContent`], }, ] @@ -124,9 +119,9 @@ function copy() { /class="base"( style="display: inline")*/g, `class="base" style="display: inline"`, ) - // 公众号不支持 position, 转换为等价的 translateY + // 公众号不支持 position, 转换为等价的 translateY .replace(/top:(.*?)em/g, `transform: translateY($1em)`) - // 适配主题中的颜色变量 + // 适配主题中的颜色变量 .replaceAll(`var(--el-text-color-regular)`, `#3f3f3f`) clipboardDiv.focus() window.getSelection().removeAllRanges() @@ -182,21 +177,16 @@ function updateOpen(isOpen) {