From 0a83445289e2b48da4c4de58d73a5ec23d9c5557 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Mon, 21 Sep 2020 09:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.MD                                    | 14 ++++++++++++++
 app/model/admin/model_fields/model_fields.go | 10 ++++++----
 app/service/admin/model_service/field.go     |  2 ++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 91aa99b..fe43282 100644
--- a/README.MD
+++ b/README.MD
@@ -84,6 +84,20 @@ go run main.go 直接访问http://localhost:8200
     </tr>
 </table>
 
+## 感谢(排名不分先后)
+> gf框架 [https://github.com/gogf/gf](https://github.com/gogf/gf) 
+>
+> RuoYi-Vue [https://gitee.com/y_project/RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
+>
+> swaggo [https://github.com/swaggo/swag](https://github.com/swaggo/swag)
+>
+>tpflow [https://gitee.com/ntdgg/tpflow](https://gitee.com/ntdgg/tpflow)
+>
+>gtoken [https://github.com/goflyfox/gtoken](https://github.com/goflyfox/gtoken)
+>
+>casbin [https://github.com/casbin/casbin](https://github.com/casbin/casbin)
+>
+>云捷go [https://gitee.com/yunjieg/yjgo](https://gitee.com/yunjieg/yjgo)
 ## 交流QQ群  
 
 > <img src="https://gitee.com/tiger1103/gfast/raw/master/public/qqcode.png"/>  
diff --git a/app/model/admin/model_fields/model_fields.go b/app/model/admin/model_fields/model_fields.go
index 39a509f..d652a9a 100644
--- a/app/model/admin/model_fields/model_fields.go
+++ b/app/model/admin/model_fields/model_fields.go
@@ -26,7 +26,7 @@ type AddReq struct {
 	FieldRules   []string `p:"fieldRules" `
 	CreateBy     uint64
 	FieldWidth   string `p:"fieldWidth"`
-	fieldAlign   string `p:"fieldAlign"`
+	FieldAlign   string `p:"fieldAlign"`
 }
 
 // EditReq 用于存储修改请求参数
@@ -43,7 +43,7 @@ type EditReq struct {
 	FieldRules   []string `p:"fieldRules" `
 	UpdateBy     uint64
 	FieldWidth   string `p:"fieldWidth"`
-	fieldAlign   string `p:"fieldAlign"`
+	FieldAlign   string `p:"fieldAlign"`
 }
 
 type RemoveReq struct {
@@ -66,6 +66,8 @@ type FieldInfo struct {
 	UpdateBy     uint64 `p:"update_by"        json:"update_by"`     // 修改人
 	CreateTime   uint64 `p:"create_time"      json:"create_time"`   // 创建时间
 	UpdateTime   uint64 `p:"update_time"      json:"update_time"`   // 修改时间
+	FieldWidth   string `p:"field_width"      json:"field_width"`   //字段列表宽度
+	FieldAlign   string `p:"field_align"     json:"field_align"`    //字段对齐方式
 	ModelEdit    string `p:"model_edit" json:"model_edit"`
 	ModelIndexes string `p:"model_indexes" json:"model_indexes"`
 	ModelList    string `p:"model_list" json:"model_list"`
@@ -121,7 +123,7 @@ func AddSave(req *AddReq) error {
 	entity.CreateBy = req.CreateBy
 	entity.FieldSort = 1000
 	entity.FieldWidth = req.FieldWidth
-	entity.FieldAlign = req.fieldAlign
+	entity.FieldAlign = req.FieldAlign
 	time := gconv.Uint64(gtime.Timestamp())
 	entity.CreateTime = time
 	entity.UpdateTime = time
@@ -184,7 +186,7 @@ func EditSave(req *EditReq) error {
 	entity.UpdateBy = req.UpdateBy
 	entity.UpdateTime = gconv.Uint64(gtime.Timestamp())
 	entity.FieldWidth = req.FieldWidth
-	entity.FieldAlign = req.fieldAlign
+	entity.FieldAlign = req.FieldAlign
 	_, err = entity.Update()
 	if err != nil {
 		g.Log().Error(err)
diff --git a/app/service/admin/model_service/field.go b/app/service/admin/model_service/field.go
index e34bf43..96bc516 100644
--- a/app/service/admin/model_service/field.go
+++ b/app/service/admin/model_service/field.go
@@ -56,6 +56,8 @@ func SelectFieldsAll(req *model_fields.SelectPageReq) (list []*model_fields.Fiel
 		fInfo.FieldType = field.FieldType
 		fInfo.FieldRules = field.FieldRules
 		fInfo.FieldDefault = field.FieldDefault
+		fInfo.FieldWidth = field.FieldWidth
+		fInfo.FieldAlign = field.FieldAlign
 		if gstr.ContainsI(modelInfo.SearchList, field.FieldName) {
 			//列表查询
 			fInfo.SearchList = "1"