Skip to content

Commit 4487fa2

Browse files
committed
Merge commit '1317020c1791edf440da7f836d366567e03dd843'
* commit '1317020c1791edf440da7f836d366567e03dd843': (65 commits) 🔖 Release v3.1.26 🎨 Add index `idx_attributes_block_id` https://ld246.com/article/1742827508465 📝 Supports append text by shortcuts to the dailynote doc on Android siyuan-note#14414 🎨 Support in-app purchase PRO Features and Subscription on iOS siyuan-note#14159 📝 Supports append text by shortcuts to the dailynote doc on Android siyuan-note#14414 🎨 📝 Update changelogs 🎨 siyuan-note#14372 🎨 siyuan-note#14364 🎨 siyuan-note#14405 🐛 siyuan-note#14326 🎨 siyuan-note#14326 🎨 siyuan-note#14156 ⬆️ Upgrade lute siyuan-note#14397 ⬆️ Upgrade lute siyuan-note#14424 🎨 siyuan-note#14395 🎨 siyuan-note#14406 🎨 siyuan-note#14428 ⬆️ Upgrade lute siyuan-note#14424 🎨 Support indented code block syntax when importing Markdown siyuan-note#14429 ...
2 parents 05eeb0b + 1317020 commit 4487fa2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+973
-348
lines changed

.github/CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]`
1414

1515
Set the Electron mirror environment variable and install Electron:
1616

17-
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].3 -D`
17+
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D`
1818
* Windows:
1919
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
20-
* `pnpm install [email protected].3 -D`
20+
* `pnpm install [email protected].4 -D`
2121

2222
NPM mirror:
2323

@@ -28,7 +28,7 @@ NPM mirror:
2828

2929
On the desktop, go to the app folder to run:
3030

31-
* `pnpm install [email protected].3 -D`
31+
* `pnpm install [email protected].4 -D`
3232
* `pnpm run dev`
3333
* `pnpm run start`
3434

@@ -55,7 +55,7 @@ Note: In the development environment, the kernel process will not be automatical
5555
### Android
5656

5757
* `cd kernel`
58-
* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/`
58+
* `set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8; gomobile bind --tags fts5 -ldflags "-s -w" -v -o kernel.aar -target=android/arm64 -androidapi 26 ./mobile/`
5959
* https://github.com/siyuan-note/siyuan-android
6060

6161
### Harmony

.github/CONTRIBUTING_zh_CN.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
* macOS/Linux:
1818
```
19-
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].3 -D
19+
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].4 -D
2020
```
2121
* Windows:
2222
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
23-
* `pnpm install [email protected].3 -D`
23+
* `pnpm install [email protected].4 -D`
2424

2525
NPM 镜像:
2626

@@ -30,7 +30,7 @@ NPM 镜像:
3030

3131
桌面端进入 app 文件夹运行:
3232

33-
* `pnpm install [email protected].3 -D`
33+
* `pnpm install [email protected].4 -D`
3434
* `pnpm run dev`
3535
* `pnpm run start`
3636

@@ -57,7 +57,8 @@ NPM 镜像:
5757
### Android
5858

5959
* `cd kernel`
60-
* `gomobile bind --tags fts5 -ldflags '-s -w' -v -o kernel.aar -target='android/arm64' -androidapi 24 ./mobile/`
60+
* `set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8`
61+
* `gomobile bind --tags fts5 -ldflags "-s -w" -v -o kernel.aar -target=android/arm64 -androidapi 26 ./mobile/`
6162
* https://github.com/siyuan-note/siyuan-android
6263

6364
### Harmony

.gitignore

+1-6
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ electron/dist
3131

3232
# Log
3333
logs
34-
*.log
35-
npm-debug.log*
36-
yarn-debug.log*
37-
yarn-error.log*
38-
pnpm-debug.log*
39-
lerna-debug.log*
34+
*.log*
4035

4136
# NPM Package
4237
package-lock.json

app/appearance/themes/daylight/theme.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/* 字体 */
2525
/* "Segoe UI" 和 Noto-COLRv1-2.047 冲突,故移除 */
26-
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Hiragino Sans", arial, sans-serif, emojis;
26+
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", arial, sans-serif, emojis;
2727
--b3-font-family-protyle: var(--b3-font-family);
2828
--b3-font-family-code: "Emojis Additional", "Emojis Reset", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", var(--b3-font-family);
2929
--b3-font-family-graph: arial;
@@ -206,7 +206,7 @@
206206
}
207207

