Skip to content

Commit

Permalink
Merge commit '43d0bb1bfe8dedf6e1b9960256b5e35b0b8fb9e9'
Browse files Browse the repository at this point in the history
* commit '43d0bb1bfe8dedf6e1b9960256b5e35b0b8fb9e9': (76 commits)
  🎨 fix siyuan-note#10159
  🎨 Add some database related internal kernel APIs siyuan-note#10160
  🎨 siyuan-note#10060
  🎨 Improve kernel API `/api/block/insertBlock` argument checking siyuan-note#10144
  🎨 Improve kernel API `/api/block/insertBlock` argument checking siyuan-note#10144
  🎨 fix siyuan-note#10155
  📝 fix siyuan-note#10013
  🎨 fix siyuan-note#10013
  🎨 Improve export CSV
  🐛 Fix av export https://ld246.com/article/1705023091175
  🎨 fix siyuan-note#10091
  🎨 Update kernel API getIDsByHPath siyuan-note#10091
  🎨 Some kernel interface concurrency is no longer controlled to improve performance siyuan-note#10149
  🐛 fix siyuan-note#10155
  🔊 Add logging
  🎨 fix siyuan-note#10118
  🎨 siyuan-note#10153
  🎨 The production environment will no longer register `/debug/pprof/` siyuan-note#10152
  :lipsticks: menu action
  :lipsticks: card
  ...
  • Loading branch information
EightDoor committed Jan 16, 2024
2 parents 6f78029 + 43d0bb1 commit 854620d
Show file tree
Hide file tree
Showing 117 changed files with 4,283 additions and 3,203 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`

Set the Electron mirror environment variable and install Electron:

* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@27.2.0 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@28.1.3 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@27.2.0 -D`
* `pnpm install electron@28.1.3 -D`

NPM mirror:

Expand All @@ -30,7 +30,7 @@ NPM mirror:

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

