diff --git a/kernel/av/av.go b/kernel/av/av.go index 57394345c..77bcd4d58 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -75,22 +75,22 @@ func (av *AttributeView) GetColumnNames() (ret []string) { type AttributeViewFilter struct { Column string `json:"column"` Operator FilterOperator `json:"operator"` - Value string `json:"value"` + Value *Value `json:"value"` } type FilterOperator string const ( - FilterOperatorEq FilterOperator = "=" - FilterOperatorNe FilterOperator = "!=" - FilterOperatorGt FilterOperator = ">" - FilterOperatorGe FilterOperator = ">=" - FilterOperatorLt FilterOperator = "<" - FilterOperatorLe FilterOperator = "<=" - FilterOperatorIn FilterOperator = "IN" - FilterOperatorNotIn FilterOperator = "NOT IN" - FilterOperatorLike FilterOperator = "LIKE" - FilterOperatorNotLike FilterOperator = "NOT LIKE" + FilterOperatorEq FilterOperator = "=" + FilterOperatorNe FilterOperator = "!=" + FilterOperatorGt FilterOperator = ">" + FilterOperatorGe FilterOperator = ">=" + FilterOperatorLt FilterOperator = "<" + FilterOperatorLe FilterOperator = "<=" + FilterOperatorContains FilterOperator = "CONTAINS" + FilterOperatorNotContains FilterOperator = "NOT CONTAINS" + FilterOperatorIsEmpty FilterOperator = "IS EMPTY" + FilterOperatorIsNotEmpty FilterOperator = "IS NOT EMPTY" ) type AttributeViewSort struct { diff --git a/kernel/av/cell.go b/kernel/av/cell.go index 48f9a9d29..a0e7b1aae 100644 --- a/kernel/av/cell.go +++ b/kernel/av/cell.go @@ -95,6 +95,68 @@ func (value *Value) Compare(other *Value) int { return 0 } +func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool { + if nil == value { + return false + } + if nil == other { + return false + } + if nil != value.Block && nil != other.Block { + return strings.Contains(value.Block.Content, other.Block.Content) + } + if nil != value.Text && nil != other.Text { + return strings.Contains(value.Text.Content, other.Text.Content) + } + if nil != value.Number && nil != other.Number { + switch operator { + case FilterOperatorEq: + return value.Number.Content == other.Number.Content + case FilterOperatorNe: + return value.Number.Content != other.Number.Content + case FilterOperatorGt: + return value.Number.Content > other.Number.Content + case FilterOperatorGe: + return value.Number.Content >= other.Number.Content + case FilterOperatorLt: + return value.Number.Content < other.Number.Content + case FilterOperatorLe: + return value.Number.Content <= other.Number.Content + } + } + if nil != value.Date && nil != other.Date { + switch operator { + case FilterOperatorEq: + return value.Date.Content == other.Date.Content + case FilterOperatorNe: + return value.Date.Content != other.Date.Content + case FilterOperatorGt: + return value.Date.Content > other.Date.Content + case FilterOperatorGe: + return value.Date.Content >= other.Date.Content + case FilterOperatorLt: + return value.Date.Content < other.Date.Content + case FilterOperatorLe: + return value.Date.Content <= other.Date.Content + } + } + if nil != value.Select && nil != other.Select { + return strings.Contains(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.Contains(v1, v2) + } + return false +} + 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 0f33eba9b..850e236ad 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -42,6 +42,46 @@ func RenderAttributeView(avID string) (ret *av.AttributeView, err error) { return } + filterRows(ret) + sortRows(ret) + return +} + +func filterRows(ret *av.AttributeView) { + if 0 < len(ret.Filters) { + var colIndexes []int + for _, f := range ret.Filters { + for i, c := range ret.Columns { + if c.ID == f.Column { + colIndexes = append(colIndexes, i) + break + } + } + } + + var rows []*av.Row + for _, row := range ret.Rows { + pass := true + for j, index := range colIndexes { + c := ret.Columns[index] + if c.Type == av.ColumnTypeBlock { + continue + } + + if !row.Cells[index].Value.CompareOperator(ret.Filters[j].Value, ret.Filters[j].Operator) { + pass = false + break + } + } + if pass { + rows = append(rows, row) + } + } + ret.Rows = rows + } +} + +func sortRows(ret *av.AttributeView) { if 0 < len(ret.Sorts) { var colIndexes []int for _, s := range ret.Sorts { @@ -71,7 +111,6 @@ func RenderAttributeView(avID string) (ret *av.AttributeView, err error) { return less }) } - return } func (tx *Transaction) doUpdateAttrViewCell(operation *Operation) (ret *TxErr) {