Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-24 02:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Update av

Browse source
This commit is contained in:
Daniel 2023-08-01 21:00:57 +08:00
parent 9f27665804
commit 6a31d345ed
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/av/av.go
View file

@ -172,8 +172,10 @@ func (number *ValueNumber) FormatNumber() {
type ValueDate struct { type ValueDate struct {
Content int64 `json:"content"` Content int64 `json:"content"`
Content2 int64 `json:"content2"` IsNotEmpty bool `json:"isNotEmpty"`
HasEndDate bool `json:"hasEndDate"` HasEndDate bool `json:"hasEndDate"`
Content2 int64 `json:"content2"`
IsNotEmpty2 bool `json:"isNotEmpty2"`
FormattedContent string `json:"formattedContent"` FormattedContent string `json:"formattedContent"`
} }

46
kernel/av/table.go
View file

@ -199,9 +199,9 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
} }
return start && end return start && end
case FilterOperatorIsEmpty: case FilterOperatorIsEmpty:
return 0 == value.Date.Content return !value.Date.IsNotEmpty
case FilterOperatorIsNotEmpty: case FilterOperatorIsNotEmpty:
return 0 != value.Date.Content return value.Date.IsNotEmpty
case FilterOperatorIsRelativeToToday: case FilterOperatorIsRelativeToToday:
// TODO: date filter (relative to today) // TODO: date filter (relative to today)
return value.Date.Content >= other.Date.Content && value.Date.Content <= other.Date.Content2 return value.Date.Content >= other.Date.Content && value.Date.Content <= other.Date.Content2
@ -518,7 +518,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorCountValues: case CalcOperatorCountValues:
countValues := 0 countValues := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
countValues++ countValues++
} }
} }
@ -527,7 +527,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
countUniqueValues := 0 countUniqueValues := 0
uniqueValues := map[int64]bool{} uniqueValues := map[int64]bool{}
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
if _, ok := uniqueValues[row.Cells[colIndex].Value.Date.Content]; !ok { if _, ok := uniqueValues[row.Cells[colIndex].Value.Date.Content]; !ok {
countUniqueValues++ countUniqueValues++
uniqueValues[row.Cells[colIndex].Value.Date.Content] = true uniqueValues[row.Cells[colIndex].Value.Date.Content] = true
@ -538,7 +538,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorCountEmpty: case CalcOperatorCountEmpty:
countEmpty := 0 countEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Date || 0 == row.Cells[colIndex].Value.Date.Content { if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Date || !row.Cells[colIndex].Value.Date.IsNotEmpty {
countEmpty++ countEmpty++
} }
} }
@ -546,7 +546,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorCountNotEmpty: case CalcOperatorCountNotEmpty:
countNotEmpty := 0 countNotEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
countNotEmpty++ countNotEmpty++
} }
} }
@ -554,7 +554,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorPercentEmpty: case CalcOperatorPercentEmpty:
countEmpty := 0 countEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Date || 0 == row.Cells[colIndex].Value.Date.Content { if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Date || !row.Cells[colIndex].Value.Date.IsNotEmpty {
countEmpty++ countEmpty++
} }
} }
@ -564,7 +564,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorPercentNotEmpty: case CalcOperatorPercentNotEmpty:
countNotEmpty := 0 countNotEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
countNotEmpty++ countNotEmpty++
} }
} }
@ -574,7 +574,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorEarliest: case CalcOperatorEarliest:
earliest := int64(0) earliest := int64(0)
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
if 0 == earliest || earliest > row.Cells[colIndex].Value.Date.Content { if 0 == earliest || earliest > row.Cells[colIndex].Value.Date.Content {
earliest = row.Cells[colIndex].Value.Date.Content earliest = row.Cells[colIndex].Value.Date.Content
} }
@ -586,7 +586,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
case CalcOperatorLatest: case CalcOperatorLatest:
latest := int64(0) latest := int64(0)
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
if 0 == latest || latest < row.Cells[colIndex].Value.Date.Content { if 0 == latest || latest < row.Cells[colIndex].Value.Date.Content {
latest = row.Cells[colIndex].Value.Date.Content latest = row.Cells[colIndex].Value.Date.Content
} }
@ -599,7 +599,7 @@ func (table *Table) calcColDate(col *TableColumn, colIndex int) {
earliest := int64(0) earliest := int64(0)
latest := int64(0) latest := int64(0)
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && 0 != row.Cells[colIndex].Value.Date.Content { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Date && row.Cells[colIndex].Value.Date.IsNotEmpty {
if 0 == earliest || earliest > row.Cells[colIndex].Value.Date.Content { if 0 == earliest || earliest > row.Cells[colIndex].Value.Date.Content {
earliest = row.Cells[colIndex].Value.Date.Content earliest = row.Cells[colIndex].Value.Date.Content
} }
@ -621,7 +621,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorCountValues: case CalcOperatorCountValues:
countValues := 0 countValues := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
countValues++ countValues++
} }
} }
@ -630,7 +630,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
countUniqueValues := 0 countUniqueValues := 0
uniqueValues := map[float64]bool{} uniqueValues := map[float64]bool{}
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
if !uniqueValues[row.Cells[colIndex].Value.Number.Content] { if !uniqueValues[row.Cells[colIndex].Value.Number.Content] {
uniqueValues[row.Cells[colIndex].Value.Number.Content] = true uniqueValues[row.Cells[colIndex].Value.Number.Content] = true
countUniqueValues++ countUniqueValues++
@ -641,7 +641,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorCountEmpty: case CalcOperatorCountEmpty:
countEmpty := 0 countEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Number && !row.Cells[colIndex].Value.Number.IsNotEmpty { if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Number || !row.Cells[colIndex].Value.Number.IsNotEmpty {
countEmpty++ countEmpty++
} }
} }
@ -649,7 +649,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorCountNotEmpty: case CalcOperatorCountNotEmpty:
countNotEmpty := 0 countNotEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
countNotEmpty++ countNotEmpty++
} }
} }
@ -657,7 +657,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorPercentEmpty: case CalcOperatorPercentEmpty:
countEmpty := 0 countEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Number && !row.Cells[colIndex].Value.Number.IsNotEmpty { if nil == row.Cells[colIndex] || nil == row.Cells[colIndex].Value || nil == row.Cells[colIndex].Value.Number || !row.Cells[colIndex].Value.Number.IsNotEmpty {
countEmpty++ countEmpty++
} }
} }
@ -667,7 +667,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorPercentNotEmpty: case CalcOperatorPercentNotEmpty:
countNotEmpty := 0 countNotEmpty := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
countNotEmpty++ countNotEmpty++
} }
} }
@ -677,7 +677,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorSum: case CalcOperatorSum:
sum := 0.0 sum := 0.0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
sum += row.Cells[colIndex].Value.Number.Content sum += row.Cells[colIndex].Value.Number.Content
} }
} }
@ -686,7 +686,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
sum := 0.0 sum := 0.0
count := 0 count := 0
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
sum += row.Cells[colIndex].Value.Number.Content sum += row.Cells[colIndex].Value.Number.Content
count++ count++
} }
@ -697,7 +697,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorMedian: case CalcOperatorMedian:
values := []float64{} values := []float64{}
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
values = append(values, row.Cells[colIndex].Value.Number.Content) values = append(values, row.Cells[colIndex].Value.Number.Content)
} }
} }
@ -712,7 +712,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorMin: case CalcOperatorMin:
min := math.MaxFloat64 min := math.MaxFloat64
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
if row.Cells[colIndex].Value.Number.Content < min { if row.Cells[colIndex].Value.Number.Content < min {
min = row.Cells[colIndex].Value.Number.Content min = row.Cells[colIndex].Value.Number.Content
} }
@ -724,7 +724,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
case CalcOperatorMax: case CalcOperatorMax:
max := -math.MaxFloat64 max := -math.MaxFloat64
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
if row.Cells[colIndex].Value.Number.Content > max { if row.Cells[colIndex].Value.Number.Content > max {
max = row.Cells[colIndex].Value.Number.Content max = row.Cells[colIndex].Value.Number.Content
} }
@ -737,7 +737,7 @@ func (table *Table) calcColNumber(col *TableColumn, colIndex int) {
min := math.MaxFloat64 min := math.MaxFloat64
max := -math.MaxFloat64 max := -math.MaxFloat64
for _, row := range table.Rows { for _, row := range table.Rows {
if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && (row.Cells[colIndex].Value.Number.IsNotEmpty || 0 != row.Cells[colIndex].Value.Number.Content) { if nil != row.Cells[colIndex] && nil != row.Cells[colIndex].Value && nil != row.Cells[colIndex].Value.Number && row.Cells[colIndex].Value.Number.IsNotEmpty {
if row.Cells[colIndex].Value.Number.Content < min { if row.Cells[colIndex].Value.Number.Content < min {
min = row.Cells[colIndex].Value.Number.Content min = row.Cells[colIndex].Value.Number.Content
} }