Merge remote-tracking branch 'origin/dev' into dev

kernel/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
 	github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
 	github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689
-	github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016
+	github.com/88250/lute v1.7.7-0.20250809022544-9aa600742e38
 	github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
 	github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
 	github.com/ConradIrwin/font v0.2.1

kernel/go.sum

@@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
 github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
 github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
-github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016 h1:MnQe9wMqlpbKCCdiRAx2JHjaTXKpS/+Ra2AuXP7a7hI=
-github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
+github.com/88250/lute v1.7.7-0.20250809022544-9aa600742e38 h1:5KSB/JkJcAcT8fvJ/ls2vy5K6aWxgTipkR4cG8O9SPQ=
+github.com/88250/lute v1.7.7-0.20250809022544-9aa600742e38/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
 github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
 github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

kernel/model/attribute_view.go

@@ -415,11 +415,33 @@ func SetAttributeViewGroup(avID, blockID string, group *av.ViewGroup) (err error
 		return err
 	}
 
+	oldHideEmpty := false
+	if nil != view.Group {
+		oldHideEmpty = view.Group.HideEmpty
+	}
+
 	groupStates := getAttrViewGroupStates(view)
 	view.Group = group
 	regenAttrViewViewGroups(attrView, "force")
 	setAttrViewGroupStates(view, groupStates)
 
+	if view.Group.HideEmpty != oldHideEmpty {
+		if !oldHideEmpty && view.Group.HideEmpty { // 启用隐藏空分组
+			for _, g := range view.Groups {
+				if g.GroupHidden == 0 && 1 > len(g.GroupItemIDs) {
+					g.GroupHidden = 1
+				}
+			}
+		}
+		if oldHideEmpty && !view.Group.HideEmpty { // 禁用隐藏空分组
+			for _, g := range view.Groups {
+				if g.GroupHidden == 1 && 1 > len(g.GroupItemIDs) {
+					g.GroupHidden = 0
+				}
+			}
+		}
+	}
+
 	err = av.SaveAttributeView(attrView)
 	ReloadAttrView(avID)
 	return
@@ -1702,6 +1724,10 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
 			}
 		}
 
