Merge pull request #354 from trheyi/main

[fix] table bind model bug
This commit is contained in:
Max 2023-04-07 16:55:14 +08:00 committed by GitHub
commit d09473a2da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions

View file

@ -119,9 +119,16 @@ var startCmd = &cobra.Command{
// Start Studio Server
go func() {
err = studio.Load(config.Conf)
if err != nil {
fmt.Println(color.RedString(L("Studio Load: %s"), err.Error()))
os.Exit(2)
}
err := studio.Start(config.Conf)
if err != nil {
fmt.Println(color.RedString(L("Studio: %s"), err.Error()))
fmt.Println(color.RedString(L("Studio Start: %s"), err.Error()))
os.Exit(2)
}
}()

View file

@ -278,7 +278,7 @@ func loadApp(root string) error {
func printErr(mode, widget string, err error) {
message := fmt.Sprintf("[%s] %s", widget, err.Error())
if !strings.Contains(message, "does not exists") && mode == "development" {
if !strings.Contains(message, "does not exists") && !strings.Contains(message, "no such file or directory") && mode == "development" {
color.Red(message)
}
}

View file

@ -212,7 +212,9 @@ func setRouter(router *gin.Engine) {
ctx, err := script.NewContext(fmt.Sprintf("%v", sid), nil)
if err != nil {
throw(c, 500, err.Error())
return
}
res, err := ctx.Call(fun.Method, fun.Args...)
if err != nil {

View file

@ -188,7 +188,12 @@ func (dsl *DSL) parse(id string, root string) error {
}
if dsl.Fields == nil {
dsl.Fields = &FieldsDSL{}
dsl.Fields = &FieldsDSL{
Table: field.Columns{},
Filter: field.Filters{},
filterMap: map[string]field.FilterDSL{},
tableMap: map[string]field.ColumnDSL{},
}
}
// Bind model / store / table / ...