condition.go

@@ -84,14 +84,9 @@ func BuildConditions(ctx context.Context, r *http.Request, query *Query, schemas
 			}
 			//如果是多选的话，直接使用IN操作
 			columnName := row.Column + "[]"
-			if qs.Has(columnName) {
+			if qs.Has(columnName) && len(qs[columnName]) > 1 {
-				if len(qs[columnName]) > 1 {
+				query.AndFilterWhere(newConditionWithOperator("IN", row.Column, qs[columnName]))
-					query.AndFilterWhere(newConditionWithOperator("IN", row.Column, qs[columnName]))
+				continue
-					continue
-				} else if len(qs[columnName]) == 1 {
-					query.AndFilterWhere(newCondition(row.Column, qs[columnName][0]))
-					continue
-				}
 			}
 			formValue = qs.Get(row.Column)
 			switch row.Format {

model.go

@@ -28,7 +28,6 @@ import (
 type Model struct {
 	naming            types.Naming            //命名规则
 	value             reflect.Value           //模块值
-	modelValue        any                     //模块实例
 	db                *gorm.DB                //数据库
 	primaryKey        string                  //主键
 	urlPrefix         string                  //url前缀
@@ -233,17 +232,13 @@ func (m *Model) ModuleName() string {
 
 // TableName 表的名称
 func (m *Model) TableName() string {
-	return m.naming.TableName
+	return m.naming.ModuleName
 }
 
 func (m *Model) Naming() types.Naming {
 	return m.naming
 }
 
-func (m *Model) Value() reflect.Value {
-	return m.value
-}
-
 func (m *Model) SetDB(db *gorm.DB) *gorm.DB {
 	m.db = db
 	return m.db
@@ -266,15 +261,12 @@ func (m *Model) Fields() []*schema.Field {
 // 权限示例: "module.model.scenario"
 // 比如: organize:user:list, organize:user:create
 func (m *Model) Permission(scenario string) string {
-	if pm, ok := m.modelValue.(PermissionModel); ok {
-		return pm.GetPermission(scenario)
-	}
 	ss := make([]string, 0, 4)
 	switch scenario {
 	case types.ScenarioList:
 		ss = append(ss, m.naming.ModuleName, m.naming.Singular, "list")
 	case types.ScenarioView:
-		ss = append(ss, m.naming.ModuleName, m.naming.Singular, "detail")
+		ss = append(ss, m.naming.ModuleName, m.naming.Singular, "get")
 	case types.ScenarioCreate:
 		ss = append(ss, m.naming.ModuleName, m.naming.Singular, "create")
 	case types.ScenarioUpdate:
@@ -1089,7 +1081,6 @@ func newModel(v any, db *gorm.DB, naming types.Naming) *Model {
 		value:       reflect.Indirect(reflect.ValueOf(v)),
 		valueLookup: defaultValueLookup,
 	}
-	model.modelValue = reflect.New(model.value.Type()).Interface()
 	model.statement = &gorm.Statement{
 		DB:       model.getDB(),
 		ConnPool: model.getDB().ConnPool,

options.go

@@ -13,7 +13,6 @@ type options struct {
 	router            types.HttpRouter
 	writer            types.HttpWriter
 	permissionChecker types.PermissionChecker
-	valueLookup       types.ValueLookupFunc
 	formatter         *Formatter
 	resourceDirectory string
 }
@@ -31,7 +30,6 @@ func (o *options) Clone() *options {
 		permissionChecker: o.permissionChecker,
 		formatter:         o.formatter,
 		resourceDirectory: o.resourceDirectory,
-		valueLookup:       o.valueLookup,
 	}
 }
 
@@ -49,12 +47,6 @@ func WithUriPrefix(s string) Option {
 	}
 }
 
-func WithValueLookup(f types.ValueLookupFunc) Option {
-	return func(o *options) {
-		o.valueLookup = f
-	}
-}
-
 // WithModuleName 模块名称
 func WithModuleName(s string) Option {
 	return func(o *options) {

rest.go

@@ -506,19 +506,15 @@ func AutoMigrate(ctx context.Context, model any, cbs ...Option) (modelValue *Mod
 		return
 	}
 	//路由模块处理
-	singularizeTable := inflector.Singularize(table)
 	modelValue = newModel(model, opts.db, types.Naming{
-		Pluralize:  inflector.Pluralize(singularizeTable),
+		Pluralize:  inflector.Pluralize(table),
-		Singular:   singularizeTable,
+		Singular:   inflector.Singularize(table),
 		ModuleName: opts.moduleName,
 		TableName:  table,
 	})
 	if scenarioModel, ok := model.(types.ScenarioModel); ok {
 		modelValue.scenarios = scenarioModel.Scenario()
 	}
-	if opts.valueLookup != nil {
-		modelValue.valueLookup = opts.valueLookup
-	}
 	modelValue.hookMgr = hookMgr
 	modelValue.schemaLookup = VisibleSchemas
 	modelValue.permissionChecker = opts.permissionChecker
@@ -652,128 +648,63 @@ func VisibleSchemas(ctx context.Context, db *gorm.DB, domain, moduleName, tableN
 }
 
 // ModelTypes 查询指定模型的类型
-func ModelTypes[T any](ctx context.Context, db *gorm.DB, model any, domainName, labelColumn, valueColumn string) (values []*types.TypeValue[T], err error) {
+func ModelTypes(ctx context.Context, db *gorm.DB, model any, domainName, labelColumn, valueColumn string) (values []*types.TypeValue) {
 	tx := db.WithContext(ctx)
 	result := make([]map[string]any, 0, 10)
 	if domainName == "" {
-		err = tx.Model(model).Select(labelColumn, valueColumn).Scan(&result).Error
+		tx.Model(model).Select(labelColumn, valueColumn).Scan(&result)
 	} else {
-		err = tx.Model(model).Select(labelColumn, valueColumn).Where("domain=?", domainName).Scan(&result).Error
+		tx.Model(model).Select(labelColumn, valueColumn).Where("domain=?", domainName).Scan(&result)
 	}
-	if err != nil {
+	values = make([]*types.TypeValue, 0, len(result))
-		return
-	}
-	values = make([]*types.TypeValue[T], 0, len(result))
 	for _, pairs := range result {
-		feed := &types.TypeValue[T]{}
+		feed := &types.TypeValue{}
 		for k, v := range pairs {
 			if k == labelColumn {
-				if s, ok := v.(string); ok {
+				feed.Label = v
-					feed.Label = s
-				} else {
-					feed.Label = fmt.Sprint(s)
-				}
-				continue
 			}
 			if k == valueColumn {
-				if p, ok := v.(T); ok {
+				feed.Value = v
-					feed.Value = p
-				}
-				continue
 			}
 		}
 		values = append(values, feed)
 	}
-	return values, nil
+	return values
-}
-
-// ModelTiers 查询指定模型的层级数据
-func ModelTiers[T comparable](ctx context.Context, db *gorm.DB, model any, domainName, parentColumn, labelColumn, valueColumn string) (values []*types.TierValue[T], err error) {
-	tx := db.WithContext(ctx)
-	result := make([]map[string]any, 0, 10)
-	if domainName == "" {
-		err = tx.Model(model).Select(parentColumn, labelColumn, valueColumn).Scan(&result).Error
-	} else {
-		err = tx.Model(model).Select(parentColumn, labelColumn, valueColumn).Where("domain=?", domainName).Scan(&result).Error
-	}
-	if err != nil {
-		return
-	}
-	values = make([]*types.TierValue[T], 0, len(result))
-	for _, pairs := range result {
-		feed := &types.TierValue[T]{}
-		for k, v := range pairs {
-			if k == labelColumn {
-				if s, ok := v.(string); ok {
-					feed.Label = s
-				} else {
-					feed.Label = fmt.Sprint(s)
-				}
-				continue
-			}
-			if k == valueColumn {
-				if p, ok := v.(T); ok {
-					feed.Value = p
-				}
-				continue
-			}
-			if k == parentColumn {
-				if p, ok := v.(T); ok {
-					feed.Parent = p
-				}
-				continue
-			}
-		}
-		values = append(values, feed)
-	}
-	var none T
-	return recursiveTier(none, values), nil
 }
 
 // GetFieldValue 获取模型某个字段的值
-func GetFieldValue(stmt *gorm.Statement, refValue reflect.Value, column string) any {
+func GetFieldValue(stmt *gorm.Statement, refValue reflect.Value, column string) interface{} {
 	var (
-		rawField *schema.Field
+		idx = -1
 	)
 	refVal := reflect.Indirect(refValue)
-	for _, field := range stmt.Schema.Fields {
+	for i, field := range stmt.Schema.Fields {
 		if field.DBName == column || field.Name == column {
-			rawField = field
+			idx = i
 			break
 		}
 	}
-	if rawField == nil {
+	if idx > -1 {
-		return nil
+		return refVal.Field(idx).Interface()
 	}
-	var targetValue reflect.Value
+	return nil
-	targetValue = refVal
-	for _, i := range rawField.StructField.Index {
-		targetValue = targetValue.Field(i)
-	}
-	return targetValue.Interface()
 }
 
 // SetFieldValue 设置模型某个字段的值
 func SetFieldValue(stmt *gorm.Statement, refValue reflect.Value, column string, value any) {
 	var (
-		rawField *schema.Field
+		idx = -1
 	)
 	refVal := reflect.Indirect(refValue)
-	for _, field := range stmt.Schema.Fields {
+	for i, field := range stmt.Schema.Fields {
 		if field.DBName == column || field.Name == column {
-			rawField = field
+			idx = i
 			break
 		}
 	}
-	if rawField == nil {
+	if idx > -1 {
-		return
+		refVal.Field(idx).Set(reflect.ValueOf(value))
 	}
-	var targetValue reflect.Value
-	targetValue = refVal
-	for _, i := range rawField.StructField.Index {
-		targetValue = targetValue.Field(i)
-	}
-	targetValue.Set(reflect.ValueOf(value))
 }
 
 // SafeSetFileValue 安全设置模型某个字段的值

types.go

@@ -44,11 +44,6 @@ type (
 		HttpTableName(req *http.Request) string
 	}
 
-	// 权限模型定义
-	PermissionModel interface {
-		GetPermission(scenario string) string
-	}
-
 	//创建后的回调，这个回调不在事物内
 	afterCreated interface {
 		AfterCreated(ctx context.Context, tx *gorm.DB)

types/types.go

@@ -119,25 +119,16 @@ type (
 	}
 
 	// TypeValue 键值对数据
-	TypeValue[T any] struct {
+	TypeValue struct {
-		Label string `json:"label"`
+		Label any `json:"label"`
-		Value T      `json:"value"`
+		Value any `json:"value"`
-	}
-
-	//TierValue 层级数据
-	TierValue[T comparable] struct {
-		Label    string          `json:"label"`
-		Value    T               `json:"value"`
-		Parent   T               `json:"-"`
-		Used     bool            `json:"-"`
-		Children []*TierValue[T] `json:"children"`
 	}
 
 	// NestedValue 层级数据
-	NestedValue[T any] struct {
+	NestedValue struct {
-		Label    string            `json:"label"`
+		Label    any            `json:"label"`
-		Value    T                 `json:"value"`
+		Value    any            `json:"value"`
-		Children []*NestedValue[T] `json:"children,omitempty"`
+		Children []*NestedValue `json:"children,omitempty"`
 	}
 
 	//ValueLookupFunc 查找域的函数
@@ -249,17 +240,3 @@ type (
 		Status string `json:"status"`
 	}
 )
-
-func (t *TierValue[T]) HasChild(value T) bool {
-	for _, child := range t.Children {
-		if child.Value == value {
-			return true
-		}
-		if len(child.Children) > 0 {
-			if child.HasChild(value) {
-				return true
-			}
-		}
-	}
-	return false
-}

utils.go

@@ -4,8 +4,6 @@ import (
 	"reflect"
 	"slices"
 	"strings"
-
-	"git.nobla.cn/golang/rest/types"
 )
 
 func hasToken(hack string, need string) bool {
@@ -45,18 +43,3 @@ func isEmpty(val any) bool {
 		return reflect.DeepEqual(val, reflect.Zero(v.Type()).Interface())
 	}
 }
-
-func recursiveTier[T comparable](parent T, values []*types.TierValue[T]) []*types.TierValue[T] {
-	items := make([]*types.TierValue[T], 0, len(values)/2)
-	for idx, row := range values {
-		if row.Used {
-			continue
-		}
-		if row.Parent == parent {
-			values[idx].Used = true
-			row.Children = recursiveTier(row.Value, values)
-			items = append(items, row)
-		}
-	}
-	return items
-}