+		todayStart := time.Now()
+		todayStart = time.Date(todayStart.Year(), todayStart.Month(), todayStart.Day(), 0, 0, 0, 0, time.Local)
+		sortGroupViews(todayStart, view)
+
 		var groups []av.Viewable
 		for _, groupView := range view.Groups {
 			groupViewable := sql.RenderGroupView(attrView, view, groupView, query)
@@ -1741,6 +1767,101 @@ func renderAttributeView(attrView *av.AttributeView, blockID, viewID, query stri
 	return
 }
 
+func sortGroupViews(todayStart time.Time, view *av.View) {
+	if av.GroupOrderMan == view.Group.Order {
+		return
+	}
+
+	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 {
+			_, err := time.Parse("2006-01", groupView.GetGroupValue())
+			if nil == err { // 如果能解析出来说明是 30 天之前或 30 天之后的分组形式
+				relativeDateGroups = append(relativeDateGroups, groupView)
+			} else { // 否则是相对日期分组形式
+				switch groupView.GetGroupValue() {
+				case groupValueLast30Days:
+					last30Days = groupView
+				case groupValueLast7Days:
+					last7Days = groupView
+				case groupValueYesterday:
+					yesterday = groupView
+				case groupValueToday:
+					today = groupView
+				case groupValueTomorrow:
+					tomorrow = groupView
+				case groupValueNext7Days:
+					next7Days = groupView
+				case groupValueNext30Days:
+					next30Days = groupView
+				case groupValueDefault:
+					defaultGroup = groupView
+				}
+			}
+		}
+
+		sort.SliceStable(relativeDateGroups, func(i, j int) bool {
+			return relativeDateGroups[i].GetGroupValue() < relativeDateGroups[j].GetGroupValue()
+		})
+
+		var lastNext30Days []*av.View
+		if nil != next30Days {
+			lastNext30Days = append(lastNext30Days, next30Days)
+		}
+		if nil != next7Days {
+			lastNext30Days = append(lastNext30Days, next7Days)
+		}
+		if nil != tomorrow {
+			lastNext30Days = append(lastNext30Days, tomorrow)
+		}
+		if nil != today {
+			lastNext30Days = append(lastNext30Days, today)
+		}
+		if nil != yesterday {
+			lastNext30Days = append(lastNext30Days, yesterday)
+		}
+
+		if nil != last7Days {
+			lastNext30Days = append(lastNext30Days, last7Days)
+		}
+		if nil != last30Days {
+			lastNext30Days = append(lastNext30Days, last30Days)
+		}
+
+		startIdx := -1
+		thisMonth := todayStart.Format("2006-01")
+		for i, monthGroup := range relativeDateGroups {
+			if monthGroup.GetGroupValue() < thisMonth {
+				startIdx = i + 1
+			}
+		}
+		if -1 == startIdx {
+			startIdx = 0
+		}
+		for _, g := range lastNext30Days {
+			relativeDateGroups = util.InsertElem(relativeDateGroups, startIdx, g)
+		}
+		if nil != defaultGroup {
+			relativeDateGroups = append([]*av.View{defaultGroup}, relativeDateGroups...)
+		}
+
+		if av.GroupOrderDesc == view.Group.Order {
+			slices.Reverse(relativeDateGroups)
+		}
+
+		view.Groups = relativeDateGroups
+	} else {
+		sort.SliceStable(view.Groups, func(i, j int) bool {
+			iVal, jVal := view.Groups[i].GetGroupValue(), view.Groups[j].GetGroupValue()
+			if av.GroupOrderAsc == view.Group.Order {
+				return util.NaturalCompare(iVal, jVal)
+			}
+			return util.NaturalCompare(jVal, iVal)
+		})
+	}
+}
+
 func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
 	if nil == view.Group {
 		return
@@ -1921,109 +2042,6 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
 	view.GroupCreated = time.Now().UnixMilli()
 
 	setAttrViewGroupStates(view, groupStates)
-
-	if av.GroupOrderMan == view.Group.Order {
-		// 恢复分组视图的自定义顺序
-		if len(groupStates) > 0 {
-			sort.SliceStable(view.Groups, func(i, j int) bool {
-				if stateI, ok := groupStates[view.Groups[i].GetGroupValue()]; ok {
-					if stateJ, ok := groupStates[view.Groups[j].GetGroupValue()]; ok {
-						return stateI.Sort < stateJ.Sort
-					}
-				}
-				return false
-			})
-		}
-	} else {
-		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 {
-				_, err := time.Parse("2006-01", groupView.GetGroupValue())
-				if nil == err { // 如果能解析出来说明是 30 天之前或 30 天之后的分组形式
-					relativeDateGroups = append(relativeDateGroups, groupView)
-				} else { // 否则是相对日期分组形式
-					switch groupView.GetGroupValue() {
-					case groupValueLast30Days:
-						last30Days = groupView
-					case groupValueLast7Days:
-						last7Days = groupView
-					case groupValueYesterday:
-						yesterday = groupView
-					case groupValueToday:
-						today = groupView
-					case groupValueTomorrow:
-						tomorrow = groupView
-					case groupValueNext7Days:
-						next7Days = groupView
-					case groupValueNext30Days:
-						next30Days = groupView
-					case groupValueDefault:
-						defaultGroup = groupView
-					}
-				}
-			}
-
-			sort.SliceStable(relativeDateGroups, func(i, j int) bool {
-				return relativeDateGroups[i].GetGroupValue() < relativeDateGroups[j].GetGroupValue()
-			})
-
-			var lastNext30Days []*av.View
-			if nil != next30Days {
-				lastNext30Days = append(lastNext30Days, next30Days)
-			}
-			if nil != next7Days {
-				lastNext30Days = append(lastNext30Days, next7Days)
-			}
-			if nil != tomorrow {
-				lastNext30Days = append(lastNext30Days, tomorrow)
-			}
-			if nil != today {
-				lastNext30Days = append(lastNext30Days, today)
-			}
-			if nil != yesterday {
-				lastNext30Days = append(lastNext30Days, yesterday)
-			}
-
-			if nil != last7Days {
-				lastNext30Days = append(lastNext30Days, last7Days)
-			}
-			if nil != last30Days {
-				lastNext30Days = append(lastNext30Days, last30Days)
-			}
-
-			startIdx := -1
-			thisMonth := todayStart.Format("2006-01")
-			for i, monthGroup := range relativeDateGroups {
-				if monthGroup.GetGroupValue() < thisMonth {
-					startIdx = i + 1
-				}
-			}
-			if -1 == startIdx {
-				startIdx = 0
-			}
-			for _, g := range lastNext30Days {
-				relativeDateGroups = util.InsertElem(relativeDateGroups, startIdx, g)
-			}
-			if nil != defaultGroup {
-				relativeDateGroups = append([]*av.View{defaultGroup}, relativeDateGroups...)
-			}
-
-			if av.GroupOrderDesc == view.Group.Order {
-				slices.Reverse(relativeDateGroups)
-			}
-
-			view.Groups = relativeDateGroups
-		} else {
-			sort.SliceStable(view.Groups, func(i, j int) bool {
-				iVal, jVal := view.Groups[i].GetGroupValue(), view.Groups[j].GetGroupValue()
-				if av.GroupOrderAsc == view.Group.Order {
-					return util.NaturalCompare(iVal, jVal)
-				}
-				return util.NaturalCompare(jVal, iVal)
-			})
-		}
-	}
 }
 
 // GroupState 用于临时记录每个分组视图的状态，以便后面重新生成分组后可以恢复这些状态。
