Compare commits

..

No commits in common. "master" and "v0.0.1" have entirely different histories.

3 changed files with 4 additions and 14 deletions

View File

@ -15,7 +15,7 @@ func (identity *Identify) Name() string {
}
func (identity *Identify) Initialize(db *gorm.DB) (err error) {
err = db.Callback().Create().Before("gorm:create").Register("rest_auto_identified", identity.Grant)
err = db.Callback().Create().Before("gorm:create").Register("auto_identified", identity.Grant)
return
}

View File

@ -121,10 +121,10 @@ func (validate *Validate) findRule(name string, rules []*validateRule) *validate
func (validate *Validate) Initialize(db *gorm.DB) (err error) {
validate.validator = validator.New()
if err = db.Callback().Create().Before("gorm:before_create").Register("rest_validate_create", validate.Validate); err != nil {
if err = db.Callback().Create().Before("gorm:before_create").Register("model_validate", validate.Validate); err != nil {
return
}
if err = db.Callback().Create().Before("gorm:before_update").Register("rest_validate_update", validate.Validate); err != nil {
if err = db.Callback().Create().Before("gorm:before_update").Register("model_validate", validate.Validate); err != nil {
return
}
if err = validate.validator.RegisterValidationCtx("telephone", validate.telephoneValidate); err != nil {

12
rest.go
View File

@ -552,9 +552,6 @@ func CloneSchemas(ctx context.Context, db *gorm.DB, domain string) (err error) {
models []*types.Schema
)
tx := db.WithContext(ctx)
if domain == "" {
domain = defaultDomain
}
if err = tx.Where("domain=?", defaultDomain).Find(&values).Error; err != nil {
return fmt.Errorf("schema not found")
}
@ -611,9 +608,6 @@ func GetSchemas(ctx context.Context, db *gorm.DB, domain, moduleName, tableName
// VisibleSchemas 获取某个场景下面的schema
func VisibleSchemas(ctx context.Context, db *gorm.DB, domain, moduleName, tableName, scenario string) ([]*types.Schema, error) {
if domain == "" {
domain = defaultDomain
}
schemas, err := GetSchemas(ctx, db, domain, moduleName, tableName)
if err != nil {
return nil, err
@ -635,11 +629,7 @@ func VisibleSchemas(ctx context.Context, db *gorm.DB, domain, moduleName, tableN
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 == "" {
tx.Model(model).Select(labelColumn, valueColumn).Scan(&result)
} else {
tx.Model(model).Select(labelColumn, valueColumn).Where("domain=?", domainName).Scan(&result)
}
tx.Model(model).Select(labelColumn, valueColumn).Where("domain=?", domainName).Scan(&result)
values = make([]*types.TypeValue, 0, len(result))
for _, pairs := range result {
feed := &types.TypeValue{}