From b0bf3e568c4e7aad70c729043f3df58238849456 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 7 Jul 2023 09:38:12 +0800 Subject: [PATCH] :art: Add number type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8690 --- kernel/av/column.go | 8 ++++---- kernel/model/attribute_view.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/av/column.go b/kernel/av/column.go index 094dc8d34..1afb7c0ec 100644 --- a/kernel/av/column.go +++ b/kernel/av/column.go @@ -22,13 +22,13 @@ type ColumnType string const ( ColumnTypeBlock ColumnType = "block" - ColumnTypeDate ColumnType = "date" + ColumnTypeText ColumnType = "text" ColumnTypeNumber ColumnType = "number" - ColumnTypeRelation ColumnType = "relation" - ColumnTypeRollup ColumnType = "rollup" + ColumnTypeDate ColumnType = "date" ColumnTypeSelect ColumnType = "select" ColumnTypeMSelect ColumnType = "mSelect" - ColumnTypeText ColumnType = "text" + ColumnTypeRelation ColumnType = "relation" + ColumnTypeRollup ColumnType = "rollup" ) // Column 描述了属性视图的基础结构。 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 836c107e6..ba20ce367 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -246,7 +246,7 @@ func addAttributeViewColumn(name string, typ string, avID string) (err error) { colType := av.ColumnType(typ) switch colType { - case av.ColumnTypeText: + case av.ColumnTypeText, av.ColumnTypeNumber, av.ColumnTypeDate, av.ColumnTypeSelect, av.ColumnTypeMSelect: col := &av.Column{ID: ast.NewNodeID(), Name: name, Type: colType} attrView.Columns = append(attrView.Columns, col) for _, row := range attrView.Rows { @@ -271,7 +271,7 @@ func updateAttributeViewColumn(id, name string, typ string, avID string) (err er colType := av.ColumnType(typ) switch colType { - case av.ColumnTypeText: + case av.ColumnTypeText, av.ColumnTypeNumber, av.ColumnTypeDate, av.ColumnTypeSelect, av.ColumnTypeMSelect: for _, col := range attrView.Columns { if col.ID == id { col.Name = name