mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-04 15:58:49 +01:00
This commit is contained in:
parent
253ad72913
commit
e3827c8151
1 changed files with 3 additions and 6 deletions
|
|
@ -34,7 +34,7 @@ func upgradeSpec2(av *AttributeView) {
|
|||
return
|
||||
}
|
||||
|
||||
// 如果存在 view.table.filters/sorts/pageSize 则复制覆盖到 view.filters/sorts/pageSize 下后置空
|
||||
// 如果存在 view.table.filters/sorts/pageSize 则复制覆盖到 view.filters/sorts/pageSize
|
||||
for _, view := range av.Views {
|
||||
if 1 > len(view.Filters) {
|
||||
view.Filters = []*ViewFilter{}
|
||||
|
|
@ -47,17 +47,14 @@ func upgradeSpec2(av *AttributeView) {
|
|||
}
|
||||
|
||||
if nil != view.Table {
|
||||
if 0 < len(view.Table.Filters) {
|
||||
if 0 < len(view.Table.Filters) && 1 > len(view.Filters) {
|
||||
view.Filters = append(view.Filters, view.Table.Filters...)
|
||||
view.Table.Filters = nil
|
||||
}
|
||||
if 0 < len(view.Table.Sorts) {
|
||||
if 0 < len(view.Table.Sorts) && 1 > len(view.Sorts) {
|
||||
view.Sorts = append(view.Sorts, view.Table.Sorts...)
|
||||
view.Table.Sorts = nil
|
||||
}
|
||||
if 0 < view.Table.PageSize {
|
||||
view.PageSize = view.Table.PageSize
|
||||
view.Table.PageSize = 0
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue