mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-04 04:20:53 +08:00
🎨 Add database table view checkbox column type https://github.com/siyuan-note/siyuan/issues/9667
This commit is contained in:
parent
16727cd8af
commit
0359f96c64
@ -107,6 +107,7 @@ const (
|
|||||||
KeyTypeTemplate KeyType = "template"
|
KeyTypeTemplate KeyType = "template"
|
||||||
KeyTypeCreated KeyType = "created"
|
KeyTypeCreated KeyType = "created"
|
||||||
KeyTypeUpdated KeyType = "updated"
|
KeyTypeUpdated KeyType = "updated"
|
||||||
|
KeyTypeCheckbox KeyType = "checkbox"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Key 描述了属性视图属性列的基础结构。
|
// Key 描述了属性视图属性列的基础结构。
|
||||||
@ -157,6 +158,7 @@ type Value struct {
|
|||||||
Template *ValueTemplate `json:"template,omitempty"`
|
Template *ValueTemplate `json:"template,omitempty"`
|
||||||
Created *ValueCreated `json:"created,omitempty"`
|
Created *ValueCreated `json:"created,omitempty"`
|
||||||
Updated *ValueUpdated `json:"updated,omitempty"`
|
Updated *ValueUpdated `json:"updated,omitempty"`
|
||||||
|
Checkbox *ValueCheckbox `json:"checkbox,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (value *Value) String() string {
|
func (value *Value) String() string {
|
||||||
@ -234,6 +236,14 @@ func (value *Value) String() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
return value.Updated.FormattedContent
|
return value.Updated.FormattedContent
|
||||||
|
case KeyTypeCheckbox:
|
||||||
|
if nil == value.Checkbox {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if value.Checkbox.Checked {
|
||||||
|
return "√"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
default:
|
default:
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
@ -529,6 +539,10 @@ func NewFormattedValueUpdated(content, content2 int64, format UpdatedFormat) (re
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ValueCheckbox struct {
|
||||||
|
Checked bool `json:"checked"`
|
||||||
|
}
|
||||||
|
|
||||||
// View 描述了视图的结构。
|
// View 描述了视图的结构。
|
||||||
type View struct {
|
type View struct {
|
||||||
ID string `json:"id"` // 视图 ID
|
ID string `json:"id"` // 视图 ID
|
||||||
|
@ -43,4 +43,6 @@ const (
|
|||||||
FilterOperatorEndsWith FilterOperator = "Ends with"
|
FilterOperatorEndsWith FilterOperator = "Ends with"
|
||||||
FilterOperatorIsBetween FilterOperator = "Is between"
|
FilterOperatorIsBetween FilterOperator = "Is between"
|
||||||
FilterOperatorIsRelativeToToday FilterOperator = "Is relative to today"
|
FilterOperatorIsRelativeToToday FilterOperator = "Is relative to today"
|
||||||
|
FilterOperatorIsTrue FilterOperator = "Is true"
|
||||||
|
FilterOperatorIsFalse FilterOperator = "Is false"
|
||||||
)
|
)
|
||||||
|
@ -72,6 +72,10 @@ const (
|
|||||||
CalcOperatorRange CalcOperator = "Range"
|
CalcOperatorRange CalcOperator = "Range"
|
||||||
CalcOperatorEarliest CalcOperator = "Earliest"
|
CalcOperatorEarliest CalcOperator = "Earliest"
|
||||||
CalcOperatorLatest CalcOperator = "Latest"
|
CalcOperatorLatest CalcOperator = "Latest"
|
||||||
|
CalcOperatorChecked CalcOperator = "Checked"
|
||||||
|
CalcOperatorUnchecked CalcOperator = "Unchecked"
|
||||||
|
CalcOperatorPercentChecked CalcOperator = "Percent checked"
|
||||||
|
CalcOperatorPercentUnchecked CalcOperator = "Percent unchecked"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (value *Value) Compare(other *Value) int {
|
func (value *Value) Compare(other *Value) int {
|
||||||
@ -171,6 +175,16 @@ func (value *Value) Compare(other *Value) int {
|
|||||||
if nil != value.Template && nil != other.Template {
|
if nil != value.Template && nil != other.Template {
|
||||||
return strings.Compare(value.Template.Content, other.Template.Content)
|
return strings.Compare(value.Template.Content, other.Template.Content)
|
||||||
}
|
}
|
||||||
|
case KeyTypeCheckbox:
|
||||||
|
if nil != value.Checkbox && nil != other.Checkbox {
|
||||||
|
if value.Checkbox.Checked && !other.Checkbox.Checked {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if !value.Checkbox.Checked && other.Checkbox.Checked {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
@ -543,6 +557,15 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
|
|||||||
return "" != strings.TrimSpace(value.Template.Content)
|
return "" != strings.TrimSpace(value.Template.Content)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if nil != value.Checkbox {
|
||||||
|
switch operator {
|
||||||
|
case FilterOperatorIsTrue:
|
||||||
|
return value.Checkbox.Checked
|
||||||
|
case FilterOperatorIsFalse:
|
||||||
|
return !value.Checkbox.Checked
|
||||||
|
}
|
||||||
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -731,6 +754,8 @@ func (table *Table) CalcCols() {
|
|||||||
table.calcColCreated(col, i)
|
table.calcColCreated(col, i)
|
||||||
case KeyTypeUpdated:
|
case KeyTypeUpdated:
|
||||||
table.calcColUpdated(col, i)
|
table.calcColUpdated(col, i)
|
||||||
|
case KeyTypeCheckbox:
|
||||||
|
table.calcColCheckbox(col, i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1840,3 +1865,46 @@ func (table *Table) calcColUpdated(col *TableColumn, colIndex int) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (table *Table) calcColCheckbox(col *TableColumn, colIndex int) {
|
||||||
|
switch col.Calc.Operator {
|
||||||
|
case CalcOperatorCountAll:
|
||||||
|
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(len(table.Rows)), NumberFormatNone)}
|
||||||
|
case CalcOperatorChecked:
|
||||||
|
countChecked := 0
|
||||||
|
for _, row := range table.Rows {
|
||||||
|
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Checkbox && row.Cells[colIndex].Value.Checkbox.Checked {
|
||||||
|
countChecked++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(countChecked), NumberFormatNone)}
|
||||||
|
case CalcOperatorUnchecked:
|
||||||
|
countUnchecked := 0
|
||||||
|
for _, row := range table.Rows {
|
||||||
|
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Checkbox && !row.Cells[colIndex].Value.Checkbox.Checked {
|
||||||
|
countUnchecked++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(countUnchecked), NumberFormatNone)}
|
||||||
|
case CalcOperatorPercentChecked:
|
||||||
|
countChecked := 0
|
||||||
|
for _, row := range table.Rows {
|
||||||
|
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Checkbox && row.Cells[colIndex].Value.Checkbox.Checked {
|
||||||
|
countChecked++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if 0 < len(table.Rows) {
|
||||||
|
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(countChecked)/float64(len(table.Rows)), NumberFormatPercent)}
|
||||||
|
}
|
||||||
|
case CalcOperatorPercentUnchecked:
|
||||||
|
countUnchecked := 0
|
||||||
|
for _, row := range table.Rows {
|
||||||
|
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Checkbox && !row.Cells[colIndex].Value.Checkbox.Checked {
|
||||||
|
countUnchecked++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if 0 < len(table.Rows) {
|
||||||
|
col.Calc.Result = &Value{Number: NewFormattedValueNumber(float64(countUnchecked)/float64(len(table.Rows)), NumberFormatPercent)}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1126,7 +1126,7 @@ func addAttributeViewColumn(operation *Operation) (err error) {
|
|||||||
|
|
||||||
keyType := av.KeyType(operation.Typ)
|
keyType := av.KeyType(operation.Typ)
|
||||||
switch keyType {
|
switch keyType {
|
||||||
case av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail, av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated:
|
case av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail, av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated, av.KeyTypeCheckbox:
|
||||||
var icon string
|
var icon string
|
||||||
if nil != operation.Data {
|
if nil != operation.Data {
|
||||||
icon = operation.Data.(string)
|
icon = operation.Data.(string)
|
||||||
@ -1218,7 +1218,7 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
|
|||||||
|
|
||||||
colType := av.KeyType(operation.Typ)
|
colType := av.KeyType(operation.Typ)
|
||||||
switch colType {
|
switch colType {
|
||||||
case av.KeyTypeBlock, av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail, av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated:
|
case av.KeyTypeBlock, av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail, av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated, av.KeyTypeCheckbox:
|
||||||
for _, keyValues := range attrView.KeyValues {
|
for _, keyValues := range attrView.KeyValues {
|
||||||
if keyValues.Key.ID == operation.ID {
|
if keyValues.Key.ID == operation.ID {
|
||||||
keyValues.Key.Name = operation.Name
|
keyValues.Key.Name = operation.Name
|
||||||
|
@ -779,6 +779,10 @@ func FillAttributeViewTableCellNilValue(tableCell *av.TableCell, rowID, colID st
|
|||||||
if nil == tableCell.Value.Updated {
|
if nil == tableCell.Value.Updated {
|
||||||
tableCell.Value.Updated = &av.ValueUpdated{}
|
tableCell.Value.Updated = &av.ValueUpdated{}
|
||||||
}
|
}
|
||||||
|
case av.KeyTypeCheckbox:
|
||||||
|
if nil == tableCell.Value.Checkbox {
|
||||||
|
tableCell.Value.Checkbox = &av.ValueCheckbox{}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user