Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-09 02:08:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-07-07 09:57:00 +08:00
commit 1abe5dee96
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/av/column.go
View file

@ -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 描述了属性视图的基础结构。

4
kernel/model/attribute_view.go
View file

@ -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