From 434054c9a8ff69751c5b62b8e2452cb4af65d1c0 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 26 Apr 2024 23:12:16 +0800 Subject: [PATCH 1/3] :art: Improve database multi-select field sorting https://github.com/siyuan-note/siyuan/issues/11146 --- kernel/av/sort.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/av/sort.go b/kernel/av/sort.go index 829e02604..393dd2232 100644 --- a/kernel/av/sort.go +++ b/kernel/av/sort.go @@ -145,7 +145,7 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int { return s } } - return 1 + return 0 } else { for i := 0; i < oLen; i++ { v := value.MSelect[i].Content @@ -160,7 +160,7 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int { return s } } - return -1 + return 0 } } From 96316cf2a757f11c8e909314dbb4ad46369550ae Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 26 Apr 2024 23:12:28 +0800 Subject: [PATCH 2/3] :art: Improve database multi-select field sorting https://github.com/siyuan-note/siyuan/issues/11146 --- kernel/av/sort.go | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/av/sort.go b/kernel/av/sort.go index 393dd2232..66992cde8 100644 --- a/kernel/av/sort.go +++ b/kernel/av/sort.go @@ -162,7 +162,6 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int { } return 0 } - } case KeyTypeURL: if nil != value.URL && nil != other.URL { From f166a383f9b1194676cc2aa1330123a16d2e0adc Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 26 Apr 2024 23:16:23 +0800 Subject: [PATCH 3/3] :art: Supports disabling Markdown syntax input for some inline elements https://github.com/siyuan-note/siyuan/issues/11141 --- app/appearance/langs/zh_CN.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 32343eae0..0cff72cfb 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,10 +1,10 @@ { "editorMarkdownInlineSup": "Markdown 行级上标语法", - "editorMarkdownInlineSupTip": "启用后将支持 ^foo^ 上标语法输入", + "editorMarkdownInlineSupTip": "启用后将支持 ^foo^ 行级上标语法输入", "editorMarkdownInlineSub": "Markdown 行级下标语法", - "editorMarkdownInlineSubTip": "启用后将支持 ~foo~ 下标语法输入", + "editorMarkdownInlineSubTip": "启用后将支持 ~foo~ 行级下标语法输入", "editorMarkdownInlineTag": "Markdown 行级标签语法", - "editorMarkdownInlineTagTip": "启用后将支持 #foo# 标签语法输入", + "editorMarkdownInlineTagTip": "启用后将支持 #foo# 行级标签语法输入", "editorMarkdownInlineMath": "Markdown 行级公式语法", "editorMarkdownInlineMathTip": "启用后将支持 $foo$ 行级公式语法输入", "currentNotebook": "当前笔记本",