Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-27 02:36:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-12-30 12:23:32 +08:00
commit c3d8f1efc9
9 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/changelogs/v3.5.2/v3.5.2.md
View file

@ -27,6 +27,7 @@ Below are the detailed changes in this version.
* [In read-only mode search results cannot be navigated to](https://github.com/siyuan-note/siyuan/issues/16680)
* [Attribute values are not escaped](https://github.com/siyuan-note/siyuan/issues/16686)
* [The `updateBlock` API encountered a null pointer error](https://github.com/siyuan-note/siyuan/issues/16705)
* [`Optimize typography` nested callout blocks within the task list caused an error](https://github.com/siyuan-note/siyuan/issues/16725)
### Refactor

1
app/changelogs/v3.5.2/v3.5.2_zh_CHT.md
View file

@ -27,6 +27,7 @@
* [唯讀模式下無法跳轉搜尋結果](https://github.com/siyuan-note/siyuan/issues/16680)
* [屬性值未進行轉義](https://github.com/siyuan-note/siyuan/issues/16686)
* [`updateBlock` API 遇到空指標錯誤](https://github.com/siyuan-note/siyuan/issues/16705)
* [`優化排版` 任務清單嵌套提示區塊異常](https://github.com/siyuan-note/siyuan/issues/16725)
### 開發重構

1
app/changelogs/v3.5.2/v3.5.2_zh_CN.md
View file

@ -27,6 +27,7 @@
* [只读模式下无法跳转搜索结果](https://github.com/siyuan-note/siyuan/issues/16680)
* [属性值未进行转义](https://github.com/siyuan-note/siyuan/issues/16686)
* [`updateBlock` API 遇到空指针错误](https://github.com/siyuan-note/siyuan/issues/16705)
* [`优化排版` 任务列表嵌套提示块异常](https://github.com/siyuan-note/siyuan/issues/16725)
### 开发重构

4
app/src/config/fileTree.ts
View file

@ -90,8 +90,8 @@ export const fileTree = {
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">
${window.siyuan.languages.recentDocsMaxCount}
<div class="b3-label__text">${window.siyuan.languages.recentDocsMaxCountTip}</div>
${window.siyuan.languages.recentDocsMaxListCount}
<div class="b3-label__text">${window.siyuan.languages.recentDocsMaxListCountTip}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="recentDocsMaxListCount" type="number" min="32" max="256" value="${window.siyuan.config.fileTree.recentDocsMaxListCount}">

2
app/src/config/search.ts
View file

@ -35,7 +35,7 @@ export const initConfigSearch = (element: HTMLElement, app: App) => {
getLang(["selectOpen", "tabLimit", "fileTree", "fileTree2", "fileTree3", "fileTree4", "fileTree5",
"fileTree6", "fileTree7", "fileTree8", "fileTree9", "fileTree10", "fileTree12", "fileTree13", "fileTree15",
"fileTree16", "fileTree17", "fileTree18", "fileTree19", "fileTree20", "fileTree21", "fileTree22", "fileTree23",
"fileTree24", "fileTree25", "recentDocsMaxCount", "recentDocsMaxCountTip"]),
"fileTree24", "fileTree25", "recentDocsMaxListCount", "recentDocsMaxListCountTip"]),
// 闪卡
getLang(["riffCard", "flashcardNewCardLimit", "flashcardNewCardLimitTip", "flashcardReviewCardLimit",

2
app/src/plugin/index.ts
View file

@ -269,7 +269,7 @@ export class Plugin {
this.data[storageName] = response;
resolve(this.data[storageName]);
}, null, (response) => {
reject(response);
resolve("");
});
});
}

4
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.20251208021445-f93f2666eaac
github.com/88250/lute v1.7.7-0.20251229120557-04624d6f8b0f
github.com/88250/lute v1.7.7-0.20251230035220-bc8ebaa605a4
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,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.20251208021445-f93f2666eaac h1:EC80pY8zyR0gbL8ZLIBB4IPG/ia3ZHScrR/xt8zU8qU=
github.com/88250/gulu v1.2.3-0.20251208021445-f93f2666eaac/go.mod h1:IQ5dXW9CjVmx6B7OfK1Y4ZBKTPMe9q1AkVoLGGzRbS8=
github.com/88250/lute v1.7.7-0.20251229120557-04624d6f8b0f h1:EcvPctrQy2qfk5Sq2W45GDyrzbbHKeTGlJGYCYxZvrI=
github.com/88250/lute v1.7.7-0.20251229120557-04624d6f8b0f/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20251230035220-bc8ebaa605a4 h1:t9gV+5keET8FsUuXzoYigXVMgB429iG3TEzfNQDREPo=
github.com/88250/lute v1.7.7-0.20251230035220-bc8ebaa605a4/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=