diff --git a/kernel/api/av.go b/kernel/api/av.go index 88694fdfa..b8dcd8d85 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -54,6 +54,9 @@ func getAttributeViewAddingBlockDefaultValues(c *gin.Context) { } values := model.GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousID, addingBlockID) + if 1 > len(values) { + values = nil + } ret.Data = map[string]interface{}{ "values": values, } diff --git a/kernel/av/av.go b/kernel/av/av.go index 9394c8bc4..95b04d9ef 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -197,11 +197,18 @@ type View struct { Groups []*View `json:"groups,omitempty"` // 分组视图列表 GroupItemIDs []string `json:"groupItemIds"` // 分组项目 ID 列表，用于维护分组中的所有项目 GroupCalc *GroupCalc `json:"groupCalc,omitempty"` // 分组计算规则 - GroupValue string `json:"groupValue,omitempty"` // 分组值 + GroupValue *Value `json:"groupValue,omitempty"` // 分组值 GroupFolded bool `json:"groupFolded"` // 分组是否折叠 GroupHidden int `json:"groupHidden"` // 分组是否隐藏，0：显示，1：空白隐藏，2：手动隐藏 } +func (view *View) GetGroupValue() string { + if nil == view.GroupValue { + return "" + } + return view.GroupValue.String(false) +} + // GetGroup 获取指定分组 ID 的分组视图。 func (view *View) GetGroup(groupID string) *View { if nil == view.Groups { diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index e5c1b70b2..ecc657c88 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -124,10 +124,10 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group newValue := getNewValueByNearItem(nearItem, groupKey, addingBlockID) if av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type { // 因为单选或多选只能按选项分组，并且可能存在空白分组（前面可能找不到临近项） ，所以单选或多选类型的分组字段使用分组值内容对应的选项 - if opt := groupKey.GetOption(groupView.GroupValue); nil != opt && groupValueDefault != groupView.GroupValue { + if opt := groupKey.GetOption(groupView.GetGroupValue()); nil != opt && groupValueDefault != groupView.GetGroupValue() { exists := false for _, s := range newValue.MSelect { - if s.Content == groupView.GroupValue { + if s.Content == groupView.GetGroupValue() { exists = true } } @@ -1621,7 +1621,7 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri // 如果存在分组的话渲染分组视图 if groupKey := view.GetGroupKey(attrView); nil != groupKey { for _, groupView := range view.Groups { - switch groupView.GroupValue { + switch groupView.GetGroupValue() { case groupValueDefault: groupView.Name = fmt.Sprintf(Conf.language(264), groupKey.Name) case groupValueNotInRange: @@ -1641,7 +1641,7 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri case groupValueNext30Days: groupView.Name = fmt.Sprintf(Conf.language(263), 30) default: - groupView.Name = groupView.GroupValue + groupView.Name = groupView.GetGroupValue() } } @@ -1831,7 +1831,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { } } - for name, groupItems := range groupItemsMap { + for groupValue, groupItems := range groupItemsMap { var v *av.View switch view.LayoutType { case av.LayoutTypeTable: @@ -1851,7 +1851,14 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { } v.Name = "" // 分组视图的名称在渲染时才填充 - v.GroupValue = name + v.GroupValue = &av.Value{Type: av.KeyTypeText, Text: &av.ValueText{Content: groupValue}} + if av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type { + v.GroupValue.Text = nil + v.GroupValue.Type = av.KeyTypeSelect + + opt := groupKey.GetOption(groupVal) + v.GroupValue.MSelect = []*av.ValueSelect{{Content: opt.Name, Color: opt.Color}} + } view.Groups = append(view.Groups, v) } @@ -1863,8 +1870,8 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { // 恢复分组视图的自定义顺序 if len(groupStates) > 0 { sort.SliceStable(view.Groups, func(i, j int) bool { - if stateI, ok := groupStates[view.Groups[i].GroupValue]; ok { - if stateJ, ok := groupStates[view.Groups[j].GroupValue]; ok { + if stateI, ok := groupStates[view.Groups[i].GetGroupValue()]; ok { + if stateJ, ok := groupStates[view.Groups[j].GetGroupValue()]; ok { return stateI.Sort < stateJ.Sort } } @@ -1876,11 +1883,11 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { var relativeDateGroups []*av.View var last30Days, last7Days, yesterday, today, tomorrow, next7Days, next30Days, defaultGroup *av.View for _, groupView := range view.Groups { - _, err := time.Parse("2006-01", groupView.GroupValue) + _, err := time.Parse("2006-01", groupView.GetGroupValue()) if nil == err { // 如果能解析出来说明是 30 天之前或 30 天之后的分组形式 relativeDateGroups = append(relativeDateGroups, groupView) } else { // 否则是相对日期分组形式 - switch groupView.GroupValue { + switch groupView.GetGroupValue() { case groupValueLast30Days: last30Days = groupView case groupValueLast7Days: @@ -1902,7 +1909,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { } sort.SliceStable(relativeDateGroups, func(i, j int) bool { - return relativeDateGroups[i].GroupValue < relativeDateGroups[j].GroupValue + return relativeDateGroups[i].GetGroupValue() < relativeDateGroups[j].GetGroupValue() }) var lastNext30Days []*av.View @@ -1932,7 +1939,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { startIdx := -1 thisMonth := todayStart.Format("2006-01") for i, monthGroup := range relativeDateGroups { - if monthGroup.GroupValue < thisMonth { + if monthGroup.GetGroupValue() < thisMonth { startIdx = i + 1 } } @@ -1953,7 +1960,7 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) { view.Groups = relativeDateGroups } else { sort.SliceStable(view.Groups, func(i, j int) bool { - iVal, jVal := view.Groups[i].GroupValue, view.Groups[j].GroupValue + iVal, jVal := view.Groups[i].GetGroupValue(), view.Groups[j].GetGroupValue() if av.GroupOrderAsc == view.Group.Order { return util.NaturalCompare(iVal, jVal) } @@ -1978,7 +1985,7 @@ func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState) } for i, groupView := range view.Groups { - groupStates[groupView.GroupValue] = &GroupState{ + groupStates[groupView.GetGroupValue()] = &GroupState{ ID: groupView.ID, Folded: groupView.GroupFolded, Hidden: groupView.GroupHidden, @@ -1990,7 +1997,7 @@ func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState) func setAttrViewGroupStates(view *av.View, groupStates map[string]*GroupState) { for _, groupView := range view.Groups { - if state, ok := groupStates[groupView.GroupValue]; ok { + if state, ok := groupStates[groupView.GetGroupValue()]; ok { groupView.ID = state.ID groupView.GroupFolded = state.Folded groupView.GroupHidden = state.Hidden @@ -3201,7 +3208,7 @@ func addAttributeViewBlock(now int64, avID, blockID, groupID, previousBlockID, a if (av.KeyTypeSelect == newValue.Type || av.KeyTypeMSelect == newValue.Type) && 1 > len(newValue.MSelect) { // 单选或多选类型的值可能需要从分组条件中获取默认值 - if opt := keyValues.Key.GetOption(groupView.GroupValue); nil != opt && groupValueDefault != groupView.GroupValue { + if opt := keyValues.Key.GetOption(groupView.GetGroupValue()); nil != opt && groupValueDefault != groupView.GetGroupValue() { newValue.MSelect = append(newValue.MSelect, &av.ValueSelect{Content: opt.Name, Color: opt.Color}) } }