diff --git a/server/internal/library/hggen/views/curd.go b/server/internal/library/hggen/views/curd.go index d1f1607..20702d8 100644 --- a/server/internal/library/hggen/views/curd.go +++ b/server/internal/library/hggen/views/curd.go @@ -186,9 +186,17 @@ func (l *gCurd) loadView(ctx context.Context, in *CurdPreviewInput) (err error) importInput := gstr.Replace(temp.InputPath, "./", modName+"/") importController := gstr.Replace(temp.ControllerPath, "./", modName+"/") importService := "hotgo/internal/service" + importDao := "hotgo/internal/dao" + importEntity := "hotgo/internal/model/entity" if temp.IsAddon { importService = "hotgo/addons/" + in.In.AddonName + "/service" } + if temp.IsAddon { + importDao = "hotgo/addons/" + in.In.AddonName + "/dao" + } + if temp.IsAddon { + importEntity = "hotgo/addons/" + in.In.AddonName + "/model/entity" + } importWebApi := "@/api/" + gstr.LcFirst(in.In.VarName) if temp.IsAddon { @@ -221,6 +229,8 @@ func (l *gCurd) loadView(ctx context.Context, in *CurdPreviewInput) (err error) "importWebApi": importWebApi, // 导入webApi "apiPrefix": in.options.ApiPrefix, // api前缀 "componentPrefix": componentPrefix, // vue子组件前缀 + "importDao": importDao, // vue子组件前缀 + "importEntity": importEntity, // vue子组件前缀 }) in.view = view diff --git a/server/resource/generate/default/curd/input.go.template b/server/resource/generate/default/curd/input.go.template index 33fe824..ffc56b9 100644 --- a/server/resource/generate/default/curd/input.go.template +++ b/server/resource/generate/default/curd/input.go.template @@ -15,8 +15,8 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gtime" "hotgo/internal/consts" - "hotgo/internal/model/entity" - "hotgo/internal/model/input/form" + "@{.importEntity}" + "@{.importInput}" "hotgo/utility/validate" ) @{ if eq .options.Step.HasEdit true } diff --git a/server/resource/generate/default/curd/logic.go.template b/server/resource/generate/default/curd/logic.go.template index 9bad69a..709174e 100644 --- a/server/resource/generate/default/curd/logic.go.template +++ b/server/resource/generate/default/curd/logic.go.template @@ -16,13 +16,13 @@ import ( "github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/util/gconv" - "hotgo/internal/dao" "hotgo/internal/library/contexts" "hotgo/internal/library/hgorm" "hotgo/internal/library/hgorm/handler" - "@{.importInput}" "hotgo/internal/model/input/form" "@{.importService}" + "@{.importDao}" + "@{.importInput}" "hotgo/utility/convert" "hotgo/utility/excel" "hotgo/utility/validate" diff --git a/web/src/views/develop/code/components/BaseInfo.vue b/web/src/views/develop/code/components/BaseInfo.vue index bc924ed..90a317e 100644 --- a/web/src/views/develop/code/components/BaseInfo.vue +++ b/web/src/views/develop/code/components/BaseInfo.vue @@ -10,7 +10,7 @@ > - + - + + + + + + + + + + + +