Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-23 23:44:06 +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 2023-06-27 00:11:15 +08:00
commit 48f36578d3
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/changelogs/v2.9.3/v2.9.3.md
View file

@ -37,6 +37,7 @@ Below are the detailed changes in this version.
* [Disable code block bold in the mobile](https://github.com/siyuan-note/siyuan/issues/8613)
* [Improve the default theme color](https://github.com/siyuan-note/siyuan/issues/8616)
* [Click the notification message item to close it](https://github.com/siyuan-note/siyuan/issues/8622)
* [Improve search default sort](https://github.com/siyuan-note/siyuan/issues/8624)
### Abolishment
@ -48,6 +49,7 @@ Below are the detailed changes in this version.
* [Export Markdown does not include .md file](https://github.com/siyuan-note/siyuan/issues/8587)
* [Blocks created via template update time earlier than creation time](https://github.com/siyuan-note/siyuan/issues/8607)
* [Importing markdown files that include `<kbd>` freezes](https://github.com/siyuan-note/siyuan/issues/8611)
* [Hiding the dock fails when there is a dock plugin](https://github.com/siyuan-note/siyuan/issues/8614)
### Refactor

2
app/changelogs/v2.9.3/v2.9.3_zh_CHT.md
View file

@ -42,6 +42,7 @@
* [改進以 `file://` 開頭的鏈接在使用 `網絡圖片轉換為本地圖片` 時的處理](https://github.com/siyuan-note/siyuan/issues/8567)
* [改進數據同步文件時間比較](https://github.com/siyuan-note/siyuan/issues/8573)
* [添加複制 PNG 快捷鍵 `Ctrl+Shift+C`](https://github.com/siyuan-note/siyuan/issues/8576)
* [改進默認搜索排序](https://github.com/siyuan-note/siyuan/issues/8624)
### 修復缺陷
@ -50,6 +51,7 @@
* [取消拖拽移動列表項後數據丟失](https://github.com/siyuan-note/siyuan/issues/8548)
* [FlowChart 在導出預覽模式下未渲染](https://github.com/siyuan-note/siyuan/issues/8568)
* [導出預覽模式無法切換回編輯模式](https://github.com/siyuan-note/siyuan/issues/8569)
* [當存在停靠欄插件時隱藏停靠欄失敗](https://github.com/siyuan-note/siyuan/issues/8614)
### 開發者

2
app/changelogs/v2.9.3/v2.9.3_zh_CN.md
View file

@ -37,6 +37,7 @@
* [移动端禁止在代码块中加粗](https://github.com/siyuan-note/siyuan/issues/8613)
* [改进默认主题配色](https://github.com/siyuan-note/siyuan/issues/8616)
* [点击通知消息后关闭该条通知](https://github.com/siyuan-note/siyuan/issues/8622)
* [改进默认搜索排序](https://github.com/siyuan-note/siyuan/issues/8624)
### 移除功能
@ -48,6 +49,7 @@
* [导出 Markdown 未生成 .md 文件](https://github.com/siyuan-note/siyuan/issues/8587)
* [通过模板创建的块更新时间早于创建时间](https://github.com/siyuan-note/siyuan/issues/8607)
* [导入 Markdown 时包含 `<kbd>` 导致无响应](https://github.com/siyuan-note/siyuan/issues/8611)
* [当存在停靠栏插件时隐藏停靠栏失败](https://github.com/siyuan-note/siyuan/issues/8614)
### 开发重构

6
kernel/model/search.go
View file

@ -559,16 +559,16 @@ func buildOrderBy(method, orderBy int) string {
case 6:
if 0 != method && 1 != method {
// 只有关键字搜索和查询语法搜索才支持按相关度升序 https://github.com/siyuan-note/siyuan/issues/7861
return "ORDER BY sort DESC"
return "ORDER BY sort DESC, updated DESC"
}
return "ORDER BY rank DESC" // 默认是按相关度降序，所以按相关度升序要反过来使用 DESC
case 7:
if 0 != method && 1 != method {
return "ORDER BY sort ASC"
return "ORDER BY sort ASC, updated DESC"
}
return "ORDER BY rank" // 默认是按相关度降序
default:
return "ORDER BY sort ASC"
return "ORDER BY sort ASC, updated DESC" // Improve search default sort https://github.com/siyuan-note/siyuan/issues/8624
}
}