Merge branch 'dev' of github.com:wenjianzhang/go-admin into table/dev

 Conflicts:
	template/v2/dto.go.template
	template/v2/model.go.template
This commit is contained in:
linwenxiang committed 2020-09-14 20:06:35 +08:00
commit ca4ed89536
15 files changed
+61 -48

No files matched your search

+12 -3
View File
@@ -2,10 +2,11 @@ package dto
import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/common/dto"
common "go-admin/common/models"
"gorm.io/gorm"
)
type {{.ClassName}}Search struct {
@@ -49,6 +50,10 @@ type {{.ClassName}}Control struct {
{{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}}
{{- else if eq .GoField "CreateBy" }}
{{.GoField}} uint `json:"{{.JsonField}}"` // {{.ColumnComment}}
{{- else if eq .GoField "UpdateBy" }}
{{- else if eq .GoField "CreateBy" -}}
{{.GoField}} uint `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
@@ -56,6 +61,9 @@ type {{.ClassName}}Control struct {
{{.GoField}} uint `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
{{- else }}
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}"` // {{.ColumnComment}}
{{end -}}
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{end -}}
{{- end }}
}
@@ -74,7 +82,7 @@ func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) {
{{ range .Columns -}}
{{$x := .Pk}}
{{- if ($x) }}
Model: gorm.Model{ID: s.Id},
Model: gorm.Model{ID: s.ID},
{{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}}
@@ -83,7 +91,8 @@ func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) {
CreateBy: s.CreateBy,
UpdateBy: s.UpdateBy,
},
{{- else if eq .GoField "UpdateBy" -}}
{{- else if eq .GoField "UpdateBy" -}}
{{- else }}
{{.GoField}}: s.{{.GoField}},
{{- end }}
+3 -2
View File
@@ -1,6 +1,8 @@
package models
import (
"gorm.io/gorm"
{{- if eq .IsActions 2 -}}
"go-admin/common/dto"
@@ -8,7 +10,6 @@ import (
orm "go-admin/common/global"
{{ end }}
"go-admin/common/models"
"gorm.io/gorm"
)
type {{.ClassName}} struct {
@@ -40,7 +41,7 @@ func (e *{{.ClassName}}) Generate() models.ActiveRecord {
}
func (e *{{.ClassName}}) GetId() interface{} {
return e.ID
return e.{{.PkGoField}}
}
func (e *{{.ClassName}}) SetCreateBy(createBy uint) {