208208
:root:lang(ja_JP) {
209-
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", arial, sans-serif, emojis;
209+
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Yu Gothic UI", arial, sans-serif, emojis;
210210
}
211211

212212
/* https://github.com/siyuan-note/siyuan/issues/6440 */

app/appearance/themes/midnight/theme.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
--b3-theme-on-error: #fff;
2323

2424
/* 字体 */
25-
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Hiragino Sans", arial, sans-serif, emojis;
25+
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", arial, sans-serif, emojis;
2626
--b3-font-family-protyle: var(--b3-font-family);
2727
--b3-font-family-code: "Emojis Additional", "Emojis Reset", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", var(--b3-font-family);
2828
--b3-font-family-graph: arial;
@@ -205,7 +205,7 @@
205205
}
206206

207207
:root:lang(ja_JP) {
208-
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", arial, sans-serif, emojis;
208+
--b3-font-family: "Emojis Additional", "Emojis Reset", BlinkMacSystemFont, Helvetica, "Luxi Sans", "DejaVu Sans", "Yu Gothic UI", arial, sans-serif, emojis;
209209
}
210210

211211
/* https://github.com/siyuan-note/siyuan/issues/6440 */

app/appx/AppxManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity Name="89C2A984.SiYuan"
1010
ProcessorArchitecture="x64"
1111
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
12-
Version="3.1.25.0"/>
12+
Version="3.1.26.0"/>
1313
<Properties>
1414
<DisplayName>SiYuan</DisplayName>
1515
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

