0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-05-11 10:50:39 +08:00
commit 89c55026ab
11 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/appearance/langs/en_US.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "Number of dynamically loaded blocks",
"dynamicLoadBlocksTip": "This value contains the number of subblocks. If there are many code blocks, formula blocks or chart blocks that need to be rendered, it is recommended not to set too large",
"backlinkExpand": "Backlink default expand",
"backlinkExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded",
"backlinkExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded, if configured as <code class='fn__code'>-1</code>, the panel will be closed",
"backmentionExpand": "Backmention default expand",
"backmentionExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded",
"backmentionExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded, if configured as <code class='fn__code'>-1</code>, the panel will be closed",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "After enabling, it will use <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> to count the opening status of the application and will not collect users data and operations",
"floatWindowMode": "Floating window trigger method",

4
app/appearance/langs/es_ES.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "Número de bloques cargados dinámicamente",
"dynamicLoadBlocksTip": "Este valor contiene el número de subbloques. Si hay muchos bloques de código, bloques de fórmulas o bloques de gráficos que necesitan renderizarse, se recomienda no configurarlos demasiado grandes",
"backlinkExpand": "Expansión predeterminada de vínculo de retroceso",
"backlinkExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá",
"backlinkExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá, si se configura como <code class='fn__code'>-1</code>, el panel se cerrará",
"backmentionExpand": "Expansión predeterminada de la mención",
"backmentionExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá",
"backmentionExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá, , si se configura como <code class='fn__code'>-1</code>, el panel se cerrará",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "Después de habilitarlo, usará <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> para contar el estado de apertura del aplicación y no recopilará datos y operaciones de los usuarios",
"floatWindowMode": "Método de activación de ventana flotante",

4
app/appearance/langs/fr_FR.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "Nombre de blocs chargés dynamiquement",
"dynamicLoadBlocksTip": "Cette valeur contient le nombre de sous-blocs. S'il y a beaucoup de blocs de code, de blocs de formule ou de blocs de graphique qui doivent être rendus, il est recommandé de ne pas définir trop grand",
"backlinkExpand": "Développer le lien retour par défaut",
"backlinkExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé",
"backlinkExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé, s'il est configuré comme <code class='fn__code'>-1</code>, le panneau sera fermé",
"backmentionExpand": "Développer la mention par défaut",
"backmentionExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé",
"backmentionExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé, s'il est configuré comme <code class='fn__code'>-1</code>, le panneau sera fermé",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "Après l'activation, il utilisera <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> pour compter le statut d'ouverture du l'application et ne collectera pas les Données et Opérations des utilisateurs",
"floatWindowMode": "Méthode de déclenchement de fenêtre flottante",

4
app/appearance/langs/ja_JP.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "動的に読み込まれるブロックの数",
"dynamicLoadBlocksTip": "この値にはサブブロックの数が含まれます。レンダリングする必要があるコードブロック、数式ブロック、チャートブロックが数多くある場合はあまり大きな数値に設定しないことをお勧めします",
"backlinkExpand": "バックリンクのデフォルト展開数",
"backlinkExpandTip": "<code class='fn__code'>0</code> の場合は展開されません",
"backlinkExpandTip": "<code class='fn__code'>0</code> の場合は展開されません、<code class='fn__code'>-1</code> に設定してパネルを閉じます",
"backmentionExpand": "逆参照のデフォルト展開数",
"backmentionExpandTip": "<code class='fn__code'>0</code> の場合は展開されません",
"backmentionExpandTip": "<code class='fn__code'>0</code> の場合は展開されません、<code class='fn__code'>-1</code> に設定してパネルを閉じます",
"googleAnalytics": "Google アナリティクス",
"googleAnalyticsTip": "<a href=\"https://analytics.google.com/\" target=\"_blank\">Google アナリティクス</a>を使用してアプリケーションの起動状況をカウントします。ユーザーデータや操作内容は収集されません",
"floatWindowMode": "フローティングウィンドウのトリガー方法",

