Skip to content

Commit

Permalink
Merge remote-tracking branch 'fork-siyuan/dev' into v0.29
Browse files Browse the repository at this point in the history
  • Loading branch information
Soltus committed Apr 16, 2024
2 parents edd372e + 22b878c commit 8c498d7
Show file tree
Hide file tree
Showing 70 changed files with 1,078 additions and 659 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ electron/dist

# IDE
.idea/
.vscode/

# Log
logs
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"goToEditTabPrev": "Go to previous edited tab",
"createdTime": "Created time",
"updatedTime": "Updated time",
"lineNumber": "Line number",
"removeBookmark": "Remove bookmark from ${x}?",
"defaultMargin": "Default",
"noneMargin": "None",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"goToEditTabPrev": "Ir a la pestaña editada anteriormente",
"createdTime": "Hora de creación",
"updatedTime": "Hora actualizada",
"lineNumber": "Número de línea",
"removeBookmark": "¿Eliminar marcador de ${x}?",
"lockEdit": "Hacer que el documento sea de sólo lectura",
"unlockEdit": "Hacer que el documento sea escribible",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"goToEditTabPrev": "Aller à l'onglet modifié précédent",
"createdTime": "Heure de création",
"updatedTime": "Heure mise à jour",
"lineNumber": "Numéro de ligne",
"removeBookmark": "Supprimer le signet de ${x} ?",
"lockEdit": "Rendre le document en lecture seule",
"unlockEdit": "Rendre le document accessible en écriture",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"goToEditTabPrev": "跳到上一個編輯頁籤",
"createdTime": "建立時間",
"updatedTime": "更新時間",
"lineNumber": "行號",
"removeBookmark": "移除 ${x} 中的書籤?",
"lockEdit": "鎖定編輯",
"unlockEdit": "解除鎖定",
Expand Down
1 change: 1 addition & 0 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"goToEditTabPrev": "跳转到上一个编辑页签",
"createdTime": "创建时间",
"updatedTime": "更新时间",
"lineNumber": "行号",
"removeBookmark": "移除 ${x} 中的书签?",
"lockEdit": "锁定编辑",
"unlockEdit": "解除锁定",
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="3.0.9.0"/>
Version="3.0.10.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
Expand Down
55 changes: 55 additions & 0 deletions app/changelogs/v3.0.10/v3.0.10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## Overview