app/changelogs/v3.1.26/v3.1.26.md

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## Overview
2+
3+
This version improves some details.
4+
5+
## Changelogs
6+
7+
Below are the detailed changes in this version.
8+
9+
### Enhancement
10+
11+
* [Hide the status bar on tablet](https://github.com/siyuan-note/siyuan/issues/12204)
12+
* [Improve table cell selection](https://github.com/siyuan-note/siyuan/issues/14156)
13+
* [Improve creating block at the end of the doc bottom](https://github.com/siyuan-note/siyuan/issues/14190)
14+
* [Improve font rendering on macOS](https://github.com/siyuan-note/siyuan/issues/14356)
15+
* [Improve doc scrolling when pressing the up and down arrow keys to switch cells in the database](https://github.com/siyuan-note/siyuan/issues/14364)
16+
* [Improve search window dragging](https://github.com/siyuan-note/siyuan/issues/14372)
17+
* [Improve plugin to add CSS](https://github.com/siyuan-note/siyuan/issues/14373)
18+
* [Improve focus animation](https://github.com/siyuan-note/siyuan/issues/14379)
19+
* [Improve the width of exported images on mobile](https://github.com/siyuan-note/siyuan/issues/14392)
20+
* [Improve embed block updating](https://github.com/siyuan-note/siyuan/issues/14395)
21+
* [Improve markdown input parsing](https://github.com/siyuan-note/siyuan/issues/14397)
22+
* [Improve the focus return id does not exist](https://github.com/siyuan-note/siyuan/issues/14399)
23+
* [Improve flashcard import](https://github.com/siyuan-note/siyuan/issues/14402)
24+
* [Displays the data index message in the status bar on mobile](https://github.com/siyuan-note/siyuan/issues/14404)
25+
* [Improve plugin compatibility of embed blocks](https://github.com/siyuan-note/siyuan/issues/14405)
26+
* [Improve menu animation on mobile](https://github.com/siyuan-note/siyuan/issues/14407)
27+
* [Improve breadcrumb scrolling and clicking on mobile](https://github.com/siyuan-note/siyuan/issues/14409)
28+
* [Improve pasting link after virtual reference](https://github.com/siyuan-note/siyuan/issues/14421)
29+
* [Improve math block parsing](https://github.com/siyuan-note/siyuan/issues/14423)
30+
* [Improve Markdown hyperlink input parsing](https://github.com/siyuan-note/siyuan/issues/14424)
31+
* [Support indented code block syntax when importing Markdown](https://github.com/siyuan-note/siyuan/issues/14429)
32+
* [Improve browser clipping extension](https://github.com/siyuan-note/siyuan/issues/14431)
33+
34+
### Bugfix
35+
36+
* [AI DeepSeek 422 Unprocessable Entity](https://github.com/siyuan-note/siyuan/issues/14347)
37+
* [Unable to long press to paste on mobile](https://github.com/siyuan-note/siyuan/issues/14406)
38+
* [Reverse deletion exception in empty block](https://github.com/siyuan-note/siyuan/issues/14413)
39+
* [WebDAV purge data repo failed](https://github.com/siyuan-note/siyuan/issues/14420)
40+
* [Applying styles to block refs causes them to disappear](https://github.com/siyuan-note/siyuan/issues/14428)
41+
* [Unable to open cloud tagged snapshots](https://github.com/siyuan-note/siyuan/issues/14434)
42+
43+
### Refactor
44+
45+
* [Upgrade to Electron v34.3.4](https://github.com/siyuan-note/siyuan/issues/14403)
46+
47+
## Download
48+
49+
* [B3log](https://b3log.org/siyuan/en/download.html)
50+
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## 概述
2+
3+
該版本改進了一些細節。
4+
5+
## 變更記錄
6+
7+
以下是此版本中的詳細變更。
8+
9+
### 改進功能
10+
11+
* [隱藏平板上的狀態列](https://github.com/siyuan-note/siyuan/issues/12204)
12+
* [改進表格儲存格選擇](https://github.com/siyuan-note/siyuan/issues/14156)
13+
* [改進在文件底部建立區塊](https://github.com/siyuan-note/siyuan/issues/14190)
14+
* [改進 macOS 上的字體渲染](https://github.com/siyuan-note/siyuan/issues/14356)
15+
* [改進在資料庫中按下下箭頭鍵切換儲存格時的文件捲動](https://github.com/siyuan-note/siyuan/issues/14364)
16+
* [改進搜尋視窗拖曳](https://github.com/siyuan-note/siyuan/issues/14372)
17+
* [改進外掛程式加入 CSS](https://github.com/siyuan-note/siyuan/issues/14373)
18+
* [改進聚焦動畫](https://github.com/siyuan-note/siyuan/issues/14379)
19+
* [改進手機端上匯出圖片的寬度](https://github.com/siyuan-note/siyuan/issues/14392)
20+
* [改進嵌入塊更新](https://github.com/siyuan-note/siyuan/issues/14395)
21+
* [改進 Markdown 輸入解析](https://github.com/siyuan-note/siyuan/issues/14397)
22+
* [改進聚焦回傳 ID 不存在的情況](https://github.com/siyuan-note/siyuan/issues/14399)
23+
* [改進閃卡導入](https://github.com/siyuan-note/siyuan/issues/14402)
24+
* [在行動端的狀態列中顯示資料索引訊息](https://github.com/siyuan-note/siyuan/issues/14404)
25+
* [改進嵌入區塊的插件相容性](https://github.com/siyuan-note/siyuan/issues/14405)
26+
* [改進行動端上的選單動畫](https://github.com/siyuan-note/siyuan/issues/14407)
27+
* [改進行動端上的麵包屑滾動和點擊](https://github.com/siyuan-note/siyuan/issues/14409)
28+
* [改進虛擬引用後的貼上連結](https://github.com/siyuan-note/siyuan/issues/14421)
29+
* [改良公式區塊解析](https://github.com/siyuan-note/siyuan/issues/14423)
30+
* [改進 Markdown 超連結輸入解析](https://github.com/siyuan-note/siyuan/issues/14424)
31+
* [支援匯入 Markdown 時解析縮排程式碼區塊語法](https://github.com/siyuan-note/siyuan/issues/14429)
32+
* [改進瀏覽器剪藏擴充功能](https://github.com/siyuan-note/siyuan/issues/14431)
33+
34+
### 修復缺陷
35+
36+
* [AI DeepSeek 422 Unprocessable Entity](https://github.com/siyuan-note/siyuan/issues/14347)
37+
* [行動端無法長按貼上](https://github.com/siyuan-note/siyuan/issues/14406)
38+
* [空塊中反向刪除異常](https://github.com/siyuan-note/siyuan/issues/14413)
39+
* [WebDAV 清理資料倉儲失敗](https://github.com/siyuan-note/siyuan/issues/14420)
40+
* [套用樣式到區塊引用導致其消失](https://github.com/siyuan-note/siyuan/issues/14428)
41+
* [無法開啟雲端標記快照](https://github.com/siyuan-note/siyuan/issues/14434)
42+
43+
### 開發重構
44+
45+
* [升級至 Electron v34.3.4](https://github.com/siyuan-note/siyuan/issues/14403)
46+
47+
## 下載
48+
49+
* [B3log](https://b3log.org/siyuan/download.html)
50+
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## 概述
2+
3+
该版本改进了一些细节。
4+
5+
## 变更记录
6+
7+
以下是此版本中的详细变更。
8+
9+
### 改进功能
10+
11+
* [隐藏平板上的状态栏](https://github.com/siyuan-note/siyuan/issues/12204)
12+
* [改进表格单元格选择](https://github.com/siyuan-note/siyuan/issues/14156)
13+
* [改进在文档底部创建块](https://github.com/siyuan-note/siyuan/issues/14190)
14+
* [改进 macOS 上的字体渲染](https://github.com/siyuan-note/siyuan/issues/14356)
15+
* [改进在数据库中按上下箭头键切换单元格时的文档滚动](https://github.com/siyuan-note/siyuan/issues/14364)
16+
* [改进搜索窗口拖动](https://github.com/siyuan-note/siyuan/issues/14372)
17+
* [改进插件添加 CSS](https://github.com/siyuan-note/siyuan/issues/14373)
18+
* [改进聚焦动画](https://github.com/siyuan-note/siyuan/issues/14379)
19+
* [改进移动端上导出图片的宽度](https://github.com/siyuan-note/siyuan/issues/14392)
20+
* [改进嵌入块更新](https://github.com/siyuan-note/siyuan/issues/14395)
21+
* [改进 Markdown 输入解析](https://github.com/siyuan-note/siyuan/issues/14397)
22+
* [改进聚焦返回 ID 不存在的情况](https://github.com/siyuan-note/siyuan/issues/14399)
23+
* [改进闪卡导入](https://github.com/siyuan-note/siyuan/issues/14402)
24+
* [在移动端的状态栏中显示数据索引消息](https://github.com/siyuan-note/siyuan/issues/14404)
25+
* [改进嵌入块的插件兼容性](https://github.com/siyuan-note/siyuan/issues/14405)
26+
* [改进移动端上的菜单动画](https://github.com/siyuan-note/siyuan/issues/14407)
27+
* [改进移动端上的面包屑滚动和点击](https://github.com/siyuan-note/siyuan/issues/14409)
28+
* [改进虚拟引用后的粘贴链接](https://github.com/siyuan-note/siyuan/issues/14421)
29+
* [改进公式块解析](https://github.com/siyuan-note/siyuan/issues/14423)
30+
* [改进 Markdown 超链接输入解析](https://github.com/siyuan-note/siyuan/issues/14424)
31+
* [支持导入 Markdown 时解析缩进代码块语法](https://github.com/siyuan-note/siyuan/issues/14429)
32+
* [改进浏览器剪藏扩展](https://github.com/siyuan-note/siyuan/issues/14431)
33+
34+
### 修复缺陷
35+
36+
* [AI DeepSeek 422 Unprocessable Entity](https://github.com/siyuan-note/siyuan/issues/14347)
37+
* [移动端无法长按粘贴](https://github.com/siyuan-note/siyuan/issues/14406)
38+
* [空块中反向删除异常](https://github.com/siyuan-note/siyuan/issues/14413)
39+
* [WebDAV 清理数据仓库失败](https://github.com/siyuan-note/siyuan/issues/14420)
40+
* [应用样式到块引用导致其消失](https://github.com/siyuan-note/siyuan/issues/14428)
41+
* [无法打开云端标记快照](https://github.com/siyuan-note/siyuan/issues/14434)
42+
43+
### 开发重构
44+
45+
* [升级到 Electron v34.3.4](https://github.com/siyuan-note/siyuan/issues/14403)
46+
47+
## 下载
48+
49+
* [B3log](https://b3log.org/siyuan/download.html)
50+
* [GitHub](https://github.com/siyuan-note/siyuan/releases)

app/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SiYuan",
3-
"version": "3.1.25",
3+
"version": "3.1.26",
44
"description": "Refactor your thinking",
55
"homepage": "https://b3log.org/siyuan",
66
"main": "./electron/main.js",
@@ -56,8 +56,8 @@
5656
"clean-webpack-plugin": "^4.0.0",
5757
"css-loader": "^6.7.1",
5858
"dayjs": "^1.11.5",
59-
"electron": "34.3.3",
60-
"electron-builder": "26.0.9",
59+
"electron": "34.3.4",
60+
"electron-builder": "26.0.11",
6161
"encoding": "^0.1.13",
6262
"esbuild-loader": "^3.0.1",
6363
"eslint": "^9.15.0",

0 commit comments

Comments
 (0)