@@ -2031,7 +2049,6 @@ type GroupState struct {
 	ID     string
 	Folded bool
 	Hidden int
-	Sort   int
 }
 
 func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState) {
@@ -2040,12 +2057,11 @@ func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState)
 		return
 	}
 
-	for i, groupView := range view.Groups {
+	for _, groupView := range view.Groups {
 		groupStates[groupView.GetGroupValue()] = &GroupState{
 			ID:     groupView.ID,
 			Folded: groupView.GroupFolded,
 			Hidden: groupView.GroupHidden,
-			Sort:   i,
 		}
 	}
 	return
@@ -4993,10 +5009,12 @@ func updateAttributeViewColumnOptions(operation *Operation) (err error) {
 	for _, keyValues := range attrView.KeyValues {
 		if keyValues.Key.ID == operation.ID {
 			keyValues.Key.Options = options
-			err = av.SaveAttributeView(attrView)
-			return
+			break
 		}
 	}
+
+	regenAttrViewViewGroups(attrView, operation.ID)
+	err = av.SaveAttributeView(attrView)
 	return
 }
 

kernel/model/export.go

@@ -2012,8 +2012,16 @@ func exportMarkdownContent(id, ext string, exportRefMode int, defBlockIDs []stri
 		return
 	}
 
-	if ast.NodeParagraph == tree.Root.FirstChild.Type {
-		isEmpty = nil == tree.Root.FirstChild.FirstChild
+	for c := tree.Root.FirstChild; nil != c; c = c.Next {
+		if ast.NodeParagraph == c.Type {
+			isEmpty = nil == c.FirstChild
+			if !isEmpty {
+				break
+			}
+		} else {
+			isEmpty = false
+			break
+		}
 	}
 
 	exportedMd = exportMarkdownContent0(id, tree, "", false, false, false,

kernel/sql/av.go

@@ -39,8 +39,19 @@ func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View, query
 	case av.LayoutTypeTable:
 		// 这里需要使用深拷贝，因为字段上可能会带有计算（FieldCalc），每个分组视图的计算结果都需要分别存储在不同的字段实例上
 		err = copier.CopyWithOption(&groupView.Table.Columns, &view.Table.Columns, copier.Option{DeepCopy: true})
+		groupView.Table.ShowIcon = view.Table.ShowIcon
+		groupView.Table.WrapField = view.Table.WrapField
 	case av.LayoutTypeGallery:
 		err = copier.CopyWithOption(&groupView.Gallery.CardFields, &view.Gallery.CardFields, copier.Option{DeepCopy: true})
+		groupView.Gallery.ShowIcon = view.Gallery.ShowIcon
+		groupView.Gallery.WrapField = view.Gallery.WrapField
+
+		groupView.Gallery.CoverFrom = view.Gallery.CoverFrom
+		groupView.Gallery.CoverFromAssetKeyID = view.Gallery.CoverFromAssetKeyID
+		groupView.Gallery.CardAspectRatio = view.Gallery.CardAspectRatio
+		groupView.Gallery.CardSize = view.Gallery.CardSize
+		groupView.Gallery.FitImage = view.Gallery.FitImage
+		groupView.Gallery.DisplayFieldName = view.Gallery.DisplayFieldName
 	}
 	if nil != err {
 		logging.LogErrorf("copy view fields [%s] to group [%s] failed: %s", view.ID, groupView.ID, err)