🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15500

app/appearance/langs/ar_SA.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Nach Option sortieren",
   "groupStep": "فاصل التجميع",
   "groupRange": "نطاق التجميع",
   "groupMethodDateRelative": "تاريخ نسبي",

app/appearance/langs/de_DE.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Nach Option sortieren",
   "groupStep": "Gruppierungsintervall",
   "groupRange": "Gruppierungsbereich",
   "groupMethodDateRelative": "Relatives Datum",

app/appearance/langs/en_US.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Sort by option",
   "groupStep": "Group interval",
   "groupRange": "Group range",
   "groupMethodDateRelative": "Relative date",

app/appearance/langs/es_ES.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Ordenar por opción",
   "groupStep": "Intervalo de agrupación",
   "groupRange": "Rango de agrupación",
   "groupMethodDateRelative": "Fecha relativa",

app/appearance/langs/fr_FR.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Trier par option",
   "groupStep": "Intervalle de regroupement",
   "groupRange": "Plage de regroupement",
   "groupMethodDateRelative": "Date relative",

app/appearance/langs/he_IL.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "מיין לפי אפשרות",
   "groupStep": "מרווח קיבוץ",
   "groupRange": "טווח קיבוץ",
   "groupMethodDateRelative": "תאריך יחסי",

app/appearance/langs/it_IT.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Ordina per opzione",
   "groupStep": "Intervallo di raggruppamento",
   "groupRange": "Intervallo di gruppo",
   "groupMethodDateRelative": "Data relativa",

app/appearance/langs/ja_JP.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "オプションで並べ替え",
   "groupStep": "グループ間隔",
   "groupRange": "グループ範囲",
   "groupMethodDateRelative": "相対日付",

app/appearance/langs/pl_PL.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Sortuj według opcji",
   "groupStep": "Odstęp grupowania",
   "groupRange": "Zakres grupowania",
   "groupMethodDateRelative": "Data względna",

app/appearance/langs/pt_BR.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Classificar por opção",
   "groupStep": "Intervalo de agrupamento",
   "groupRange": "Intervalo de grupo",
   "groupMethodDateRelative": "Data relativa",

app/appearance/langs/ru_RU.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "Сортировать по опции",
   "groupStep": "Интервал группировки",
   "groupRange": "Диапазон группировки",
   "groupMethodDateRelative": "Относительная дата",

app/appearance/langs/zh_CHT.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "按選項排序",
   "groupStep": "分組間隔",
   "groupRange": "分組範圍",
   "groupMethodDateRelative": "相對日期",

app/appearance/langs/zh_CN.json

