Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-23 16:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Attribute View number column format https://github.com/siyuan-note/siyuan/issues/8764

Browse source
This commit is contained in:
Daniel 2023-08-03 23:21:11 +08:00
parent 2baa74fb39
commit d5bceca2a4
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/attribute_view.go
View file

@ -158,15 +158,16 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
}
ret.Columns = append(ret.Columns, &av.TableColumn{
ID: key.ID,
Name: key.Name,
Type: key.Type,
Icon: key.Icon,
Options: key.Options,
Wrap: col.Wrap,
Hidden: col.Hidden,
Width: col.Width,
Calc: col.Calc,
ID: key.ID,
Name: key.Name,
Type: key.Type,
Icon: key.Icon,
Options: key.Options,
NumberFormat: key.NumberFormat,
Wrap: col.Wrap,
Hidden: col.Hidden,
Width: col.Width,
Calc: col.Calc,
})
}
@ -213,7 +214,8 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
tableRow.ID = rowID
// 格式化数字
if av.KeyTypeNumber == tableCell.ValueType && nil != tableCell.Value && nil != tableCell.Value.Number {
if av.KeyTypeNumber == tableCell.ValueType && nil != tableCell.Value && nil != tableCell.Value.Number && av.NumberFormatNone != col.NumberFormat {
tableCell.Value.Number.Format = col.NumberFormat
tableCell.Value.Number.FormatNumber()
}
@ -773,6 +775,7 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
if keyValues.Key.ID == operation.ID {
keyValues.Key.Name = operation.Name
keyValues.Key.Type = colType
keyValues.Key.NumberFormat = av.NumberFormat(operation.Format)
break
}
}