diff --git a/kernel/av/filter.go b/kernel/av/filter.go index 7848290c1..8e254fedf 100644 --- a/kernel/av/filter.go +++ b/kernel/av/filter.go @@ -97,6 +97,8 @@ func (filter *ViewFilter) GetAffectValue(key *Key, defaultVal *Value) (ret *Valu } ret = filter.Value.Clone() + ret.CreatedAt = util.CurrentTimeMillis() + ret.UpdatedAt = ret.CreatedAt + 1000 if nil != defaultVal { // 如果有默认值则优先使用默认值 diff --git a/kernel/av/value.go b/kernel/av/value.go index 120fe1453..81b919708 100644 --- a/kernel/av/value.go +++ b/kernel/av/value.go @@ -184,7 +184,7 @@ func (value *Value) Clone() (ret *Value) { } func (value *Value) IsEdited() bool { - if 1709454120000 > value.CreatedAt { + if 1709740800000 > value.CreatedAt { // 说明是旧数据,认为都是编辑过的 return true } diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index ec67b3900..d35401355 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -1894,15 +1894,15 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string, if nil != view && 0 < len(view.Table.Filters) { viewable, _ := renderAttributeViewTable(attrView, view) viewable.FilterRows(attrView) + viewable.SortRows() + + var lastRow *av.TableRow + if 0 < len(viewable.Rows) { + lastRow = viewable.Rows[len(viewable.Rows)-1] + } sameKeyFilterSort := false // 是否在同一个字段上同时存在过滤和排序 - var lastRow *av.TableRow if 0 < len(viewable.Sorts) { - viewable.SortRows() - if 0 < len(viewable.Rows) { - lastRow = viewable.Rows[len(viewable.Rows)-1] - } - filterKeys, sortKeys := map[string]bool{}, map[string]bool{} for _, filter := range view.Table.Filters { filterKeys[filter.Column] = true