github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 19:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-04-26 23:28:02 +08:00
commit 2e525a3e44
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/appearance/langs/zh_CN.json
View File

@ -1,10 +1,10 @@
{ {
"editorMarkdownInlineSup": "Markdown 行级上标语法", "editorMarkdownInlineSup": "Markdown 行级上标语法",
"editorMarkdownInlineSupTip": "启用后将支持 <code class='fn__code'>^foo^</code> 上标语法输入", "editorMarkdownInlineSupTip": "启用后将支持 <code class='fn__code'>^foo^</code> 行级上标语法输入",
"editorMarkdownInlineSub": "Markdown 行级下标语法", "editorMarkdownInlineSub": "Markdown 行级下标语法",
"editorMarkdownInlineSubTip": "启用后将支持 <code class='fn__code'>~foo~</code> 下标语法输入", "editorMarkdownInlineSubTip": "启用后将支持 <code class='fn__code'>~foo~</code> 行级下标语法输入",
"editorMarkdownInlineTag": "Markdown 行级标签语法", "editorMarkdownInlineTag": "Markdown 行级标签语法",
"editorMarkdownInlineTagTip": "启用后将支持 <code class='fn__code'>#foo#</code> 标签语法输入", "editorMarkdownInlineTagTip": "启用后将支持 <code class='fn__code'>#foo#</code> 行级标签语法输入",
"editorMarkdownInlineMath": "Markdown 行级公式语法", "editorMarkdownInlineMath": "Markdown 行级公式语法",
"editorMarkdownInlineMathTip": "启用后将支持 <code class='fn__code'>$foo$</code> 行级公式语法输入", "editorMarkdownInlineMathTip": "启用后将支持 <code class='fn__code'>$foo$</code> 行级公式语法输入",
"currentNotebook": "当前笔记本", "currentNotebook": "当前笔记本",

5
kernel/av/sort.go
View File

@ -145,7 +145,7 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
return s return s
} }
} }
return 1 return 0
} else { } else {
for i := 0; i < oLen; i++ { for i := 0; i < oLen; i++ {
v := value.MSelect[i].Content v := value.MSelect[i].Content
@ -160,9 +160,8 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
return s return s
} }
} }
return -1 return 0
} }
} }
case KeyTypeURL: case KeyTypeURL:
if nil != value.URL && nil != other.URL { if nil != value.URL && nil != other.URL {