Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve av sorting https://github.com/siyuan-note/siyuan/issues/12720

Browse source
This commit is contained in:
Daniel 2024-10-07 19:00:43 +08:00
parent dbe83baef5
commit 94bcc359ff
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
kernel/av/sort.go
View file

@ -44,6 +44,10 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
switch value.Type { switch value.Type {
case KeyTypeBlock: case KeyTypeBlock:
if nil != value.Block && nil != other.Block { if nil != value.Block && nil != other.Block {
if 0 == strings.Compare(value.Block.Content, other.Block.Content) {
return 0
}
if util.PinYinCompare(value.Block.Content, other.Block.Content) { if util.PinYinCompare(value.Block.Content, other.Block.Content) {
return -1 return -1
} }
@ -59,6 +63,11 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
} else if "" == other.Text.Content { } else if "" == other.Text.Content {
return -1 return -1
} }
if 0 == strings.Compare(value.Text.Content, other.Text.Content) {
return 0
}
if util.PinYinCompare(value.Text.Content, other.Text.Content) { if util.PinYinCompare(value.Text.Content, other.Text.Content) {
return -1 return -1
} }
@ -229,6 +238,11 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
for _, v := range other.MAsset { for _, v := range other.MAsset {
v2 += v.Content v2 += v.Content
} }
if 0 == strings.Compare(v1, v2) {
return 0
}
if util.PinYinCompare(v1, v2) { if util.PinYinCompare(v1, v2) {
return -1 return -1
} }
@ -247,6 +261,11 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
} }
return 0 return 0
} }
if 0 == strings.Compare(value.Template.Content, other.Template.Content) {
return 0
}
if util.PinYinCompare(value.Template.Content, other.Template.Content) { if util.PinYinCompare(value.Template.Content, other.Template.Content) {
return -1 return -1
} }
@ -290,6 +309,11 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
oContentBuf.WriteByte(' ') oContentBuf.WriteByte(' ')
} }
oContent := strings.TrimSpace(oContentBuf.String()) oContent := strings.TrimSpace(oContentBuf.String())
if 0 == strings.Compare(vContent, oContent) {
return 0
}
if util.PinYinCompare(vContent, oContent) { if util.PinYinCompare(vContent, oContent) {
return -1 return -1
} }
@ -323,6 +347,11 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
oContentBuf.WriteByte(' ') oContentBuf.WriteByte(' ')
} }
oContent := strings.TrimSpace(oContentBuf.String()) oContent := strings.TrimSpace(oContentBuf.String())
if 0 == strings.Compare(vContent, oContent) {
return 0
}
if util.PinYinCompare(vContent, oContent) { if util.PinYinCompare(vContent, oContent) {
return -1 return -1
} }