This version improves details related to data indexing and database views.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Database cursor focus is no longer automatically reset to the title input](https://github.com/siyuan-note/siyuan/issues/10732)
* [Improve database asset edit](https://github.com/siyuan-note/siyuan/issues/10768)
* [Improve database table view UI when setting font size](https://github.com/siyuan-note/siyuan/issues/10885)
* [Right-click on the input to provide a copy menu](https://github.com/siyuan-note/siyuan/issues/10896)
* [Blocks bound in the database support `Add to Database`](https://github.com/siyuan-note/siyuan/issues/10929)
* [Database filter option value supports search](https://github.com/siyuan-note/siyuan/issues/10932)
* [Improve marketplace loading performance](https://github.com/siyuan-note/siyuan/issues/10973)
* [Improve data indexing performance when editing doc](https://github.com/siyuan-note/siyuan/issues/10976)
* [`Ctrl+Shift+F` no longer overlay keywords](https://github.com/siyuan-note/siyuan/issues/10980)
* [Improve left and right swiping on mobile](https://github.com/siyuan-note/siyuan/issues/10983)
* [Improve `Del` before code, tags and kbd](https://github.com/siyuan-note/siyuan/issues/10984)
* [Improve data indexing performance when importing .sy.zip and markdown](https://github.com/siyuan-note/siyuan/issues/10986)
* [Improve exporting inline code markdown element](https://github.com/siyuan-note/siyuan/issues/10988)
* [Prevent frontend request pending](https://github.com/siyuan-note/siyuan/issues/10992)
* [Improve default search type filtering](https://github.com/siyuan-note/siyuan/issues/11003)
* [Improve data indexing performance for creating documents](https://github.com/siyuan-note/siyuan/issues/11005)
* [Remove spell check for links, audio and other URLs](https://github.com/siyuan-note/siyuan/issues/11006)
* [Add database `lineNumber` field type](https://github.com/siyuan-note/siyuan/pull/11008)
* [Improve mobile app appearance language setting](https://github.com/siyuan-note/siyuan/issues/11009)
* [Improve database template field calc](https://github.com/siyuan-note/siyuan/issues/11011)
* [Improve database unbind block](https://github.com/siyuan-note/siyuan/issues/11013)
* [Improve database checkbox field sorting](https://github.com/siyuan-note/siyuan/issues/11016)
* [The block icon menu will no longer be displayed after selecting Delete through the block icon menu](https://github.com/siyuan-note/siyuan/issues/11028)
* [Improve database template field to use relation/rollup field](https://github.com/siyuan-note/siyuan/issues/11029)
* [Disable edit of database table view in embed block](https://github.com/siyuan-note/siyuan/issues/11034)
* [Improve database reference anchor text](https://github.com/siyuan-note/siyuan/issues/11035)
* [Improve heading drag conversion doc subheading level](https://github.com/siyuan-note/siyuan/issues/11037)
* [Improve database field sorting](https://github.com/siyuan-note/siyuan/issues/11038)
* [Improve update time of database bound document blocks](https://github.com/siyuan-note/siyuan/issues/11042)

### Bugfix

* [Database date field between filter calculation error](https://github.com/siyuan-note/siyuan/issues/10979)
* [An error occurs when pasting a file after selecting a database row](https://github.com/siyuan-note/siyuan/issues/10996)
* [Layout exception after opened the outline](https://github.com/siyuan-note/siyuan/issues/10998)
* [Code block line numbers should not be displayed after "Clear style"](https://github.com/siyuan-note/siyuan/issues/11000)
* [Hyperlinks affect backlink calculation issue](https://github.com/siyuan-note/siyuan/issues/11001)
* [Dynamic loading results in incomplete list display](https://github.com/siyuan-note/siyuan/issues/11004)
* [Primary key value unexpectedly updated when database adds row](https://github.com/siyuan-note/siyuan/issues/11018)
* [The floating window disappears when editing a new row in the database in the floating window](https://github.com/siyuan-note/siyuan/issues/11046)

## Download

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

此版本改進了資料索引和資料庫視圖相關細節。

## 變更記錄

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

### 改進功能

* [資料庫遊標焦點不再自動重置到標題輸入框](https://github.com/siyuan-note/siyuan/issues/10732)
* [改進資料庫資源欄位編輯](https://github.com/siyuan-note/siyuan/issues/10768)
* [改進設定字體大小後資料庫表格視圖介面](https://github.com/siyuan-note/siyuan/issues/10885)
* [右鍵輸入輸入框提供複製選單](https://github.com/siyuan-note/siyuan/issues/10896)
* [資料庫中綁定的區塊支援 `新增至資料庫`](https://github.com/siyuan-note/siyuan/issues/10929)
* [資料庫過濾選項值支援搜尋](https://github.com/siyuan-note/siyuan/issues/10932)
* [改善市集載入效能](https://github.com/siyuan-note/siyuan/issues/10973)
* [編輯文件時改進資料索引效能](https://github.com/siyuan-note/siyuan/issues/10976)
* [`Ctrl+Shift+F` 不再疊加關鍵字](https://github.com/siyuan-note/siyuan/issues/10980)
* [改良行動裝置上的左右滑動](https://github.com/siyuan-note/siyuan/issues/10983)
* [改進在程式碼、標籤和鍵盤之前 `Del`](https://github.com/siyuan-note/siyuan/issues/10984)
* [導入 .sy.zip 與 markdown 時改善資料索引效能](https://github.com/siyuan-note/siyuan/issues/10986)
* [改進匯出行級程式碼 markdown 元素](https://github.com/siyuan-note/siyuan/issues/10988)
* [避免前端要求等待處理](https://github.com/siyuan-note/siyuan/issues/10992)
* [改進預設搜尋類型過濾](https://github.com/siyuan-note/siyuan/issues/11003)
* [建立文件時改進資料索引效能](https://github.com/siyuan-note/siyuan/issues/11005)
* [移除連結、音訊和其他 URL 的拼字檢查](https://github.com/siyuan-note/siyuan/issues/11006)
* [新增資料庫 `行號` 欄位類型](https://github.com/siyuan-note/siyuan/pull/11008)
* [改進行動應用程式外觀語言設定](https://github.com/siyuan-note/siyuan/issues/11009)
* [改進資料庫範本欄位計算](https://github.com/siyuan-note/siyuan/issues/11011)
* [改進資料庫解綁區塊](https://github.com/siyuan-note/siyuan/issues/11013)
* [改進資料庫勾選方塊欄位排序](https://github.com/siyuan-note/siyuan/issues/11016)
* [透過區塊圖示選單選擇刪除後,區塊圖示選單將不再顯示](https://github.com/siyuan-note/siyuan/issues/11028)
* [改進資料庫範本欄位使用關聯/匯總欄位](https://github.com/siyuan-note/siyuan/issues/11029)
* [禁止在嵌入區塊中編輯資料庫檢視](https://github.com/siyuan-note/siyuan/issues/11034)
* [改進資料庫引用錨文本](https://github.com/siyuan-note/siyuan/issues/11035)
* [改進標題拖曳轉換文件子標題等級](https://github.com/siyuan-note/siyuan/issues/11037)
* [改進資料庫欄位排序](https://github.com/siyuan-note/siyuan/issues/11038)
* [改進資料庫綁定文件區塊的更新時間](https://github.com/siyuan-note/siyuan/issues/11042)

### 修復缺陷

* [資料庫日期欄位間過濾計算錯誤](https://github.com/siyuan-note/siyuan/issues/10979)
* [選取資料庫行後貼上檔案報錯](https://github.com/siyuan-note/siyuan/issues/10996)
* [開啟大綱後版面異常](https://github.com/siyuan-note/siyuan/issues/10998)
* ["清除樣式"後不應顯示程式碼區塊行號](https://github.com/siyuan-note/siyuan/issues/11000)
* [超連結影響反向連結計算問題](https://github.com/siyuan-note/siyuan/issues/11001)
* [動態載入導致清單顯示不完整](https://github.com/siyuan-note/siyuan/issues/11004)
* [資料庫新增行時主鍵值意外更新](https://github.com/siyuan-note/siyuan/issues/11018)
* [在浮動浮窗中編輯資料庫新建一行時浮窗消失](https://github.com/siyuan-note/siyuan/issues/11046)

## 下載

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

该版本改进了数据索引和数据库视图相关细节。

## 变更记录

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

### 改进功能

* [数据库光标焦点不再自动重置到标题输入框](https://github.com/siyuan-note/siyuan/issues/10732)
* [改进数据库资源字段编辑](https://github.com/siyuan-note/siyuan/issues/10768)
* [改进设置字体大小后数据库表格视图界面](https://github.com/siyuan-note/siyuan/issues/10885)
* [右键单击输入框提供复制菜单](https://github.com/siyuan-note/siyuan/issues/10896)
* [数据库中绑定的块支持 `添加到数据库`](https://github.com/siyuan-note/siyuan/issues/10929)
* [数据库过滤选项值支持搜索](https://github.com/siyuan-note/siyuan/issues/10932)
* [改进集市加载性能](https://github.com/siyuan-note/siyuan/issues/10973)
* [编辑文档时改进数据索引性能](https://github.com/siyuan-note/siyuan/issues/10976)
* [`Ctrl+Shift+F` 不再叠加关键字](https://github.com/siyuan-note/siyuan/issues/10980)
* [改进移动设备上的左右滑动](https://github.com/siyuan-note/siyuan/issues/10983)
* [改进在代码、标签和键盘之前 `Del`](https://github.com/siyuan-note/siyuan/issues/10984)
* [导入 .sy.zip 和 markdown 时改进数据索引性能](https://github.com/siyuan-note/siyuan/issues/10986)
* [改进导出行级代码 markdown 元素](https://github.com/siyuan-note/siyuan/issues/10988)
* [避免前端请求等待处理](https://github.com/siyuan-note/siyuan/issues/10992)
* [改进默认搜索类型过滤](https://github.com/siyuan-note/siyuan/issues/11003)
* [创建文档时改进数据索引性能](https://github.com/siyuan-note/siyuan/issues/11005)
* [移除链接、音频和其他 URL 的拼写检查](https://github.com/siyuan-note/siyuan/issues/11006)
* [添加数据库 `行号` 字段类型](https://github.com/siyuan-note/siyuan/pull/11008)
* [改进移动应用程序外观语言设置](https://github.com/siyuan-note/siyuan/issues/11009)
* [改进数据库模板字段计算](https://github.com/siyuan-note/siyuan/issues/11011)
* [改进数据库解绑块](https://github.com/siyuan-note/siyuan/issues/11013)
* [改进数据库勾选框字段排序](https://github.com/siyuan-note/siyuan/issues/11016)
* [通过块图标菜单选择删除后,块图标菜单将不再显示](https://github.com/siyuan-note/siyuan/issues/11028)
* [改进数据库模板字段使用关联/汇总字段](https://github.com/siyuan-note/siyuan/issues/11029)
* [禁止在嵌入块中编辑数据库视图](https://github.com/siyuan-note/siyuan/issues/11034)
* [改进数据库引用锚文本](https://github.com/siyuan-note/siyuan/issues/11035)
* [改进标题拖拽转换文档子标题级别](https://github.com/siyuan-note/siyuan/issues/11037)
* [改进数据库字段排序](https://github.com/siyuan-note/siyuan/issues/11038)
* [改进数据库绑定文档块的更新时间](https://github.com/siyuan-note/siyuan/issues/11042)

### 修复缺陷

* [数据库日期字段间过滤计算错误](https://github.com/siyuan-note/siyuan/issues/10979)
* [选中数据库行后粘贴文件报错](https://github.com/siyuan-note/siyuan/issues/10996)
* [打开大纲后布局异常](https://github.com/siyuan-note/siyuan/issues/10998)
* ["清除样式"后不应显示代码块行号](https://github.com/siyuan-note/siyuan/issues/11000)
* [超链接影响反向链接计算问题](https://github.com/siyuan-note/siyuan/issues/11001)
* [动态加载导致列表显示不完整](https://github.com/siyuan-note/siyuan/issues/11004)
* [数据库添加行时主键值意外更新](https://github.com/siyuan-note/siyuan/issues/11018)
* [在浮动浮窗中编辑数据库新建一行时浮窗消失](https://github.com/siyuan-note/siyuan/issues/11046)

## 下载

* [B3log](https://b3log.org/siyuan/download.html)
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
4 changes: 2 additions & 2 deletions app/electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,8 @@ app.whenReady().then(() => {
}), new MenuItem({
role: "selectAll", label: langs.selectAll
})];
const menu = Menu.buildFromTemplate(template)
menu.popup({window: BrowserWindow.fromWebContents(event.sender)})
const menu = Menu.buildFromTemplate(template);
menu.popup({window: BrowserWindow.fromWebContents(event.sender)});
});
ipcMain.on("siyuan-open-folder", (event, filePath) => {
if (filePath === "openWorkspacesLogFolder") {
Expand Down
Loading

0 comments on commit 8c498d7

Please sign in to comment.