diff --git a/server/model/sys_auto_code.go b/server/model/sys_auto_code.go
index a4dc3e93c..399d82d0a 100644
--- a/server/model/sys_auto_code.go
+++ b/server/model/sys_auto_code.go
@@ -21,4 +21,5 @@ type Field struct {
Comment string `json:"comment"`
ColumnName string `json:"columnName"`
FieldSearchType string `json:"fieldSearchType"`
+ DictType string `json:"dictType"`
}
diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/fe/table.vue.tpl
index 9c026c621..9a3c5a18d 100644
--- a/server/resource/template/fe/table.vue.tpl
+++ b/server/resource/template/fe/table.vue.tpl
@@ -52,7 +52,14 @@
{{ "{{scope.row.CreatedAt|formatDate}}" }}
- {{range .Fields}} {{- if eq .FieldType "bool" }}
+ {{range .Fields}}
+ {{- if .DictType}}
+
+
+ {{"{{"}}filterDict(scope.row.{{.FieldJson}},"{{.DictType}}"){{"}}"}}
+
+
+ {{- else if eq .FieldType "bool" }}
{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}
{{- else }}
@@ -117,6 +124,11 @@ export default {
type: "",
deleteVisible: false,
multipleSelection: [],
+ {{- range .Fields}}
+ {{- if .DictType }}
+ {{.DictType}}Options:[],
+ {{ end -}}
+ {{end -}}
formData: {
{{range .Fields}}{{.FieldJson}}:null,{{ end }}
}
@@ -222,9 +234,14 @@ export default {
this.dialogFormVisible = true;
}
},
- created() {
- this.getTableData();
- }
+ async created() {
+ await this.getTableData();
+ {{- range .Fields -}}
+ {{- if .DictType -}}
+ await this.getDict("{{.DictType}}")
+ {{- end -}}
+ {{- end -}}
+}
};
diff --git a/server/resource/template/te/service.go.tpl b/server/resource/template/te/service.go.tpl
index b84d4d16a..cf0f807d8 100644
--- a/server/resource/template/te/service.go.tpl
+++ b/server/resource/template/te/service.go.tpl
@@ -63,7 +63,7 @@ func Get{{.StructName}}(id uint) (err error, {{.Abbreviation}} model.{{.StructNa
}
// @title Get{{.StructName}}InfoList
-// @description get {{.StructName}} list by pagination, 分页获取用户列表
+// @description get {{.StructName}} list by pagination, 分页获取{{.StructName}}
// @auth (2020/04/05 20:22)
// @param info PageInfo
// @return error
@@ -79,23 +79,23 @@ func Get{{.StructName}}InfoList(info request.{{.StructName}}Search) (err error,
{{- if .FieldSearchType}}
{{- if eq .FieldType "string" }}
if info.{{.FieldName}} != "" {
- db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ db = db.Where("`{{.ColumnName}}` {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
}
{{- else if eq .FieldType "bool" }}
if info.{{.FieldName}} != nil {
- db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ db = db.Where("`{{.ColumnName}}` {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
}
{{- else if eq .FieldType "int" }}
if info.{{.FieldName}} != 0 {
- db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ db = db.Where("`{{.ColumnName}}` {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
}
{{- else if eq .FieldType "float64" }}
if info.{{.FieldName}} != 0 {
- db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ db = db.Where("`{{.ColumnName}}` {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
}
{{- else if eq .FieldType "time.Time" }}
if !info.{{.FieldName}}.IsZero() {
- db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ db = db.Where("`{{.ColumnName}}` {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
}
{{- end }}
{{- end }}