4
app/appearance/langs/zh_CHT.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "動態載入塊數",
"dynamicLoadBlocksTip": "該值包含了子塊數。如果需要渲染的代碼塊、公式塊或圖表塊較多，建議不要設置過大",
"backlinkExpand": "反向連結預設展開數",
"backlinkExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開",
"backlinkExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開，配置為 <code class='fn__code'>-1</code> 則收起面板",
"backmentionExpand": "反向提及默認展開數",
"backmentionExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開",
"backmentionExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開，配置為 <code class='fn__code'>-1</code> 則收起面板",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "啟用後會通過 <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> 統計應用打開狀態，不會收集用戶資料和操作",
"floatWindowMode": "浮窗觸發方式",

4
app/appearance/langs/zh_CN.json
View file

@ -425,9 +425,9 @@
"dynamicLoadBlocks": "动态加载块数",
"dynamicLoadBlocksTip": "该值包含了子块数。如果需要渲染的代码块、公式块或图表块较多，建议不要设置过大",
"backlinkExpand": "反向链接默认展开数",
"backlinkExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开",
"backlinkExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开，配置为 <code class='fn__code'>-1</code> 则收起面板",
"backmentionExpand": "反向提及默认展开数",
"backmentionExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开",
"backmentionExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开，配置为 <code class='fn__code'>-1</code> 则收起面板",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "启用后会通过 <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> 统计应用打开状态，不会收集用户数据和操作",
"floatWindowMode": "浮窗触发方式",

4
app/src/mobile/settings/editor.ts
View file

@ -197,13 +197,13 @@ export const initEditor = () => {
<div class="b3-label fn__displayblock">
${window.siyuan.languages.backlinkExpand}
<span class="fn__hr"></span>
<input class="b3-text-field fn__block" id="backlinkExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backlinkExpandCount}"/>
<input class="b3-text-field fn__block" id="backlinkExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backlinkExpandCount}"/>
<div class="b3-label__text">${window.siyuan.languages.backlinkExpandTip}</div>
</div>
<div class="b3-label fn__displayblock">
${window.siyuan.languages.backmentionExpand}
<span class="fn__hr"></span>
<input class="b3-text-field fn__block" id="backmentionExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
<input class="b3-text-field fn__block" id="backmentionExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
<div class="b3-label__text">${window.siyuan.languages.backmentionExpandTip}</div>
</div>
<div class="b3-label fn__displayblock">

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866
github.com/88250/lute v1.7.7-0.20240510125524-6b3ecafd3cd1
github.com/88250/lute v1.7.7-0.20240511011103-ee3fcf022f67
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4

4
kernel/go.sum
View file

@ -12,8 +12,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866 h1:RFfNFS0hv6TbOuwET6xZAfGlV4hNlXiWTnfbLN1eF6k=
github.com/88250/gulu v1.2.3-0.20240505150113-bc43bd50f866/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
github.com/88250/lute v1.7.7-0.20240510125524-6b3ecafd3cd1 h1:qdK0s0WpOCvJ2rwThumKf71pMeWioaMU4cclN/0Eb4Q=
github.com/88250/lute v1.7.7-0.20240510125524-6b3ecafd3cd1/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/lute v1.7.7-0.20240511011103-ee3fcf022f67 h1:rI5b68lBBQufQS6/6qXwjeQFuU1Y6hj0cBQwpErtRF0=
github.com/88250/lute v1.7.7-0.20240511011103-ee3fcf022f67/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

8
kernel/model/conf.go
View file

@ -249,11 +249,11 @@ func InitConf() {
if conf.MaxDynamicLoadBlocks < Conf.Editor.DynamicLoadBlocks {
Conf.Editor.DynamicLoadBlocks = conf.MaxDynamicLoadBlocks
}
if 0 > Conf.Editor.BacklinkExpandCount {
Conf.Editor.BacklinkExpandCount = 0
if -1 > Conf.Editor.BacklinkExpandCount {
Conf.Editor.BacklinkExpandCount = -1
}
if 0 > Conf.Editor.BackmentionExpandCount {
Conf.Editor.BackmentionExpandCount = 0
if -1 > Conf.Editor.BackmentionExpandCount {
Conf.Editor.BackmentionExpandCount = -1
}
if nil == Conf.Editor.Markdown {
Conf.Editor.Markdown = &util.Markdown{}