From d94b357b2338fbf641e6b3ceb48edb3c8a02e9eb Mon Sep 17 00:00:00 2001 From: xiayuxuan Date: Thu, 11 Jul 2024 00:41:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#835=20=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=85=A8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/hooks/SuggestList.js | 8 ++++---- src/core/hooks/Suggester.js | 3 ++- src/locales/en_US.js | 2 ++ src/locales/zh_CN.js | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/hooks/SuggestList.js b/src/core/hooks/SuggestList.js index 5019f5df..dc3d358a 100644 --- a/src/core/hooks/SuggestList.js +++ b/src/core/hooks/SuggestList.js @@ -261,14 +261,14 @@ const MoreSuggestList = [ }, { icon: 'FullWidth', - label: '行内代码', + label: 'inlineCode', keyword: '`', value: '``', goLeft: 1, }, { icon: 'FullWidth', - label: '代码块', + label: 'codeBlock', keyword: '`', value: '```\n\n```\n', goTop: 2, @@ -316,10 +316,10 @@ export function allSuggestList(keyword, locales) { const systemSuggestList = [].concat(SystemSuggestList); const otherSuggestList = [].concat(OtherSuggestList); systemSuggestList.forEach((item) => { - item.label = locales ? locales[item.label] : item.label; + item.label = locales[item.label] || item.label; }); otherSuggestList.forEach((item) => { - item.label = locales ? locales[item.label] : item.label; + item.label = locales[item.label] || item.label; }); if (keyword[0] === '/' || keyword[0] === '、' || addonsKeywords.includes(keyword[0])) { systemSuggestList.forEach((item) => { diff --git a/src/core/hooks/Suggester.js b/src/core/hooks/Suggester.js index 709365a6..2664b222 100644 --- a/src/core/hooks/Suggester.js +++ b/src/core/hooks/Suggester.js @@ -105,6 +105,7 @@ export default class Suggester extends SyntaxBase { this.suggester = {}; const defaultSuggest = []; + const that = this; // 默认的唤醒关键字 for (const suggesterKeyword of suggesterKeywords) { defaultSuggest.push({ @@ -112,7 +113,7 @@ export default class Suggester extends SyntaxBase { suggestList(_word, callback) { // 将word全转成小写 const word = _word.toLowerCase(); - const systemSuggestList = allSuggestList(suggesterKeyword, this.$locale); + const systemSuggestList = allSuggestList(suggesterKeyword, that.$locale); // 加个空格就直接退出联想 if (/^\s$/.test(word)) { callback(false); diff --git a/src/locales/en_US.js b/src/locales/en_US.js index 5df6407e..23a4dec1 100644 --- a/src/locales/en_US.js +++ b/src/locales/en_US.js @@ -99,4 +99,6 @@ export default { superLarge: 'Super Large', detailDefaultContent: 'Click to expand more\nContent\n++- Expand by default\nContent\n++ Collapse by default\nContent', + inlineCode: 'Inline Code', + codeBlock: 'Code Block', }; diff --git a/src/locales/zh_CN.js b/src/locales/zh_CN.js index bee5674a..00b4dc20 100644 --- a/src/locales/zh_CN.js +++ b/src/locales/zh_CN.js @@ -102,4 +102,6 @@ export default { large: '大', superLarge: '特大', detailDefaultContent: '点击展开更多\n内容\n++- 默认展开\n内容\n++ 默认收起\n内容', + inlineCode: '行内代码', + codeBlock: '代码块', };