diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index ea3c7594d..3aa9fc413 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -1632,6 +1632,7 @@ "260": "أمس", "261": "اليوم", "262": "غدًا", - "263": "التالي %d أيام" + "263": "التالي %d أيام", + "264": "الحقل [%s] فارغ" } } diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index de631d2c0..451775985 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1632,6 +1632,7 @@ "260": "Gestern", "261": "Heute", "262": "Morgen", - "263": "Nächste %d Tage" + "263": "Nächste %d Tage", + "264": "Das Feld [%s] ist leer" } } diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index ff71310c3..8621420c6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1632,6 +1632,7 @@ "260": "Yesterday", "261": "Today", "262": "Tomorrow", - "263": "Next %d days" + "263": "Next %d days", + "264": "Field [%s] is empty" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index e219f4c59..ac80a2b70 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1632,6 +1632,7 @@ "260": "Ayer", "261": "Hoy", "262": "Mañana", - "263": "Próximos %d días" + "263": "Próximos %d días", + "264": "El campo [%s] está vacío" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 084b84c60..9ba4be4d2 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1632,6 +1632,7 @@ "260": "Hier", "261": "Aujourd'hui", "262": "Demain", - "263": "Les %d prochains jours" + "263": "Les %d prochains jours", + "264": "Le champ [%s] est vide" } } diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 441cf2a88..9f9747bc5 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1632,6 +1632,7 @@ "260": "אתמול", "261": "היום", "262": "מחר", - "263": "ה-%d ימים הבאים" + "263": "ה-%d ימים הבאים", + "264": "השדה [%s] ריק" } } diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 1e5c829da..6e40d7a0e 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1632,6 +1632,7 @@ "260": "Ieri", "261": "Oggi", "262": "Domani", - "263": "Prossimi %d giorni" + "263": "Prossimi %d giorni", + "264": "Il campo [%s] è vuoto" } } diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 691cd0ee3..53c33aefd 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1632,6 +1632,7 @@ "260": "昨日", "261": "今日", "262": "明日", - "263": "次の %d 日間" + "263": "次の %d 日間", + "264": "フィールド [%s] の値が空です" } } diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 44437727f..3367fb288 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1632,6 +1632,7 @@ "260": "Wczoraj", "261": "Dzisiaj", "262": "Jutro", - "263": "Następne %d dni" + "263": "Następne %d dni", + "264": "Pole [%s] jest puste" } } diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json index 1a4279646..d719a82ca 100644 --- a/app/appearance/langs/pt_BR.json +++ b/app/appearance/langs/pt_BR.json @@ -1632,6 +1632,7 @@ "260": "Ontem", "261": "Hoje", "262": "Amanhã", - "263": "Próximos %d dias" + "263": "Próximos %d dias", + "264": "O campo [%s] está vazio" } } diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 8836010fc..cfce581ad 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1632,6 +1632,7 @@ "260": "Вчера", "261": "Сегодня", "262": "Завтра", - "263": "Следующие %d дней" + "263": "Следующие %d дней", + "264": "Поле [%s] имеет пустое значение" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 122758b09..1c241541b 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1632,6 +1632,7 @@ "260": "昨天", "261": "今天", "262": "明天", - "263": "未來 %d 天" + "263": "未來 %d 天", + "264": "字段 [%s] 值為空" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index afb061186..d8b51a7b3 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1632,6 +1632,7 @@ "260": "昨天", "261": "今天", "262": "明天", - "263": "未来 %d 天" + "263": "未来 %d 天", + "264": "字段 [%s] 值为空" } } diff --git a/kernel/av/av.go b/kernel/av/av.go index ffbf76f69..580f836b9 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -199,7 +199,6 @@ type View struct { GroupFolded bool `json:"groupFolded,omitempty"` // 分组是否折叠 GroupHidden bool `json:"groupHidden,omitempty"` // 分组是否隐藏 GroupHideEmpty bool `json:"groupHideEmpty,omitempty"` // 分组是否隐藏空分组 - GroupDefault bool `json:"groupDefault,omitempty"` // 是否为默认分组 } // GroupCalc 描述了分组计算规则和结果的结构。 @@ -291,9 +290,6 @@ type Viewable interface { // SetGroupHidden 设置分组是否隐藏。 SetGroupHidden(hidden bool) - - // SetGroupDefault 设置分组是否为默认分组。 - SetGroupDefault(defaulted bool) } func NewAttributeView(id string) (ret *AttributeView) { diff --git a/kernel/av/layout.go b/kernel/av/layout.go index c81524167..c642dd8d3 100644 --- a/kernel/av/layout.go +++ b/kernel/av/layout.go @@ -66,12 +66,11 @@ type BaseInstance struct { Folded bool `json:"folded,omitempty"` // 是否折叠 Hidden bool `json:"hidden,omitempty"` // 是否隐藏 - Groups []Viewable `json:"groups,omitempty"` // 分组实例列表 - GroupCalc *GroupCalc `json:"groupCalc,omitempty"` // 分组计算规则和结果 - GroupName string `json:"groupName,omitempty"` // 分组名称 - GroupFolded bool `json:"groupFolded,omitempty"` // 分组是否折叠 - GroupHidden bool `json:"groupHidden,omitempty"` // 分组是否隐藏 - GroupDefault bool `json:"groupDefault,omitempty"` // 是否为默认分组 + Groups []Viewable `json:"groups,omitempty"` // 分组实例列表 + GroupCalc *GroupCalc `json:"groupCalc,omitempty"` // 分组计算规则和结果 + GroupName string `json:"groupName,omitempty"` // 分组名称 + GroupFolded bool `json:"groupFolded,omitempty"` // 分组是否折叠 + GroupHidden bool `json:"groupHidden,omitempty"` // 分组是否隐藏 } func NewViewBaseInstance(view *View) *BaseInstance { @@ -97,7 +96,6 @@ func NewViewBaseInstance(view *View) *BaseInstance { GroupName: view.GroupName, GroupFolded: view.GroupFolded, GroupHidden: view.GroupHidden, - GroupDefault: view.GroupDefault, ShowIcon: showIcon, WrapField: wrapField, } @@ -135,10 +133,6 @@ func (baseInstance *BaseInstance) SetGroupHidden(hidden bool) { baseInstance.GroupHidden = hidden } -func (baseInstance *BaseInstance) SetGroupDefault(defaulted bool) { - baseInstance.GroupDefault = defaulted -} - func (baseInstance *BaseInstance) GetID() string { return baseInstance.ID } diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 3e152680a..b8bc752c5 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -1365,6 +1365,11 @@ func genGroup(view *av.View, attrView *av.AttributeView) { items = append(items, item) } + groupKey, _ := attrView.GetKey(group.Field) + if nil == groupKey { + return + } + var rangeStart, rangeEnd float64 switch group.Method { case av.GroupMethodValue: @@ -1487,9 +1492,12 @@ func genGroup(view *av.View, attrView *av.AttributeView) { for _, item := range groupItems { v.GroupItemIDs = append(v.GroupItemIDs, item.GetID()) } + + if defaultGroupName == name { + name = fmt.Sprintf(Conf.language(264), groupKey.Name) + } v.Name = name view.Groups = append(view.Groups, v) - view.GroupDefault = name == defaultGroupName } }