Merge branch 'master' into v1.0.0

This commit is contained in:
wenjianzhang authored and GitHub committed 2020-05-12 23:59:13 +08:00
commit 221ee539cd
3 files changed
+11 -13

No files matched your search

-1
View File
@@ -139,4 +139,3 @@ func (e *DictData) BatchDelete(id []int) (Result bool, err error) {
Result = true Result = true
return return
} }
+5 -5
View File
@@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询参数列表 // 查询{{.ClassName}}列表
export function list{{.ClassName}}(query) { export function list{{.ClassName}}(query) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}List', url: '/api/v1/{{.ModuleName}}List',
@@ -9,7 +9,7 @@ params: query
}) })
} }
// 查询参数详细 // 查询{{.ClassName}}详细
export function get{{.ClassName}} ({{.PkJsonField}}) { export function get{{.ClassName}} ({{.PkJsonField}}) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}},
@@ -18,7 +18,7 @@ method: 'get'
} }
// 新增参数配置 // 新增{{.ClassName}}
export function add{{.ClassName}}(data) { export function add{{.ClassName}}(data) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}', url: '/api/v1/{{.ModuleName}}',
@@ -27,7 +27,7 @@ data: data
}) })
} }
// 修改参数配置 // 修改{{.ClassName}}
export function update{{.ClassName}}(data) { export function update{{.ClassName}}(data) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}', url: '/api/v1/{{.ModuleName}}',
@@ -36,7 +36,7 @@ data: data
}) })
} }
// 删除参数配置 // 删除{{.ClassName}}
export function del{{.ClassName}}({{.PkJsonField}}) { export function del{{.ClassName}}({{.PkJsonField}}) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}},
+6 -7
View File
@@ -35,8 +35,7 @@ func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) {
// 获取{{.ClassName}} // 获取{{.ClassName}}
func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) { func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) {
var doc {{.ClassName}} var doc {{.ClassName}}
table := orm.Eloquent.Table(e.TableName()) table := orm.Eloquent.Table(e.TableName())
{{ range .Columns -}} {{ range .Columns -}}
{{$z := .IsQuery}} {{$z := .IsQuery}}
@@ -45,12 +44,12 @@ func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) {
table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}}) table = table.Where("{{.ColumnName}} = ?", e.{{.GoField}})
} }
{{ end -}} {{ end -}}
{{ end }} {{ end }}
if err := table.First(&doc).Error; err != nil { if err := table.First(&doc).Error; err != nil {
return doc, err return doc, err
} }
return doc, nil return doc, nil
} }
// 获取{{.ClassName}}带分页 // 获取{{.ClassName}}带分页