Skip to content

Commit

Permalink
Merge pull request #716 from Hi-Windom/v0.33
Browse files Browse the repository at this point in the history
V0.33
  • Loading branch information
Soltus authored May 11, 2024
2 parents fe57223 + e446c47 commit 579597f
Show file tree
Hide file tree
Showing 39 changed files with 284 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<h2><a href="https://github.com/orgs/Hi-Windom/projects/2/views/2">汐洛路线图(Sillot Roadmap)</a></h2>
<h2><a href="https://github.com/orgs/Hi-Windom/projects/3/views/2">汐洛安卓路线图(Sillot Android Roadmap)</a></h2>
<h2><a href="https://github.com/orgs/Hi-Windom/projects/4/views/2">汐洛社区路线图(Sillot Community Roadmap)</a></h2>
<h2><a href="https://github.com/orgs/Hi-Windom/projects/6/views/2">汐洛扩展路线图(Sillot Extention Roadmap)</a></h2>
<h2><a href="https://github.com/orgs/Hi-Windom/projects/6/views/2">汐洛扩展路线图(Sillot Extentions Roadmap)</a></h2>
</p>

<p align="center">
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions/Sillot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sillot",
"displayName": "汐洛 Sillot",
"description": "汐洛彖夲肜矩阵(Sillot T☳Converbenk Matrix)为智慧新彖务服务。此插件为汐洛官方插件,提供多功能一体化集成。",
"version": "0.33.1620",
"version": "0.33.1630",
"preview": true,
"repository": "https://github.com/Hi-Windom/Sillot",
"publisher": "Hi-Windom",
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
"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",
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
"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",
Expand Down
4 changes: 2 additions & 2 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
"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",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/ja_JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"backlinkExpand": "バックリンクのデフォルト展開数",
"backlinkExpandTip": "<code class='fn__code'>0</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": "フローティングウィンドウのトリガー方法",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"backlinkExpand": "反向連結預設展開數",
"backlinkExpandTip": "配置為 <code class='fn__code'>0</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": "浮窗觸發方式",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
"backlinkExpand": "反向链接默认展开数",
"backlinkExpandTip": "配置为 <code class='fn__code'>0</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": "浮窗触发方式",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"id": "20200924101225-k254i8g",
"title": "Content Block Type",
"type": "doc",
"updated": "20240427231144"
"updated": "20240510235721"
},
"Children": [
{
Expand Down Expand Up @@ -1814,7 +1814,8 @@
"ID": "20210104091538-9zkv22k",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104091538-9zkv22k"
"id": "20210104091538-9zkv22k",
"updated": "20210104091538"
},
"Children": [
{
Expand All @@ -1834,6 +1835,20 @@
}
]
},
{
"ID": "20240510235622-zfu6ujw",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510235622-zfu6ujw",
"updated": "20240510235721"
},
"Children": [
{
"Type": "NodeText",
"Data": "The unordered list block can only contain list item blocks, and neighboring unordered list blocks are widely spaced."
}
]
},
{
"ID": "20210104091538-lb00enw",
"Type": "NodeParagraph",
Expand Down Expand Up @@ -2003,12 +2018,13 @@
"ID": "20210104091538-1ix6ueu",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104091538-1ix6ueu"
"id": "20210104091538-1ix6ueu",
"updated": "20240510235637"
},
"Children": [
{
"Type": "NodeText",
"Data": "An ordered list block is a type "
"Data": "The ordered list block is a type "
},
{
"Type": "NodeTextMark",
Expand All @@ -2023,6 +2039,20 @@
}
]
},
{
"ID": "20240510235620-trltkc3",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510235620-trltkc3",
"updated": "20240510235659"
},
"Children": [
{
"Type": "NodeText",
"Data": "The ordered list block can only contain list item blocks, and neighboring ordered list blocks are widely spaced."
}
]
},
{
"ID": "20210104091538-uz0na96",
"Type": "NodeHeading",
Expand Down Expand Up @@ -2200,6 +2230,20 @@
}
]
},
{
"ID": "20240510235512-za4depm",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510235512-za4depm",
"updated": "20240510235706"
},
"Children": [
{
"Type": "NodeText",
"Data": "The task list block can only contain list item blocks, and neighboring task list blocks are widely spaced."
}
]
},
{
"ID": "20210104091538-wqiaxdu",
"Type": "NodeHeading",
Expand Down Expand Up @@ -2265,7 +2309,8 @@
"ID": "20210104091538-lbf2al4",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104091538-lbf2al4"
"id": "20210104091538-lbf2al4",
"updated": "20210104091538"
},
"Children": [
{
Expand All @@ -2285,6 +2330,20 @@
}
]
},
{
"ID": "20240510235301-s4nj22e",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510235301-s4nj22e",
"updated": "20240510235356"
},
"Children": [
{
"Type": "NodeText",
"Data": "List item blocks are contained within a list block, and neighboring list item blocks are less widely spaced."
}
]
},
{
"ID": "20210104091538-w91ot9s",
"Type": "NodeHeading",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"id": "20200905090211-2vixtlf",
"title": "内容块类型",
"type": "doc",
"updated": "20240427230507"
"updated": "20240510235019"
},
"Children": [
{
Expand Down Expand Up @@ -1819,11 +1819,26 @@
}
]
},
{
"ID": "20240510234951-58h7o7g",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510234951-58h7o7g",
"updated": "20240510235019"
},
"Children": [
{
"Type": "NodeText",
"Data": "无序列表块只能包含列表项块,相邻的无序列表块间距较大。"
}
]
},
{
"ID": "20210104090624-5p4i03b",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104090624-5p4i03b"
"id": "20210104090624-5p4i03b",
"updated": "20210104090624"
},
"Children": [
{
Expand All @@ -1837,7 +1852,7 @@
},
{
"Type": "NodeText",
"Data": ""
"Data": ""
}
]
},
Expand Down Expand Up @@ -1987,7 +2002,8 @@
"ID": "20210104090624-13yo86l",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104090624-13yo86l"
"id": "20210104090624-13yo86l",
"updated": "20210104090624"
},
"Children": [
{
Expand All @@ -2007,6 +2023,20 @@
}
]
},
{
"ID": "20240510234949-rphupr1",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510234949-rphupr1",
"updated": "20240510234959"
},
"Children": [
{
"Type": "NodeText",
"Data": "有序列表块只能包含列表项块,相邻的有序列表块间距较大。"
}
]
},
{
"ID": "20210104090624-mvu5j2d",
"Type": "NodeHeading",
Expand Down Expand Up @@ -2184,6 +2214,20 @@
}
]
},
{
"ID": "20240510234858-y5tx7l9",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510234858-y5tx7l9",
"updated": "20240510234944"
},
"Children": [
{
"Type": "NodeText",
"Data": "任务列表块只能包含列表项块,相邻的任务列表块间距较大。"
}
]
},
{
"ID": "20210104090624-n9anlgh",
"Type": "NodeHeading",
Expand Down Expand Up @@ -2249,7 +2293,8 @@
"ID": "20210104090624-wcbtwum",
"Type": "NodeParagraph",
"Properties": {
"id": "20210104090624-wcbtwum"
"id": "20210104090624-wcbtwum",
"updated": "20210104090624"
},
"Children": [
{
Expand All @@ -2269,6 +2314,20 @@
}
]
},
{
"ID": "20240510234715-ystlvq4",
"Type": "NodeParagraph",
"Properties": {
"id": "20240510234715-ystlvq4",
"updated": "20240510234833"
},
"Children": [
{
"Type": "NodeText",
"Data": "列表项块被包含在列表块内,相邻的列表项块间距较小。"
}
]
},
{
"ID": "20210104090624-37f19ny",
"Type": "NodeHeading",
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sillot",
"version": "0.33.1620",
"version": "0.33.1630",
"syv": "3.0.14",
"sypv": "[]",
"description": "Build Your Eternal Digital Garden",
Expand Down
2 changes: 1 addition & 1 deletion app/src/boot/globalEvent/commandPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {getAllModels} from "../../layout/getAll";
import type {Files} from "../../layout/dock/Files";
import {Search} from "../../search";
import {openSetting} from "../../config";
import {Tab} from "../../layout/Tab";
import type {Tab} from "../../layout/Tab";
/// #endif
import {openHistory} from "../../history/history";
import {addEditorToDatabase, addFilesToDatabase} from "../../protyle/render/av/addToDatabase";
Expand Down
2 changes: 1 addition & 1 deletion app/src/boot/globalEvent/commonHotkey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {fetchPost} from "../../util/fetch";
import {sendGlobalShortcut} from "./keydown";
import {ipcRenderer} from "electron";
/// #endif
import {App} from "../../index";
import type {App} from "../../index";
import {isMac, isNotCtrl, isOnlyMeta} from "../../protyle/util/compatibility";
import {showPopover} from "../../block/popover";

Expand Down
2 changes: 1 addition & 1 deletion app/src/config/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ ${
/// #if !BROWSER
const autoLaunchElement = about.element.querySelector("#autoLaunch") as HTMLInputElement;
autoLaunchElement.addEventListener("change", () => {
const autoLaunchMode = parseInt(autoLaunchElement.value);
const autoLaunchMode = Number.parseInt(autoLaunchElement.value);
fetchPost("/api/system/setAutoLaunch", {autoLaunch: autoLaunchMode}, () => {
window.siyuan.config.system.autoLaunch2 = autoLaunchMode;
ipcRenderer.send(Constants.SIYUAN_AUTO_LAUNCH, {
Expand Down
2 changes: 1 addition & 1 deletion app/src/config/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export const editor = {
<div class="b3-label__text">${window.siyuan.languages.backmentionExpandTip}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="backmentionExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
<input class="b3-text-field fn__flex-center fn__size200" id="backmentionExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">
Expand Down
2 changes: 1 addition & 1 deletion app/src/editor/openLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const openLink = (protyle: IProtyle, aLink: string, event?: MouseEvent, c
linkAddress = `assets/${pdfAddress[1]}`;
pdfParams = pdfAddress[2];
} else {
pdfParams = parseInt(getSearch("page", linkAddress));
pdfParams = Number.parseInt(getSearch("page", linkAddress));
linkAddress = linkAddress.split("?page")[0];
}
}
Expand Down
Loading

0 comments on commit 579597f

Please sign in to comment.