fix: align admin behavior and Kratos integrations

internal/data/version.go

@@ -47,14 +47,11 @@ func (r *versionRepo) FindVersion(ctx context.Context, id uint) (*biz.Version, e
 	}
 	return versionFromPO(po), nil
 }
-func (r *versionRepo) ListVersions(ctx context.Context, page, size int, name, code string) ([]*biz.Version, int64, error) {
-	if page < 1 {
-		page = 1
-	}
-	if size < 1 {
-		size = 10
-	}
+func (r *versionRepo) ListVersions(ctx context.Context, page, size int, name, code string, createdAtRange []*time.Time) ([]*biz.Version, int64, error) {
 	db := r.data.gormDB.WithContext(ctx).Model(&versionPO{})
+	if len(createdAtRange) == 2 && createdAtRange[0] != nil && createdAtRange[1] != nil {
+		db = db.Where("created_at BETWEEN ? AND ?", createdAtRange[0], createdAtRange[1])
+	}
 	if name != "" {
 		db = db.Where("version_name LIKE ?", "%"+name+"%")
 	}
@@ -66,7 +63,7 @@ func (r *versionRepo) ListVersions(ctx context.Context, page, size int, name, co
 		return nil, 0, err
 	}
 	var pos []versionPO
-	if err := db.Order("id desc").Offset((page - 1) * size).Limit(size).Find(&pos).Error; err != nil {
+	if err := applyPagination(db, page, size, 100).Find(&pos).Error; err != nil {
 		return nil, 0, err
 	}
 	out := make([]*biz.Version, 0, len(pos))
@@ -94,14 +91,45 @@ func (r *versionRepo) BuildVersionBundle(ctx context.Context, menuIDs, apiIDs, d
 		}
 		byID[po.ID] = v
 	}
+	if len(menuIDs) > 0 {
+		var parameters []menuParameterPO
+		if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id IN ?", menuIDs).Find(&parameters).Error; err != nil {
+			return nil, err
+		}
+		for _, parameter := range parameters {
+			if menu := byID[parameter.MenuID]; menu != nil {
+				menu.Parameters = append(menu.Parameters, &biz.MenuParameter{Type: parameter.Type, Key: parameter.Key, Value: parameter.Value})
+			}
+		}
+	}
 	for _, po := range menus {
 		v := byID[po.ID]
 		if parent := byID[po.ParentID]; parent != nil {
 			parent.Children = append(parent.Children, v)
-		} else {
+		} else if po.ParentID == 0 {
 			bundle.Menus = append(bundle.Menus, v)
 		}
 	}
+	var cleanMenu func(*biz.Menu)
+	cleanMenu = func(menu *biz.Menu) {
+		menu.ID = 0
+		menu.ParentID = 0
+		for _, button := range menu.Buttons {
+			button.ID = 0
+			button.MenuID = 0
+			button.AuthorityID = 0
+		}
+		for _, parameter := range menu.Parameters {
+			parameter.ID = 0
+			parameter.MenuID = 0
+		}
+		for _, child := range menu.Children {
+			cleanMenu(child)
+		}
+	}
+	for _, menu := range bundle.Menus {
+		cleanMenu(menu)
+	}
 	var apis []apiPO
 	if len(apiIDs) > 0 {
 		if err := r.data.gormDB.WithContext(ctx).Where("id IN ?", apiIDs).Find(&apis).Error; err != nil {
@@ -123,7 +151,7 @@ func (r *versionRepo) BuildVersionBundle(ctx context.Context, menuIDs, apiIDs, d
 	for _, po := range dictionaries {
 		v := dictionaryFromPO(po)
 		v.ID = 0
-		details, _, err := settings.ListDictionaryDetails(ctx, 1, 100000, po.ID, "", "")
+		details, _, err := settings.ListDictionaryDetails(ctx, 0, 0, biz.DictionaryDetailFilter{DictionaryID: po.ID})
 		if err != nil {
 			return nil, err
 		}
@@ -159,6 +187,11 @@ func (r *versionRepo) ImportVersionBundle(ctx context.Context, b *biz.VersionBun
 							return err
 						}
 					}
+					for _, parameter := range item.Parameters {
+						if err = tx.Create(&menuParameterPO{MenuID: po.ID, Type: parameter.Type, Key: parameter.Key, Value: parameter.Value}).Error; err != nil {
+							return err
+						}
+					}
 				} else if err != nil {
 					return err
 				}