@@ -1,4 +1,5 @@
 {
+  "sortBySelectOption": "按选项排序",
   "groupStep": "分组间隔",
   "groupRange": "分组范围",
   "groupMethodDateRelative": "相对日期",

app/src/protyle/render/av/groups.ts

@@ -102,6 +102,8 @@ export const getLanguageByIndex = (index: number, type: "sort" | "date") => {
                 return window.siyuan.languages.desc;
             case 2:
                 return window.siyuan.languages.customSort;
+            case 3:
+                return window.siyuan.languages.sortBySelectOption;
             default:
                 return "";
         }

kernel/av/group.go

@@ -52,4 +52,5 @@ const (
 	GroupOrderAsc          = iota // 升序
 	GroupOrderDesc                // 降序
 	GroupOrderMan                 // 手动排序
+	GroupOrderSelectOption        // 同选择的选项排序（仅单选和多选字段适用） https://github.com/siyuan-note/siyuan/issues/15500
 )

kernel/model/attribute_view.go

@@ -174,7 +174,7 @@ func sortAttributeViewGroup(avID, blockID, previousGroupID, groupID string) (err
 		return err
 	}
 
-	sortGroupViews(view)
+	sortGroupViews(attrView, view)
 
 	var groupView *av.View
 	var index, previousIndex int
@@ -453,26 +453,7 @@ func SetAttributeViewGroup(avID, blockID string, group *av.ViewGroup) (err error
 		if groupKey := view.GetGroupKey(attrView); nil != groupKey && (av.KeyTypeSelect == groupKey.Type || av.KeyTypeMSelect == groupKey.Type) {
 			// 首次设置分组时，如果分组字段是单选或多选类型，则将分组方式改为手动排序，并按选项顺序排序分组视图 https://github.com/siyuan-note/siyuan/issues/15491
 			view.Group.Order = av.GroupOrderMan
-			optionSort := map[string]int{}
+			sortGroupsBySelectOption(view, groupKey)
-			for i, op := range groupKey.Options {
-				optionSort[op.Name] = i
-			}
-
-			defaultGroup := view.GetGroupByGroupValue(groupValueDefault)
-			if nil != defaultGroup {
-				view.RemoveGroupByID(defaultGroup.ID)
-			}
-
-			sort.Slice(view.Groups, func(i, j int) bool {
-				vSort := optionSort[view.Groups[i].GetGroupValue()]
-				oSort := optionSort[view.Groups[j].GetGroupValue()]
-				return vSort < oSort
-			})
-
-			if nil != defaultGroup {
-				view.Groups = append(view.Groups, defaultGroup)
-			}
-
 			for i, g := range view.Groups {
 				g.GroupSort = i
 			}

kernel/model/attribute_view_render.go

@@ -137,7 +137,7 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
 		}
 	}
 
-	sortGroupViews(view)
+	sortGroupViews(attrView, view)
 
 	var groups []av.Viewable
 	for _, groupView := range view.Groups {
@@ -193,13 +193,13 @@ func hideEmptyGroupViews(view *av.View, viewable av.Viewable) {
 	}
 }
 
-func sortGroupViews(view *av.View) {
+func sortGroupViews(attrView *av.AttributeView, view *av.View) {
 	if av.GroupOrderMan == view.Group.Order {
 		sort.Slice(view.Groups, func(i, j int) bool { return view.Groups[i].GroupSort < view.Groups[j].GroupSort })
 		return
 	}
 
-	if av.GroupMethodDateRelative == view.Group.Method { // 相对日期分组排序
+	if av.GroupMethodDateRelative == view.Group.Method {
 		var relativeDateGroups []*av.View
 		var last30Days, last7Days, yesterday, today, tomorrow, next7Days, next30Days, defaultGroup *av.View
 		for _, groupView := range view.Groups {
@@ -280,7 +280,10 @@ func sortGroupViews(view *av.View) {
 		}
 
 		view.Groups = relativeDateGroups
-	} else { // 升序/降序
+		return
+	}
+
+	if av.GroupOrderAsc == view.Group.Order || av.GroupOrderDesc == view.Group.Order {
 		defaultGroup := view.GetGroupByGroupValue(groupValueDefault)
 		if nil != defaultGroup {
 			view.RemoveGroupByID(defaultGroup.ID)
@@ -297,6 +300,43 @@ func sortGroupViews(view *av.View) {
 		if nil != defaultGroup {
 			view.Groups = append(view.Groups, defaultGroup)
 		}
+		return
+	}
+
+	if av.GroupOrderSelectOption == view.Group.Order {
+		groupKey := view.GetGroupKey(attrView)
+		if nil == groupKey {
+			return
+		}
+
+		if av.KeyTypeSelect != groupKey.Type && av.KeyTypeMSelect != groupKey.Type {
+			return
+		}
+
+		sortGroupsBySelectOption(view, groupKey)
+		return
+	}
+}
+
+func sortGroupsBySelectOption(view *av.View, groupKey *av.Key) {
+	optionSort := map[string]int{}
+	for i, op := range groupKey.Options {
+		optionSort[op.Name] = i
+	}
+
+	defaultGroup := view.GetGroupByGroupValue(groupValueDefault)
+	if nil != defaultGroup {
+		view.RemoveGroupByID(defaultGroup.ID)
+	}
+
+	sort.Slice(view.Groups, func(i, j int) bool {
+		vSort := optionSort[view.Groups[i].GetGroupValue()]
+		oSort := optionSort[view.Groups[j].GetGroupValue()]
+		return vSort < oSort
+	})
+
+	if nil != defaultGroup {
+		view.Groups = append(view.Groups, defaultGroup)
 	}
 }