feat: 完成多模块功能迭代与优化
本次提交包含多模块功能更新: 1. 权限系统重构:移除硬编码admin放行逻辑,新增精细化权限控制,完善权限树形结构与用户/角色保护 2. 新增物料导入导出接口,补充台账查询条件 3. 优化列表查询排序逻辑,新增区域编码大小写不敏感搜索 4. 修复帮助抽屉重复弹出问题,补充页面权限控制 5. 新增弱密码提示逻辑,优化MES/WMS用户/角色管理权限 6. 调整路由结构,新增权限校验脚本与前端权限树重构 7. 补充数据库字段与依赖包更新
This commit is contained in:
@@ -22,6 +22,8 @@ type Permission struct {
|
||||
Name string `json:"name,omitempty"`
|
||||
// 类型 MENU菜单/BUTTON按钮
|
||||
Type string `json:"type,omitempty"`
|
||||
// 所属菜单编码(BUTTON 填其所属 MENU 的 code;全局按钮填空)
|
||||
ParentCode string `json:"parentCode,omitempty"`
|
||||
// 前端路由(菜单类)
|
||||
Path string `json:"path,omitempty"`
|
||||
// 图标(菜单类)
|
||||
@@ -44,7 +46,7 @@ func (*Permission) scanValues(columns []string) ([]any, error) {
|
||||
switch columns[i] {
|
||||
case permission.FieldID, permission.FieldSort, permission.FieldCreatedAt, permission.FieldUpdatedAt:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case permission.FieldCode, permission.FieldName, permission.FieldType, permission.FieldPath, permission.FieldIcon, permission.FieldRemark:
|
||||
case permission.FieldCode, permission.FieldName, permission.FieldType, permission.FieldParentCode, permission.FieldPath, permission.FieldIcon, permission.FieldRemark:
|
||||
values[i] = new(sql.NullString)
|
||||
default:
|
||||
values[i] = new(sql.UnknownType)
|
||||
@@ -85,6 +87,12 @@ func (_m *Permission) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.Type = value.String
|
||||
}
|
||||
case permission.FieldParentCode:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field parent_code", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ParentCode = value.String
|
||||
}
|
||||
case permission.FieldPath:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field path", values[i])
|
||||
@@ -166,6 +174,9 @@ func (_m *Permission) String() string {
|
||||
builder.WriteString("type=")
|
||||
builder.WriteString(_m.Type)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("parent_code=")
|
||||
builder.WriteString(_m.ParentCode)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("path=")
|
||||
builder.WriteString(_m.Path)
|
||||
builder.WriteString(", ")
|
||||
|
||||
Reference in New Issue
Block a user