优化

2026-08-17 02:12:17 +08:00
parent 560ae46b82
commit 6a05803e08
96 changed files with 2888 additions and 685 deletions
@@ -24,35 +24,35 @@ func menuFromPO(po menuPO) *biz.Menu {
 }

 func menuToPO(v *biz.Menu) menuPO {
-	return menuPO{ID: v.ID, ParentID: v.ParentID, Path: v.Path, Name: v.Name, Hidden: v.Hidden, Component: v.Component, Sort: v.Sort, ActiveName: v.ActiveName, KeepAlive: v.KeepAlive, DefaultMenu: v.DefaultMenu, Title: v.Title, Icon: v.Icon, CloseTab: v.CloseTab, TransitionType: v.TransitionType}
+	return menuPO{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, ParentID: v.ParentID, Path: v.Path, Name: v.Name, Hidden: v.Hidden, Component: v.Component, Sort: v.Sort, ActiveName: v.ActiveName, KeepAlive: v.KeepAlive, DefaultMenu: v.DefaultMenu, Title: v.Title, Icon: v.Icon, CloseTab: v.CloseTab, TransitionType: v.TransitionType}
 }

 func replaceMenuRelations(tx *gorm.DB, menu *biz.Menu) error {
-	// The compatible update rebuilds menu-button rows but does not remove the
-	// existing authority-button rows that point at the old button IDs.  Keep
-	// that observable behavior here; menu deletion itself still cleans those
-	// rows in Delete below, matching the administration endpoint behavior.
-	if err := tx.Unscoped().Where("sys_base_menu_id = ?", menu.ID).Delete(&menuButtonPO{}).Error; err != nil {
-		return err
-	}
 	if err := tx.Unscoped().Where("sys_base_menu_id = ?", menu.ID).Delete(&menuParameterPO{}).Error; err != nil {
 		return err
 	}
-	buttons := make([]menuButtonPO, 0, len(menu.Buttons))
-	for _, button := range menu.Buttons {
-		buttons = append(buttons, menuButtonPO{Name: button.Name, Description: button.Description, MenuID: menu.ID})
+	if err := tx.Unscoped().Where("sys_base_menu_id = ?", menu.ID).Delete(&menuButtonPO{}).Error; err != nil {
+		return err
 	}
-	if len(buttons) > 0 {
-		if err := tx.Create(&buttons).Error; err != nil {
+	return createMenuRelations(tx, menu)
+}
+
+func createMenuRelations(tx *gorm.DB, menu *biz.Menu) error {
+	parameters := make([]menuParameterPO, 0, len(menu.Parameters))
+	for _, parameter := range menu.Parameters {
+		parameters = append(parameters, menuParameterPO{ID: parameter.ID, CreatedAt: parameter.CreatedAt, UpdatedAt: parameter.UpdatedAt, MenuID: menu.ID, Type: parameter.Type, Key: parameter.Key, Value: parameter.Value})
+	}
+	if len(parameters) > 0 {
+		if err := tx.Create(&parameters).Error; err != nil {
 			return err
 		}
 	}
-	parameters := make([]menuParameterPO, 0, len(menu.Parameters))
-	for _, parameter := range menu.Parameters {
-		parameters = append(parameters, menuParameterPO{MenuID: menu.ID, Type: parameter.Type, Key: parameter.Key, Value: parameter.Value})
+	buttons := make([]menuButtonPO, 0, len(menu.Buttons))
+	for _, button := range menu.Buttons {
+		buttons = append(buttons, menuButtonPO{ID: button.ID, CreatedAt: button.CreatedAt, UpdatedAt: button.UpdatedAt, Name: button.Name, Description: button.Description, MenuID: menu.ID})
 	}
-	if len(parameters) > 0 {
-		return tx.Create(&parameters).Error
+	if len(buttons) > 0 {
+		return tx.Create(&buttons).Error
 	}
 	return nil
 }
@@ -94,7 +94,7 @@ func (r *menuRepo) Create(ctx context.Context, v *biz.Menu) error {
 			return err
 		}
 		v.ID = po.ID
-		return replaceMenuRelations(tx, v)
+		return createMenuRelations(tx, v)
 	})
 }

@@ -140,29 +140,25 @@ func (r *menuRepo) Delete(ctx context.Context, id uint) error {
 		if count > 0 {
 			return errors.New("此菜单有角色正在作为首页，不可删除")
 		}
-		var buttonIDs []uint
-		if err := tx.Model(&menuButtonPO{}).Where("sys_base_menu_id = ?", id).Pluck("id", &buttonIDs).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("sys_menu_id = ?", id).Delete(&authorityButtonPO{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("sys_base_menu_id = ?", id).Delete(&menuButtonPO{}).Error; err != nil {
+		if err := tx.Delete(&menuPO{}, id).Error; err != nil {
 			return err
 		}
 		if err := tx.Where("sys_base_menu_id = ?", id).Delete(&menuParameterPO{}).Error; err != nil {
 			return err
 		}
-		if err := tx.Where("sys_base_menu_id = ?", id).Delete(&authorityMenuPO{}).Error; err != nil {
+		if err := tx.Where("sys_base_menu_id = ?", id).Delete(&menuButtonPO{}).Error; err != nil {
 			return err
 		}
-		return tx.Delete(&menuPO{}, id).Error
+		if err := tx.Where("sys_menu_id = ?", id).Delete(&authorityButtonPO{}).Error; err != nil {
+			return err
+		}
+		return tx.Where("sys_base_menu_id = ?", id).Delete(&authorityMenuPO{}).Error
 	})
 }

 func (r *menuRepo) loadRelations(ctx context.Context, menu *biz.Menu) error {
 	var parameters []menuParameterPO
-	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id = ?", menu.ID).Order("id").Find(&parameters).Error; err != nil {
+	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id = ?", menu.ID).Find(&parameters).Error; err != nil {
 		return err
 	}
 	menu.Parameters = make([]*biz.MenuParameter, 0, len(parameters))
@@ -170,7 +166,7 @@ func (r *menuRepo) loadRelations(ctx context.Context, menu *biz.Menu) error {
 		menu.Parameters = append(menu.Parameters, menuParameterFromPO(parameter))
 	}
 	var buttons []menuButtonPO
-	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id = ?", menu.ID).Order("id").Find(&buttons).Error; err != nil {
+	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id = ?", menu.ID).Find(&buttons).Error; err != nil {
 		return err
 	}
 	menu.Buttons = make([]*biz.MenuButton, 0, len(buttons))
@@ -194,7 +190,7 @@ func (r *menuRepo) Find(ctx context.Context, id uint) (*biz.Menu, error) {

 func (r *menuRepo) List(ctx context.Context) ([]*biz.Menu, error) {
 	var pos []menuPO
-	db := r.data.gormDB.WithContext(ctx).Model(&menuPO{}).Order("sort,id")
+	db := r.data.gormDB.WithContext(ctx).Model(&menuPO{}).Order("sort")
 	config := r.data.runtime.Admin()
 	if actor, ok := biz.ActorFromContext(ctx); ok && config != nil && config.System != nil && config.System.UseStrictAuth {
 		var authority authorityPO
@@ -224,7 +220,7 @@ func (r *menuRepo) List(ctx context.Context) ([]*biz.Menu, error) {
 		menu.Buttons = []*biz.MenuButton{}
 	}
 	var parameters []menuParameterPO
-	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id IN ?", ids).Order("id").Find(&parameters).Error; err != nil {
+	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id IN ?", ids).Find(&parameters).Error; err != nil {
 		return nil, err
 	}
 	for _, parameter := range parameters {
@@ -232,7 +228,7 @@ func (r *menuRepo) List(ctx context.Context) ([]*biz.Menu, error) {
 		menu.Parameters = append(menu.Parameters, menuParameterFromPO(parameter))
 	}
 	var buttons []menuButtonPO
-	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id IN ?", ids).Order("id").Find(&buttons).Error; err != nil {
+	if err := r.data.gormDB.WithContext(ctx).Where("sys_base_menu_id IN ?", ids).Find(&buttons).Error; err != nil {
 		return nil, err
 	}
 	for _, button := range buttons {
@@ -264,6 +260,9 @@ func (r *menuRepo) SetAuthorityMenus(ctx context.Context, id uint, ids []uint) e
 	if err := (&authorityAccessRepo{data: r.data}).checkAuthorityIDAuth(ctx, id); err != nil {
 		return err
 	}
+	if err := r.data.gormDB.WithContext(ctx).Where("authority_id = ?", id).First(&authorityPO{}).Error; err != nil {
+		return err
+	}
 	config := r.data.runtime.Admin()
 	if actor, ok := biz.ActorFromContext(ctx); ok && config != nil && config.System != nil && config.System.UseStrictAuth {
 		var authority authorityPO
@@ -307,6 +306,29 @@ func (r *menuRepo) AuthorityMenuIDs(ctx context.Context, id uint) ([]uint, error
 	return ids, err
 }

+// ListAuthorityMenus reads the authority-menu query. It reads the
+// target authority's relation rows first and then fetches only those base
+// menus. In particular, it deliberately does not call List: List applies the
+// current request actor's strict-auth filter, which would incorrectly hide
+// menus when an administrator inspects a different (child) authority.
+func (r *menuRepo) ListAuthorityMenus(ctx context.Context, authorityID uint) ([]*biz.Menu, error) {
+	var pos []menuPO
+	db := r.data.gormDB.WithContext(ctx).Model(&menuPO{}).
+		Where("id IN (?)", r.data.gormDB.WithContext(ctx).Model(&authorityMenuPO{}).
+			Select("sys_base_menu_id").Where("sys_authority_authority_id = ?", authorityID)).
+		Order("sort")
+	if err := db.Find(&pos).Error; err != nil {
+		return nil, err
+	}
+	out := make([]*biz.Menu, 0, len(pos))
+	for _, po := range pos {
+		// This endpoint does not preload Parameters or MenuBtn. Keep
+		// both relations nil so the response shape remains compatible.
+		out = append(out, menuFromPO(po))
+	}
+	return out, nil
+}
+
 func (r *menuRepo) MenuRoleIDs(ctx context.Context, id uint) ([]uint, error) {
 	var ids []uint
 	err := r.data.gormDB.WithContext(ctx).Model(&authorityMenuPO{}).Where("sys_base_menu_id = ?", id).Pluck("sys_authority_authority_id", &ids).Error