From 2eb78f86df58e5448f97cd2df424f122ed18f170 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 7 Apr 2023 15:26:48 +0800 Subject: [PATCH 1/4] [fix] command start load the studio scripts --- cmd/start.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/start.go b/cmd/start.go index 18e44098..c56ed729 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -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) } }() From 12552d5b69307a29d9e88ea3a4b73cd589f490c3 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 7 Apr 2023 15:38:47 +0800 Subject: [PATCH 2/4] [fix] studio server error --- studio/router.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/studio/router.go b/studio/router.go index 88524ef6..6d6d55ae 100644 --- a/studio/router.go +++ b/studio/router.go @@ -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 { From b868ae3f5fbfe7bea752431218a3b7e84daf52b7 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 7 Apr 2023 16:38:57 +0800 Subject: [PATCH 3/4] [fix] table bind model bug --- engine/load.go | 2 +- widgets/table/table.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/load.go b/engine/load.go index 18e17e06..b6a2fabe 100644 --- a/engine/load.go +++ b/engine/load.go @@ -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) } } diff --git a/widgets/table/table.go b/widgets/table/table.go index d751a13f..f95683e7 100644 --- a/widgets/table/table.go +++ b/widgets/table/table.go @@ -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 / ... From 8ffb843495a042f3c818371f92b19cbb1446da09 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 7 Apr 2023 16:45:04 +0800 Subject: [PATCH 4/4] [fmt] _ --- studio/router.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/router.go b/studio/router.go index 6d6d55ae..1eab4765 100644 --- a/studio/router.go +++ b/studio/router.go @@ -214,7 +214,7 @@ func setRouter(router *gin.Engine) { throw(c, 500, err.Error()) return } - + res, err := ctx.Call(fun.Method, fun.Args...) if err != nil {