From 16ef5c843a15f6b096226db0aa42df0d6d9494cd Mon Sep 17 00:00:00 2001 From: likun <906102152@qq.com> Date: Mon, 9 Jun 2025 16:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=E6=8F=90=E7=A4=BA=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/apps/game/domain/entity/utils.go | 1 + admin/apps/game/model/globalmail.go | 4 ++-- admin/apps/game/model/notice.go | 6 +++--- admin/apps/game/model/rolemail.go | 4 ++-- admin/internal/model/dto/common.go | 1 + ui/src/components/restful/table.vue | 24 ++++++++++++++++++++---- ui/src/components/user/history.vue | 12 ++++++------ 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/admin/apps/game/domain/entity/utils.go b/admin/apps/game/domain/entity/utils.go index da47be5..bf80239 100644 --- a/admin/apps/game/domain/entity/utils.go +++ b/admin/apps/game/domain/entity/utils.go @@ -60,6 +60,7 @@ func getFieldTypeDtoDescInfo(project *Project, poValue reflect.Value, fieldType Choices: make([]*dto.CommonDtoFieldChoice, 0), MultiChoice: fieldType.Tag.Get("multi_choice") == "true", Uneditable: fieldType.Tag.Get("uneditable") == "true", + BigColumn: fieldType.Tag.Get("big_column") == "true", Where: fieldType.Tag.Get("where"), } diff --git a/admin/apps/game/model/globalmail.go b/admin/apps/game/model/globalmail.go index c4956b2..3bb8826 100644 --- a/admin/apps/game/model/globalmail.go +++ b/admin/apps/game/model/globalmail.go @@ -15,8 +15,8 @@ type GlobalMail struct { ID int `gorm:"primarykey" readonly:"true"` ProjectId int `gorm:"index:idx_project_id"` ServerIDs []string `gorm:"type:json;serializer:json" desc:"不选就是默认所有区服" name:"区服" type:"[]string" choices:"GetChoiceServers" multi_choice:"true"` - Title string `name:"邮件标题" required:"true"` - Content string `name:"邮件内容" required:"true"` + Title string `name:"邮件标题" required:"true" big_column:"true"` + Content string `name:"邮件内容" required:"true" big_column:"true"` DelayInvokeCreateHook sql.NullTime `name:"邮件定时发送时间" desc:"不填或者无效就立即发送"` ExpireAt sql.NullTime `name:"邮件到期时间" desc:"不填就是永久有效"` CreateRoleTimeBefore sql.NullTime `name:"创角时间" desc:"在这时间之前创建的角色才能收到邮件，不填就是都生效"` diff --git a/admin/apps/game/model/notice.go b/admin/apps/game/model/notice.go index 2f0b4e8..8040bb5 100644 --- a/admin/apps/game/model/notice.go +++ b/admin/apps/game/model/notice.go @@ -14,9 +14,9 @@ type Notice struct { ID int `gorm:"primarykey" readonly:"true"` ProjectId int `gorm:"index:idx_project_id"` //ServerIDs []string `gorm:"type:json;serializer:json" name:"公告生效服务器" desc:"为空表示所有服" choices:"GetChoiceServers"` - Mod string `name:"公告分栏标题" desc:"显示到公告弹窗左边的分栏标题" required:"true"` // 左边分栏标题 - Title string `name:"公告标题" desc:"显示到公告内容区里的标题" required:"true"` // 公告内容上面的标题 - Content string `name:"公告内容" desc:"仅支持颜色标签和\\n换行标签" type:"text" required:"true"` // 公告内容 + Mod string `name:"公告分栏标题" desc:"显示到公告弹窗左边的分栏标题" required:"true"` // 左边分栏标题 + Title string `name:"公告标题" desc:"显示到公告内容区里的标题" required:"true" big_column:"true"` // 公告内容上面的标题 + Content string `name:"公告内容" desc:"仅支持颜色标签和\\n换行标签" type:"text" required:"true" big_column:"true"` // 公告内容 //StartAt time.Time `name:"开始时间" required:"true"` //EndAt time.Time `name:"结束时间" required:"true"` Status bool `name:"是否启用" desc:"启用的公告才会导出到cdn被客户端显示" type:"tagStatus" choices:"GetStatusChoices" required:"true"` diff --git a/admin/apps/game/model/rolemail.go b/admin/apps/game/model/rolemail.go index 1d5b7c8..714423b 100644 --- a/admin/apps/game/model/rolemail.go +++ b/admin/apps/game/model/rolemail.go @@ -22,8 +22,8 @@ type RoleMail struct { ProjectId int `gorm:"index:idx_project_id"` ServerID string `name:"所属区服" choices:"GetChoiceServers" required:"true" where:"eq"` RoleIDs []string `gorm:"type:json;serializer:json" name:"生效的角色id" desc:"生效的角色id，逗号分隔多个" required:"true"` - Title string `name:"邮件标题" required:"true"` - Content string `name:"邮件内容" required:"true"` + Title string `name:"邮件标题" required:"true" big_column:"true"` + Content string `name:"邮件内容" required:"true" big_column:"true"` Attach []*MailAttachItem `gorm:"type:json;serializer:json" name:"邮件附件" type:"items" desc:"搜索道具并点击添加"` CreatedAt time.Time `readonly:"true" where:"range"` diff --git a/admin/internal/model/dto/common.go b/admin/internal/model/dto/common.go index 7b19144..4065fb4 100644 --- a/admin/internal/model/dto/common.go +++ b/admin/internal/model/dto/common.go @@ -26,6 +26,7 @@ type CommonDtoFieldDesc struct { Choices []*CommonDtoFieldChoice `json:"choices"` // 可选项，用于字段做下拉框 MultiChoice bool `json:"multi_choice"` // 是否多选 Uneditable bool `json:"uneditable"` // 不可编辑，某些数据一旦新增之后不能修改，例如封禁的值、服务器的id等 + BigColumn bool `json:"big_column"` // 大列，表示内容很长，需要省略 Where string `json:"where"` // sql list的where条件，用于表格页面查询条件编写，值：eq gt lt ge lt range like } diff --git a/ui/src/components/restful/table.vue b/ui/src/components/restful/table.vue index 2f32ff2..77074fc 100644 --- a/ui/src/components/restful/table.vue +++ b/ui/src/components/restful/table.vue @@ -596,7 +596,8 @@ const handlePaginationCurChange = (val) => { - + :show-overflow-tooltip="{effect:'light',placement:'top'}" + v-else-if="(fieldDescInfo.big_column)"> + + + +