Skip to content

Commit 5cc1350

Browse files
author
piexlMax(奇淼
committed
feat: 模板生成调整
1 parent 531fb48 commit 5cc1350

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

Diff for: ‎server/go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PU
167167
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
168168
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
169169
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
170-
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
171-
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
172170
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
173171
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
174172
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=

Diff for: ‎server/resource/package/web/view/table.vue.tpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ getDataSourceFunc()
9898
<div class="gva-search-box">
9999
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
100100
{{- if .GvaModel }}
101-
<el-form-item label="创建日期" prop="createdAt">
101+
<el-form-item label="创建日期" prop="CreatedAt">
102102
<template #label>
103103
<span>
104104
创建日期
@@ -155,7 +155,7 @@ getDataSourceFunc()
155155
>
156156
<el-table-column type="selection" width="55" />
157157
{{ if .GvaModel }}
158-
<el-table-column sortable align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
158+
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end }}width="180">
159159
<template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
160160
</el-table-column>
161161
{{ end }}
@@ -374,7 +374,7 @@ const rule = reactive({
374374
})
375375
376376
const searchRule = reactive({
377-
createdAt: [
377+
CreatedAt: [
378378
{ validator: (rule, value, callback) => {
379379
if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
380380
callback(new Error('请填写结束日期'))

Diff for: ‎server/resource/plugin/web/view/view.vue.tpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ getDataSourceFunc()
9797
<div class="gva-search-box">
9898
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
9999
{{- if .GvaModel }}
100-
<el-form-item label="创建日期" prop="createdAt">
100+
<el-form-item label="创建日期" prop="CreatedAt">
101101
<template #label>
102102
<span>
103103
创建日期
@@ -153,7 +153,7 @@ getDataSourceFunc()
153153
>
154154
<el-table-column type="selection" width="55" />
155155
{{ if .GvaModel }}
156-
<el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
156+
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end }}width="180">
157157
<template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
158158
</el-table-column>
159159
{{ end }}
@@ -370,7 +370,7 @@ const rule = reactive({
370370
})
371371
372372
const searchRule = reactive({
373-
createdAt: [
373+
CreatedAt: [
374374
{ validator: (rule, value, callback) => {
375375
if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
376376
callback(new Error('请填写结束日期'))

Diff for: ‎server/utils/autocode/template_funcs.go

+20-15
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func GetTemplateFuncMap() template.FuncMap {
2424
// 渲染Model中的字段
2525
func GenerateField(field systemReq.AutoCodeField) string {
2626
// 构建gorm标签
27-
gormTag := `gorm:"`
27+
gormTag := ``
2828

2929
if field.FieldIndexType != "" {
3030
gormTag += field.FieldIndexType + ";"
@@ -38,58 +38,63 @@ func GenerateField(field systemReq.AutoCodeField) string {
3838
gormTag += fmt.Sprintf("default:%s;", field.DefaultValue)
3939
}
4040

41+
if field.Comment != "" {
42+
gormTag += fmt.Sprintf("comment:%s;", field.Comment)
43+
}
44+
4145
gormTag += "column:" + field.ColumnName + ";"
4246

47+
requireTag := ` binding:"required"` + "`"
48+
4349
// 根据字段类型构建不同的字段定义
4450
var result string
4551
switch field.FieldType {
4652
case "enum":
47-
result = fmt.Sprintf(`%s string `+"`"+`json:"%s" form:"%s" %stype:enum(%s);comment:%s;"`+"`",
48-
field.FieldName, field.FieldJson, field.FieldJson, gormTag, field.DataTypeLong, field.Comment)
53+
result = fmt.Sprintf(`%s string `+"`"+`json:"%s" form:"%s" gorm:"%stype:enum(%s);"`+"`",
54+
field.FieldName, field.FieldJson, field.FieldJson, gormTag, field.DataTypeLong)
4955
case "picture", "video":
50-
tagContent := fmt.Sprintf(`json:"%s" form:"%s" %scomment:%s;`,
51-
field.FieldJson, field.FieldJson, gormTag, field.Comment)
56+
tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
57+
field.FieldJson, field.FieldJson, gormTag)
5258
if field.DataTypeLong != "" {
5359
tagContent += fmt.Sprintf("size:%s;", field.DataTypeLong)
5460
}
5561
result = fmt.Sprintf(`%s string `+"`"+`%s`+"`"+``, field.FieldName, tagContent)
5662
case "file", "pictures", "array":
57-
tagContent := fmt.Sprintf(`json:"%s" form:"%s" %scomment:%s;`,
58-
field.FieldJson, field.FieldJson, gormTag, field.Comment)
63+
tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
64+
field.FieldJson, field.FieldJson, gormTag)
5965
if field.DataTypeLong != "" {
6066
tagContent += fmt.Sprintf("size:%s;", field.DataTypeLong)
6167
}
6268
result = fmt.Sprintf(`%s datatypes.JSON `+"`"+`%s swaggertype:"array,object"`+"`"+``,
6369
field.FieldName, tagContent)
6470
case "richtext":
65-
tagContent := fmt.Sprintf(`json:"%s" form:"%s" %scomment:%s;`,
66-
field.FieldJson, field.FieldJson, gormTag, field.Comment)
71+
tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
72+
field.FieldJson, field.FieldJson, gormTag)
6773
if field.DataTypeLong != "" {
6874
tagContent += fmt.Sprintf("size:%s;", field.DataTypeLong)
6975
}
7076
result = fmt.Sprintf(`%s *string `+"`"+`%stype:text;"`+"`"+``,
7177
field.FieldName, tagContent)
7278
case "json":
73-
tagContent := fmt.Sprintf(`json:"%s" form:"%s" %scomment:%s;`,
74-
field.FieldJson, field.FieldJson, gormTag, field.Comment)
79+
tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
80+
field.FieldJson, field.FieldJson, gormTag)
7581
if field.DataTypeLong != "" {
7682
tagContent += fmt.Sprintf("size:%s;", field.DataTypeLong)
7783
}
7884
result = fmt.Sprintf(`%s datatypes.JSON `+"`"+`%s swaggertype:"object"`+"`"+``,
7985
field.FieldName, tagContent)
8086
default:
81-
tagContent := fmt.Sprintf(`json:"%s" form:"%s" %scomment:%s;`,
82-
field.FieldJson, field.FieldJson, gormTag, field.Comment)
87+
tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
88+
field.FieldJson, field.FieldJson, gormTag)
8389
if field.DataTypeLong != "" {
8490
tagContent += fmt.Sprintf("size:%s;", field.DataTypeLong)
8591
}
8692
result = fmt.Sprintf(`%s *%s `+"`"+`%s`+"`"+``,
8793
field.FieldName, field.FieldType, tagContent)
8894
}
8995

90-
// 添加验证标签
9196
if field.Require {
92-
result = strings.Replace(result, "`"+``, "`"+` binding:"required"`+"`"+``, 1)
97+
result = result[0:len(result)-1] + requireTag
9398
}
9499

95100
// 添加字段描述

0 commit comments

Comments
 (0)