* `pnpm install electron@27.2.0 -D`
* `pnpm install electron@28.1.3 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

* macOS/Linux:
```
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@27.2.0 -D
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@28.1.3 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@27.2.0 -D`
* `pnpm install electron@28.1.3 -D`

NPM 镜像:

Expand All @@ -32,7 +32,7 @@ NPM 镜像:

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

* `pnpm install electron@27.2.0 -D`
* `pnpm install electron@28.1.3 -D`
* `pnpm run dev`
* `pnpm run start`

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:

- name: Build the Docker image
run: |
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.12.0 .
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.12.2 .
2 changes: 1 addition & 1 deletion app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@
"169": "Uploading data repo file %v/%v",
"170": "Uploading data repo chunk %v/%v",
"171": "Uploading data repo reference %s",
"172": " If you forget the authorization code, you can search<br>for <code class=\"b3-code\">accessAuthCode</code> in the workspace conf/conf.json",
"172": "If you forget the authorization code, please find help <a href=\"https://liuyun.io/article/1686530886208\" target=\"_blank\">here</a>",
"173": "Please enter the access auth code",
"174": "Unlock access",
"175": "Please enter the verification code",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@
"169": "Cargando archivo de repositorio de datos %v/%v",
"170": "Cargando fragmento de repositorio de datos %v/%v",
"171": "Cargando referencia de repositorio de datos %s",
"172": "Si olvida el código de autorización, puede buscar <code class=\"b3-code\">accessAuthCode</code> en el archivo <br>conf/conf.json del espacio de trabajo",
"172": "Si olvida el código de autorización, busque ayuda <a href=\"https://liuyun.io/article/1686530886208\" target=\"_blank\">aquí</a>",
"173": "Por favor ingrese el codigo de autorizacion de acceso",
"174": "Desbloquear acceso",
"175": "Por favor ingrese el código de verificación",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@
"169": "Téléchargement du fichier de référentiel de données %v/%v",
"170": "Téléchargement du bloc de dépôt de données %v/%v",
"171": "Téléchargement de la référence de référentiel de données %s",
"172": "Si vous oubliez le code d'autorisation, vous pouvez rechercher <code class=\"b3-code\">accessAuthCode</code> dans le fichier <br>conf/conf.json de l'espace de travail",
"172": "Si vous oubliez le code d'autorisation, veuillez trouver de l'aide <a href=\"https://liuyun.io/article/1686530886208\" target=\"_blank\">ici</a>",
"173": "Veuillez entrer le code d'autorisation d'accès",
"174": "Déverrouiller l'accès",
"175": "Veuillez entrer le code de vérification",
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 @@ -1337,7 +1337,7 @@
"169": "正在上傳資料倉庫文件 %v/%v",
"170": "正在上傳資料倉庫分塊 %v/%v",
"171": "正在上傳資料倉庫引用 %s",
"172": "如果你忘記了授權碼,可在工作空間<br>conf/conf.json 中搜索 <code class=\"b3-code\">accessAuthCode</code>",
"172": "如果你忘記了授權碼,請在<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">這裡</a>尋求幫助",
"173": "請輸入訪問授權碼",
"174": "解鎖訪問",
"175": "請輸入驗證碼",
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 @@ -1337,7 +1337,7 @@
"169": "正在上传数据仓库文件 %v/%v",
"170": "正在上传数据仓库分块 %v/%v",
"171": "正在上传数据仓库引用 %s",
"172": "如果你忘记了授权码,可在工作空间<br>conf/conf.json 中搜索 <code class=\"b3-code\">accessAuthCode</code>",
"172": "如果你忘记了授权码,请在<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">这里</a>寻求帮助",
"173": "请输入访问授权码",
"174": "解锁访问",
"175": "请输入验证码",
Expand Down
2 changes: 1 addition & 1 deletion app/appx/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
Version="2.12.0.0"/>
Version="2.12.2.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
Expand Down
59 changes: 59 additions & 0 deletions app/changelogs/v2.12.1/v2.12.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## Overview

This version supports configuration to ignore data indexing and improves the stability of cloud data synchronization.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Support ignore index](https://github.com/siyuan-note/siyuan/issues/9198)
* [Reset the dialog interface size when the dialog box exceeds the window](https://github.com/siyuan-note/siyuan/issues/10000)
* [Double-click the doc title image to preview](https://github.com/siyuan-note/siyuan/issues/10041)
* [Hide menu when click document title image](https://github.com/siyuan-note/siyuan/issues/10046)
* [Keep tabs visible when window shrinks](https://github.com/siyuan-note/siyuan/issues/10048)
* [`Go back` keep scroll position](https://github.com/siyuan-note/siyuan/issues/10050)
* [Add tips for database table view rollup column configuration](https://github.com/siyuan-note/siyuan/issues/10055)
* [Only block marked as flashcards are hidden based on configuration](https://github.com/siyuan-note/siyuan/issues/10058)
* [Snapshot comparison interface supports key selection of files](https://github.com/siyuan-note/siyuan/issues/10078)
* [Add `Home` and `End` support to the list item selected by `` and ``](https://github.com/siyuan-note/siyuan/issues/10083)
* [Hotkeys not working after switching applications](https://github.com/siyuan-note/siyuan/issues/10085)
* [Cards expired no longer appear in the same review round](https://github.com/siyuan-note/siyuan/issues/10087)
* [Improve `New document save location`](https://github.com/siyuan-note/siyuan/issues/10094)
* [Remove image icon menu in embed block](https://github.com/siyuan-note/siyuan/issues/10097)
* [Improve continuous soft newline split block parsing](https://github.com/siyuan-note/siyuan/issues/10098)
* [Improve the stability of cloud data synchronization](https://github.com/siyuan-note/siyuan/issues/10111)

### Bugfix

* [Emoji not rendering as expected](https://github.com/siyuan-note/siyuan/issues/8910)
* [The parent block field of the blocks under the heading block is calculated incorrectly](https://github.com/siyuan-note/siyuan/issues/9869)
* [Open external application protocol invalid](https://github.com/siyuan-note/siyuan/issues/10075)
* [Alt+X cannot record the font color](https://github.com/siyuan-note/siyuan/issues/10088)
* [Unable to preview first template directly](https://github.com/siyuan-note/siyuan/issues/10103)
* [Positioning may be reset after opening a document and scrolling quickly](https://github.com/siyuan-note/siyuan/issues/10108)

### Development

* [Improve database table view `Select` cell value input](https://github.com/siyuan-note/siyuan/issues/10052)
* [Database select, multiple select, and asset column cannot be operated in batches](https://github.com/siyuan-note/siyuan/issues/10054)
* [Filter conditions cannot be added to database table view check column](https://github.com/siyuan-note/siyuan/issues/10056)
* [Add plugin function `lockScreen`](https://github.com/siyuan-note/siyuan/issues/10063)
* [Add plugin event bus `updateCards`](https://github.com/siyuan-note/siyuan/issues/10065)
* [`Untitled` is displayed when the original record primary key value of the related column is empty](https://github.com/siyuan-note/siyuan/issues/10067)
* [Fix `name` attribute could not be visited in the plugin constructor](https://github.com/siyuan-note/siyuan/pull/10071)
* [Database block supports export as CSV](https://github.com/siyuan-note/siyuan/issues/10072)
* [Database table view no longer scrolls to the beginning after pasting values](https://github.com/siyuan-note/siyuan/issues/10073)
* [The database template column supports `queryBlocks` function](https://github.com/siyuan-note/siyuan/issues/10077)
* [Add internal kernel API `/api/filetree/upsertIndexes` and `/api/filetree/removeIndexes`](https://github.com/siyuan-note/siyuan/issues/10079)
* [Reduce the delay in adding rows in database table view](https://github.com/siyuan-note/siyuan/issues/10082)
* [Add plugin API `uninstall`](https://github.com/siyuan-note/siyuan/issues/10086)
* [Add plugin field `protyleOptions`](https://github.com/siyuan-note/siyuan/issues/10090)
* [Improve adding rows of the sorted database table view](https://github.com/siyuan-note/siyuan/issues/10099)
* [Add internal kernel API `/api/repo/getRepoFile`](https://github.com/siyuan-note/siyuan/issues/10101)

## Download

* [B3log](https://b3log.org/siyuan/en/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
59 changes: 59 additions & 0 deletions app/changelogs/v2.12.1/v2.12.1_zh_CHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## 概述

此版本支援配置忽略資料索引,並提升了雲端資料同步穩定性。

## 變更記錄

以下是此版本中的詳細變更。

### 改進功能

* [支援忽略索引](https://github.com/siyuan-note/siyuan/issues/9198)
* [當對話方塊超出視窗時重置對話方塊介面大小](https://github.com/siyuan-note/siyuan/issues/10000)
* [題頭圖支援雙擊預覽](https://github.com/siyuan-note/siyuan/issues/10041)
* [點選題頭圖時隱藏選單](https://github.com/siyuan-note/siyuan/issues/10046)
* [視窗縮小時保持頁籤可見](https://github.com/siyuan-note/siyuan/issues/10048)
* [`後退` 保持滾動位置](https://github.com/siyuan-note/siyuan/issues/10050)
* [新增資料庫表格視圖總列設定提示](https://github.com/siyuan-note/siyuan/issues/10055)
* [根據閃卡配置顯示高亮標記](https://github.com/siyuan-note/siyuan/issues/10058)
* [資料快照比較介面支援鍵盤選擇檔](https://github.com/siyuan-note/siyuan/issues/10078)
* [為支援 ```` 的候選清單新增 `Home``End` 支援](https://github.com/siyuan-note/siyuan/issues/10083)
* [切換應用程式後可能導致快速鍵失效](https://github.com/siyuan-note/siyuan/issues/10085)
* [同一輪閃卡複習中不再顯示再次到期的卡片](https://github.com/siyuan-note/siyuan/issues/10087)
* [改進 `新建文件存放位置`](https://github.com/siyuan-note/siyuan/issues/10094)
* [移除嵌入區塊中的圖片圖示選單](https://github.com/siyuan-note/siyuan/issues/10097)
* [改良連續軟換行分塊解析](https://github.com/siyuan-note/siyuan/issues/10098)
* [提升雲端資料同步穩定性](https://github.com/siyuan-note/siyuan/issues/10111)

### 修復缺陷

* [某些 Emoji 圖示無法正常顯示](https://github.com/siyuan-note/siyuan/issues/8910)
* [標題區塊下方區塊的父區塊欄位計算不正確](https://github.com/siyuan-note/siyuan/issues/9869)
* [開啟外部應用程式協議失效](https://github.com/siyuan-note/siyuan/issues/10075)
* [Alt+X 無法記錄字體顏色](https://github.com/siyuan-note/siyuan/issues/10088)
* [無法直接預覽第一個範本](https://github.com/siyuan-note/siyuan/issues/10103)
* [開啟文件後快速捲動導致定位重置](https://github.com/siyuan-note/siyuan/issues/10108)

### 開發者

* [改進資料庫表格視圖 `單選` 值輸入](https://github.com/siyuan-note/siyuan/issues/10052)
* [解決資料庫單選列、多選列和資源列無法批次操作](https://github.com/siyuan-note/siyuan/issues/10054)
* [資料庫表格視圖單選框無法新增篩選條件](https://github.com/siyuan-note/siyuan/issues/10056)
* [新增外掛程式 `lockScreen`](https://github.com/siyuan-note/siyuan/issues/10063)
* [新增插件事件匯流排 `updateCards`](https://github.com/siyuan-note/siyuan/issues/10065)
* [如果關聯列原記錄主鍵值為空則關聯列顯示 `Untitled`](https://github.com/siyuan-note/siyuan/issues/10067)
* [修正插件建構子中無法存取 `name` 屬性的問題](https://github.com/siyuan-note/siyuan/pull/10071)
* [資料庫區塊支援匯出 CSV](https://github.com/siyuan-note/siyuan/issues/10072)
* [資料庫表格視圖貼上值後不再重置滾動位置](https://github.com/siyuan-note/siyuan/issues/10073)
* [資料庫範本列支援 `queryBlocks` 函數](https://github.com/siyuan-note/siyuan/issues/10077)
* [新增內部核心 API `/api/filetree/upsertIndexes``/api/filetree/removeIndexes`](https://github.com/siyuan-note/siyuan/issues/10079)
* [降低資料庫表格視圖新增行延遲](https://github.com/siyuan-note/siyuan/issues/10082)
* [新增外掛程式 API `uninstall`](https://github.com/siyuan-note/siyuan/issues/10086)
* [新增插件欄位 `protyleOptions`](https://github.com/siyuan-note/siyuan/issues/10090)
* [改進排序的資料庫表格視圖新增行時的行為](https://github.com/siyuan-note/siyuan/issues/10099)
* [新增內部核心 API `/api/repo/getRepoFile`](https://github.com/siyuan-note/siyuan/issues/10101)

## 下載

* [B3log](https://b3log.org/siyuan/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
59 changes: 59 additions & 0 deletions app/changelogs/v2.12.1/v2.12.1_zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## 概述

该版本支持配置忽略数据索引,并提升了云端数据同步稳定性。

## 变更记录

以下是此版本中的详细变更。

### 改进功能

* [支持忽略索引](https://github.com/siyuan-note/siyuan/issues/9198)
* [当对话框超出窗口时重置对话框界面大小](https://github.com/siyuan-note/siyuan/issues/10000)
* [题头图支持双击预览](https://github.com/siyuan-note/siyuan/issues/10041)
* [点击题头图时隐藏菜单](https://github.com/siyuan-note/siyuan/issues/10046)
* [窗口缩小时保持页签可见](https://github.com/siyuan-note/siyuan/issues/10048)
* [`后退` 保持滚动位置](https://github.com/siyuan-note/siyuan/issues/10050)
* [添加数据库表格视图汇总列配置提示](https://github.com/siyuan-note/siyuan/issues/10055)
* [根据闪卡配置显示高亮标记](https://github.com/siyuan-note/siyuan/issues/10058)
* [数据快照对比界面支持键盘选择文件](https://github.com/siyuan-note/siyuan/issues/10078)
* [为支持 ```` 的候选列表添加 `Home``End` 支持](https://github.com/siyuan-note/siyuan/issues/10083)
* [切换应用后可能导致快捷键失效](https://github.com/siyuan-note/siyuan/issues/10085)
* [同一轮闪卡复习中不再显示再次到期的卡](https://github.com/siyuan-note/siyuan/issues/10087)
* [改进 `新建文档存放位置`](https://github.com/siyuan-note/siyuan/issues/10094)
* [移除嵌入块中的图片图标菜单](https://github.com/siyuan-note/siyuan/issues/10097)
* [改进连续软换行分块解析](https://github.com/siyuan-note/siyuan/issues/10098)
* [提升云端数据同步稳定性](https://github.com/siyuan-note/siyuan/issues/10111)

### 修复缺陷

* [某些 Emoji 图标无法正常显示](https://github.com/siyuan-note/siyuan/issues/8910)
* [标题块下方块的父块字段计算不正确](https://github.com/siyuan-note/siyuan/issues/9869)
* [打开外部应用协议失效](https://github.com/siyuan-note/siyuan/issues/10075)
* [Alt+X 无法记录字体颜色](https://github.com/siyuan-note/siyuan/issues/10088)
* [无法直接预览第一个模板](https://github.com/siyuan-note/siyuan/issues/10103)
* [打开文档后快速滚动导致定位重置](https://github.com/siyuan-note/siyuan/issues/10108)

### 开发者

* [改进数据库表格视图 `单选` 值输入](https://github.com/siyuan-note/siyuan/issues/10052)
* [解决数据库单选列、多选列和资源列无法批量操作](https://github.com/siyuan-note/siyuan/issues/10054)
* [数据库表格视图单选框无法添加过滤条件](https://github.com/siyuan-note/siyuan/issues/10056)
* [添加插件函数 `lockScreen`](https://github.com/siyuan-note/siyuan/issues/10063)
* [添加插件事件总线 `updateCards`](https://github.com/siyuan-note/siyuan/issues/10065)
* [如果关联列原记录主键值为空则关联列显示 `Untitled`](https://github.com/siyuan-note/siyuan/issues/10067)
* [修复插件构造函数中无法访问 `name` 属性的问题](https://github.com/siyuan-note/siyuan/pull/10071)
* [数据库块支持导出 CSV](https://github.com/siyuan-note/siyuan/issues/10072)
* [数据库表格视图粘贴值后不再重置滚动位置](https://github.com/siyuan-note/siyuan/issues/10073)
* [数据库模板列支持 `queryBlocks` 函数](https://github.com/siyuan-note/siyuan/issues/10077)
* [添加内部内核 API `/api/filetree/upsertIndexes``/api/filetree/removeIndexes`](https://github.com/siyuan-note/siyuan/issues/10079)
* [降低数据库表格视图添加行延迟](https://github.com/siyuan-note/siyuan/issues/10082)
* [添加插件 API `uninstall`](https://github.com/siyuan-note/siyuan/issues/10086)
* [添加插件字段 `protyleOptions`](https://github.com/siyuan-note/siyuan/issues/10090)
* [改进排序的数据库表格视图添加行时的行为](https://github.com/siyuan-note/siyuan/issues/10099)
* [添加内部内核 API `/api/repo/getRepoFile`](https://github.com/siyuan-note/siyuan/issues/10101)

## 下载

* [B3log](https://b3log.org/siyuan/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
25 changes: 25 additions & 0 deletions app/changelogs/v2.12.2/v2.12.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Overview

This version fixes the problem of being unable to enter the main interface on some devices.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Improve prompt text for forgotten authorization code](https://github.com/siyuan-note/siyuan/issues/10127)
* [Cards expired need appear in the same review round](https://github.com/siyuan-note/siyuan/issues/10130)

### Bugfix

* [Unable to enter the main interface](https://github.com/siyuan-note/siyuan/issues/10126)
* [Cannot automatically jump to browser download when exporting notebook on the mobile app](https://github.com/siyuan-note/siyuan/issues/10128)
* [The doc cannot be opened after focusing a block and then deleting the block](https://github.com/siyuan-note/siyuan/issues/10129)
* [Quickly selecting other text when using F3 results in incorrect reference position](https://github.com/siyuan-note/siyuan/issues/10131)
* [Quickly switching cursor position when creating a ref results in the incorrect reference position](https://github.com/siyuan-note/siyuan/issues/10133)

## Download

* [B3log](https://b3log.org/siyuan/en/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
Loading

0 comments on commit 854620d

Please sign in to comment.