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

🎨 Database gallery view https://github.com/siyuan-note/siyuan/issues/10414

Browse source
This commit is contained in:
Daniel 2025-06-12 17:14:54 +08:00
parent 5521034036
commit 2e40a0a480
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
6 changed files with 153 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

55
kernel/sql/av.go
View file

@ -19,6 +19,7 @@ package sql
import (
"bytes"
"fmt"
"sort"
"strings"
"text/template"
"time"
@ -559,3 +560,57 @@ func removeMissingField(attrView *av.AttributeView, view *av.View, missingKeyID
av.SaveAttributeView(attrView)
}
}
// filterByQuery 根据搜索条件过滤
func filterByQuery(query string, collection av.Collection) {
query = strings.TrimSpace(query)
if "" != query {
query = strings.Join(strings.Fields(query), " ") // 将连续空格转换为一个空格
keywords := strings.Split(query, " ") // 按空格分割关键字
// 使用 AND 逻辑 https://github.com/siyuan-note/siyuan/issues/11535
var hitItems []av.Item
for _, item := range collection.GetItems() {
hit := false
for _, cell := range item.GetValues() {
allKeywordsHit := true
for _, keyword := range keywords {
if !strings.Contains(strings.ToLower(cell.String(true)), strings.ToLower(keyword)) {
allKeywordsHit = false
break
}
}
if allKeywordsHit {
hit = true
break
}
}
if hit {
hitItems = append(hitItems, item)
}
}
collection.SetItems(hitItems)
if 1 > len(collection.GetItems()) {
collection.SetItems([]av.Item{})
}
}
}
// manualSort 处理用户手动排序。
func manualSort(collectionLayout av.CollectionLayout, collection av.Collection) {
sortRowIDs := map[string]int{}
for i, itemID := range collectionLayout.GetItemIDs() {
sortRowIDs[itemID] = i
}
items := collection.GetItems()
sort.Slice(items, func(i, j int) bool {
iv := sortRowIDs[items[i].GetID()]
jv := sortRowIDs[items[j].GetID()]
if iv == jv {
return items[i].GetID() < items[j].GetID()
}
return iv < jv
})
collection.SetItems(items)
}

53
kernel/sql/av_gallery.go
View file

@ -3,7 +3,6 @@ package sql
import (
"bytes"
"fmt"
"sort"
"strings"
"github.com/88250/lute"
@ -134,56 +133,8 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query
util.PushErrMsg(fmt.Sprintf(util.Langs[util.Lang][44], util.EscapeHTML(renderTemplateErr.Error())), 30000)
}
// 根据搜索条件过滤
query = strings.TrimSpace(query)
if "" != query {
// 将连续空格转换为一个空格
query = strings.Join(strings.Fields(query), " ")
// 按空格分割关键字
keywords := strings.Split(query, " ")
// 使用 AND 逻辑 https://github.com/siyuan-note/siyuan/issues/11535
var hitCards []*av.GalleryCard
for _, card := range ret.Cards {
hit := false
for _, value := range card.Values {
allKeywordsHit := true
for _, keyword := range keywords {
if !strings.Contains(strings.ToLower(value.Value.String(true)), strings.ToLower(keyword)) {
allKeywordsHit = false
break
}
}
if allKeywordsHit {
hit = true
break
}
}
if hit {
hitCards = append(hitCards, card)
}
}
ret.Cards = hitCards
if 1 > len(ret.Cards) {
ret.Cards = []*av.GalleryCard{}
}
}
// 自定义排序
sortCardIDs := map[string]int{}
if 0 < len(view.Gallery.CardIDs) {
for i, cardID := range view.Gallery.CardIDs {
sortCardIDs[cardID] = i
}
}
sort.Slice(ret.Cards, func(i, j int) bool {
iv := sortCardIDs[ret.Cards[i].ID]
jv := sortCardIDs[ret.Cards[j].ID]
if iv == jv {
return ret.Cards[i].ID < ret.Cards[j].ID
}
return iv < jv
})
filterByQuery(query, ret)
manualSort(view.Gallery, ret)
return
}

54
kernel/sql/av_table.go
View file

@ -16,8 +16,6 @@ package sql
import (
"fmt"
"sort"
"strings"
"github.com/88250/lute/ast"
"github.com/siyuan-note/siyuan/kernel/av"
@ -140,55 +138,7 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
util.PushErrMsg(fmt.Sprintf(util.Langs[util.Lang][44], util.EscapeHTML(renderTemplateErr.Error())), 30000)
}
// 根据搜索条件过滤
query = strings.TrimSpace(query)
if "" != query {
// 将连续空格转换为一个空格
query = strings.Join(strings.Fields(query), " ")
// 按空格分割关键字
keywords := strings.Split(query, " ")
// 使用 AND 逻辑 https://github.com/siyuan-note/siyuan/issues/11535
var hitRows []*av.TableRow
for _, row := range ret.Rows {
hit := false
for _, cell := range row.Cells {
allKeywordsHit := true
for _, keyword := range keywords {
if !strings.Contains(strings.ToLower(cell.Value.String(true)), strings.ToLower(keyword)) {
allKeywordsHit = false
break
}
}
if allKeywordsHit {
hit = true
break
}
}
if hit {
hitRows = append(hitRows, row)
}
}
ret.Rows = hitRows
if 1 > len(ret.Rows) {
ret.Rows = []*av.TableRow{}
}
}
// 自定义排序
sortRowIDs := map[string]int{}
if 0 < len(view.Table.RowIDs) {
for i, rowID := range view.Table.RowIDs {
sortRowIDs[rowID] = i
}
}
sort.Slice(ret.Rows, func(i, j int) bool {
iv := sortRowIDs[ret.Rows[i].ID]
jv := sortRowIDs[ret.Rows[j].ID]
if iv == jv {
return ret.Rows[i].ID < ret.Rows[j].ID
}
return iv < jv
})
filterByQuery(query, ret)
manualSort(view.Table, ret)
return
}