From 16be92e149dca95c1c506a2f51151489f8334be7 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 6 Feb 2022 15:52:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8=EF=BC=9A=E6=94=AF=E6=8C=81?= =?UTF-8?q?antd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/antd_api/api.go | 7 +++++-- sdk/antd_api/binding.go | 0 sdk/pkg/response/antd/model.go | 15 ++++++++++++++- sdk/pkg/response/antd/return.go | 15 ++++++++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) mode change 100644 => 100755 sdk/antd_api/api.go mode change 100644 => 100755 sdk/antd_api/binding.go mode change 100644 => 100755 sdk/pkg/response/antd/model.go mode change 100644 => 100755 sdk/pkg/response/antd/return.go diff --git a/sdk/antd_api/api.go b/sdk/antd_api/api.go old mode 100644 new mode 100755 index ac31c046..c6006660 --- a/sdk/antd_api/api.go +++ b/sdk/antd_api/api.go @@ -57,6 +57,10 @@ func (e *Api) PageOK( result interface{}, total int, current int, pageSize int) antd.PageOK(e.Context, result, total, current, pageSize) } +func (e *Api) ListOK( result interface{}, total int, current int, pageSize int) { + antd.ListOK(e.Context, result, total, current, pageSize) +} + // Custom 兼容函数 func (e *Api) Custom( data gin.H) { antd.Custum(e.Context, data) @@ -133,5 +137,4 @@ func (e *Api) AddError(err error) { func (e Api) Translate(form, to interface{}) { pkg.Translate(form, to) -} - +} \ No newline at end of file diff --git a/sdk/antd_api/binding.go b/sdk/antd_api/binding.go old mode 100644 new mode 100755 diff --git a/sdk/pkg/response/antd/model.go b/sdk/pkg/response/antd/model.go old mode 100644 new mode 100755 index a3297a0a..e2c8b51f --- a/sdk/pkg/response/antd/model.go +++ b/sdk/pkg/response/antd/model.go @@ -40,6 +40,19 @@ type pages struct { Data interface{} `json:"data,omitempty"` } +type lists struct { + Response + ListData ListData `json:"data,omitempty"` // response data +} + + +type ListData struct { + List interface{} `json:"list,omitempty"` // response data + Total int `json:"total,omitempty"` + Current int `json:"current,omitempty"` + PageSize int `json:"pageSize,omitempty"` +} + func (e *response) SetCode(code int32) { switch code { case 200, 0: @@ -66,4 +79,4 @@ func (e *response) SetSuccess(success bool) { func (e response) Clone() resp.Responses { return &e -} +} \ No newline at end of file diff --git a/sdk/pkg/response/antd/return.go b/sdk/pkg/response/antd/return.go old mode 100644 new mode 100755 index f0fe2b6b..7cad5182 --- a/sdk/pkg/response/antd/return.go +++ b/sdk/pkg/response/antd/return.go @@ -48,9 +48,22 @@ func PageOK(c *gin.Context, result interface{}, total int, current int, pageSize c.AbortWithStatusJSON(http.StatusOK, res) } +func ListOK(c *gin.Context, result interface{}, total int, current int, pageSize int) { + var res lists + res.ListData.List = result + res.ListData.Total = total + res.ListData.Current = current + res.ListData.PageSize = pageSize + res.Success = true + res.TraceId = pkg.GenerateMsgIDFromContext(c) + c.Set("result", res) + c.Set("status", http.StatusOK) + c.AbortWithStatusJSON(http.StatusOK, res) +} + // Custum 兼容函数 func Custum(c *gin.Context, data gin.H) { data["traceId"] = pkg.GenerateMsgIDFromContext(c) c.Set("result", data) c.AbortWithStatusJSON(http.StatusOK, data) -} +} \ No newline at end of file