From 417d0671de0a2eb95bed4fb04f7eb93eb5831e50 Mon Sep 17 00:00:00 2001 From: kenneth <1185230223@qq.com> Date: Tue, 17 Jun 2025 11:53:31 +0800 Subject: [PATCH] upload --- .../erpserver/handler/system/audit/audit.go | 9 +- .../erpserver/handler/system/config/config.go | 9 +- .../handler/system/department/department.go | 9 +- .../handler/system/loginlog/login_log.go | 9 +- .../erpserver/handler/system/menu/menu.go | 9 +- .../erpserver/handler/system/role/role.go | 9 +- .../erpserver/handler/system/user/user.go | 11 +- .../erpserver/templ/system/user/edit.templ | 2 +- .../erpserver/templ/system/user/edit_templ.go | 125 ++++++++++-------- internal/pkg/render/respond.go | 9 ++ 10 files changed, 87 insertions(+), 114 deletions(-) diff --git a/internal/erpserver/handler/system/audit/audit.go b/internal/erpserver/handler/system/audit/audit.go index 58be2de..ee1f45a 100644 --- a/internal/erpserver/handler/system/audit/audit.go +++ b/internal/erpserver/handler/system/audit/audit.go @@ -39,14 +39,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/handler/system/config/config.go b/internal/erpserver/handler/system/config/config.go index 20d97a8..0ea620e 100644 --- a/internal/erpserver/handler/system/config/config.go +++ b/internal/erpserver/handler/system/config/config.go @@ -44,14 +44,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method not allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/handler/system/department/department.go b/internal/erpserver/handler/system/department/department.go index 43d7e87..3bec746 100644 --- a/internal/erpserver/handler/system/department/department.go +++ b/internal/erpserver/handler/system/department/department.go @@ -44,14 +44,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/handler/system/loginlog/login_log.go b/internal/erpserver/handler/system/loginlog/login_log.go index b271103..b3976e8 100644 --- a/internal/erpserver/handler/system/loginlog/login_log.go +++ b/internal/erpserver/handler/system/loginlog/login_log.go @@ -38,14 +38,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/handler/system/menu/menu.go b/internal/erpserver/handler/system/menu/menu.go index a746635..ea0c64d 100644 --- a/internal/erpserver/handler/system/menu/menu.go +++ b/internal/erpserver/handler/system/menu/menu.go @@ -54,14 +54,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: 0, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(0, res)) default: a.render.JSONErr(w, "method not allowed") } diff --git a/internal/erpserver/handler/system/role/role.go b/internal/erpserver/handler/system/role/role.go index dcbc5ab..eb94478 100644 --- a/internal/erpserver/handler/system/role/role.go +++ b/internal/erpserver/handler/system/role/role.go @@ -48,14 +48,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/handler/system/user/user.go b/internal/erpserver/handler/system/user/user.go index 09c6c66..2a203a2 100644 --- a/internal/erpserver/handler/system/user/user.go +++ b/internal/erpserver/handler/system/user/user.go @@ -56,8 +56,8 @@ func (a *app) edit(w http.ResponseWriter, r *http.Request) { vm := &systemmodel.User{} if id > 0 { if u, err := a.userService.Get(ctx, id); err == nil { - vm.HashedPassword = []byte("********") vm = u + vm.HashedPassword = []byte("********") } } a.render.Render(ctx, w, user.Edit(ctx, vm)) @@ -122,14 +122,7 @@ func (a *app) list(w http.ResponseWriter, r *http.Request) { a.render.JSONErr(w, err.Error()) return } - - data := render.ResponseList{ - Code: 0, - Message: "ok", - Count: count, - Data: res, - } - a.render.JSON(w, data) + a.render.JSON(w, render.NewResponseList(count, res)) default: http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) } diff --git a/internal/erpserver/templ/system/user/edit.templ b/internal/erpserver/templ/system/user/edit.templ index 832a06e..74a0a22 100644 --- a/internal/erpserver/templ/system/user/edit.templ +++ b/internal/erpserver/templ/system/user/edit.templ @@ -72,7 +72,7 @@ templ Edit(ctx context.Context, item *system.User) {
diff --git a/internal/erpserver/templ/system/user/edit_templ.go b/internal/erpserver/templ/system/user/edit_templ.go index 1c60e68..c33069b 100644 --- a/internal/erpserver/templ/system/user/edit_templ.go +++ b/internal/erpserver/templ/system/user/edit_templ.go @@ -151,7 +151,20 @@ func Edit(ctx context.Context, item *system.User) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\" lay-verify=\"required\" autocomplete=\"off\" placeholder=\"请输入用户名\" class=\"layui-input\">
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\" lay-verify=\"required\" autocomplete=\"off\" placeholder=\"请输入用户名\" class=\"layui-input\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -159,78 +172,78 @@ func Edit(ctx context.Context, item *system.User) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if item.Gender == 0 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else if item.Gender == 1 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else if item.Gender == 2 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if item.ID > 0 { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "
创建时间
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(item.CreatedAt.Format(time.DateTime)) - if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/erpserver/templ/system/user/edit.templ`, Line: 133, Col: 78} - } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
更新时间
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "
创建时间
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(item.UpdatedAt.Format(time.DateTime)) + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(item.CreatedAt.Format(time.DateTime)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/erpserver/templ/system/user/edit.templ`, Line: 139, Col: 78} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/erpserver/templ/system/user/edit.templ`, Line: 133, Col: 78} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "
更新时间
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var10 string + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(item.UpdatedAt.Format(time.DateTime)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/erpserver/templ/system/user/edit.templ`, Line: 139, Col: 78} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -238,7 +251,7 @@ func Edit(ctx context.Context, item *system.User) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -268,12 +281,12 @@ func editCss() templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var10 := templ.GetChildren(ctx) - if templ_7745c5c3_Var10 == nil { - templ_7745c5c3_Var10 = templ.NopComponent + templ_7745c5c3_Var11 := templ.GetChildren(ctx) + if templ_7745c5c3_Var11 == nil { + templ_7745c5c3_Var11 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -297,61 +310,61 @@ func editJs(ctx context.Context, item *system.User) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var11 := templ.GetChildren(ctx) - if templ_7745c5c3_Var11 == nil { - templ_7745c5c3_Var11 = templ.NopComponent + templ_7745c5c3_Var12 := templ.GetChildren(ctx) + if templ_7745c5c3_Var12 == nil { + templ_7745c5c3_Var12 = templ.NopComponent } ctx = templ.ClearChildren(ctx) token := mid.GetCsrfToken(ctx) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "' },\n success: function (res) {\n xmSelect.render({\n el: '#roleTree',\n // 工具栏\n toolbar: {\n show: true\n },\n radio: true,\n clickClose: true,\n tips: '请选择角色',\n filterable: true,\n data: res,\n name: 'role_id',\n initValue: ['") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Var16, templ_7745c5c3_Err := templruntime.ScriptContentInsideStringLiteral(item.RoleID) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/erpserver/templ/system/user/edit.templ`, Line: 270, Col: 55} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "'],\n tree: {\n show: true,\n //非严格模式\n strict: false,\n //默认展开节点的数组, 为 true 时, 展开所有节点\n expandedKeys: [1],\n },\n on: function (data) { },\n });\n },\n error: function (err) {\n // 处理请求错误\n console.log('请求出错：', err);\n }\n });\n }\n });\n ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/internal/pkg/render/respond.go b/internal/pkg/render/respond.go index 578bffe..0bc4a3b 100644 --- a/internal/pkg/render/respond.go +++ b/internal/pkg/render/respond.go @@ -78,6 +78,15 @@ type ResponseList struct { Data any `json:"data"` } +func NewResponseList(count int64, data any) ResponseList { + return ResponseList{ + Code: 0, + Message: "OK", + Count: count, + Data: data, + } +} + func respond(w http.ResponseWriter, data any) { v, err := json.Marshal(data) if err != nil {