From 421124874065434ba4bece753758522bcb7b722d Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 3 Jul 2023 18:45:41 +0800 Subject: [PATCH] :art: Update av --- kernel/av/av.go | 4 +-- kernel/av/cell.go | 49 ++++++++++++++++++++++++++++++++++ kernel/model/attribute_view.go | 31 +++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/kernel/av/av.go b/kernel/av/av.go index 42930afc0..57394345c 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -94,8 +94,8 @@ const ( ) type AttributeViewSort struct { - Column string `json:"column"` - Order SortOrder `json:"order"` + Column string `json:"column"` // 列 ID + Order SortOrder `json:"order"` // 排序顺序 } type SortOrder string diff --git a/kernel/av/cell.go b/kernel/av/cell.go index ff4f7bd21..48f9a9d29 100644 --- a/kernel/av/cell.go +++ b/kernel/av/cell.go @@ -19,6 +19,7 @@ package av import ( "github.com/88250/gulu" "github.com/88250/lute/ast" + "strings" ) type Cell struct { @@ -46,6 +47,54 @@ func (value *Value) ToJSONString() string { return string(data) } +func (value *Value) Compare(other *Value) int { + if nil == value { + return -1 + } + if nil == other { + return 1 + } + if nil != value.Block && nil != other.Block { + return strings.Compare(value.Block.Content, other.Block.Content) + } + if nil != value.Text && nil != other.Text { + return strings.Compare(value.Text.Content, other.Text.Content) + } + if nil != value.Number && nil != other.Number { + if value.Number.Content > other.Number.Content { + return 1 + } else if value.Number.Content < other.Number.Content { + return -1 + } else { + return 0 + } + } + if nil != value.Date && nil != other.Date { + if value.Date.Content > other.Date.Content { + return 1 + } else if value.Date.Content < other.Date.Content { + return -1 + } else { + return 0 + } + } + if nil != value.Select && nil != other.Select { + return strings.Compare(value.Select.Content, other.Select.Content) + } + if nil != value.MSelect && nil != other.MSelect { + var v1 string + for _, v := range value.MSelect { + v1 += v.Content + } + var v2 string + for _, v := range other.MSelect { + v2 += v.Content + } + return strings.Compare(v1, v2) + } + return 0 +} + func NewCellBlock(blockID, blockContent string) *Cell { return &Cell{ ID: ast.NewNodeID(), diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index afb499338..0f33eba9b 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -19,6 +19,7 @@ package model import ( "errors" "fmt" + "sort" "strings" "github.com/88250/gulu" @@ -40,6 +41,36 @@ func RenderAttributeView(avID string) (ret *av.AttributeView, err error) { logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) return } + + if 0 < len(ret.Sorts) { + var colIndexes []int + for _, s := range ret.Sorts { + for i, c := range ret.Columns { + if c.ID == s.Column { + colIndexes = append(colIndexes, i) + break + } + } + } + + sort.Slice(ret.Rows, func(i, j int) bool { + less := false + for _, index := range colIndexes { + c := ret.Columns[index] + if c.Type == av.ColumnTypeBlock { + continue + } + + result := ret.Rows[i].Cells[index].Value.Compare(ret.Rows[j].Cells[index].Value) + if 0 == result { + continue + } else if 0 > result { + less = true + } + } + return less + }) + } return }