From 6bdc7a836bab8271256199c0e93f0d67af8d3fdf Mon Sep 17 00:00:00 2001 From: yxh Date: Tue, 11 Jul 2023 22:30:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=EF=BC=8C=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/consts/version.go | 2 +- resource/template/vm/go/model.template | 2 +- resource/template/vm/vue/edit-vue.template | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/internal/consts/version.go b/internal/consts/version.go index d1dccd9..0b4b35e 100644 --- a/internal/consts/version.go +++ b/internal/consts/version.go @@ -8,5 +8,5 @@ package consts const ( - Version = "3.2.3" + Version = "3.2.4" ) diff --git a/resource/template/vm/go/model.template b/resource/template/vm/go/model.template index 59626ff..9dfb4fa 100644 --- a/resource/template/vm/go/model.template +++ b/resource/template/vm/go/model.template @@ -39,7 +39,7 @@ import ( {{if $hasArr}} "github.com/gogf/gf/v2/container/garray" {{end}} - {{if and .table.HasTimeColumn $hasGtime}} + {{if or .table.HasTimeColumn $hasGtime}} "github.com/gogf/gf/v2/os/gtime" {{end}} "github.com/gogf/gf/v2/util/gmeta" diff --git a/resource/template/vm/vue/edit-vue.template b/resource/template/vm/vue/edit-vue.template index f7808f7..9f99525 100644 --- a/resource/template/vm/vue/edit-vue.template +++ b/resource/template/vm/vue/edit-vue.template @@ -385,6 +385,26 @@ export default defineComponent({ {{end}} {{else if and (eq $column.HtmlType "radio" "select") (ne $column.DictType "")}} data.{{$column.HtmlField}} = ''+data.{{$column.HtmlField}} + {{else if eq $column.HtmlType "radio" "select" }} + {{if eq $column.TsType "number"}} + data.{{$column.HtmlField}} = parseInt(data.{{$column.HtmlField}}) + {{else if eq $column.TsType "string"}} + data.{{$column.HtmlField}} = ''+data.{{$column.HtmlField}} + {{else}} + data.{{$column.HtmlField}} = data.{{$column.HtmlField}} + {{end}} + {{else if eq $column.HtmlType "treeSelect"}} + {{$isNumber := false}} + {{range $li,$lc := $.table.LinkedTables}} + {{if and (eq $lc.TableName $column.LinkTableName) (ne $lc.OptionsStruct.ColumnAttr.GoType "string")}} + {{$isNumber = true}} + {{end}} + {{end}} + {{if $isNumber}} + data.{{$column.HtmlField}} = parseInt(data.{{$column.HtmlField}}) + {{else}} + data.{{$column.HtmlField}} = ''+data.{{$column.HtmlField}} + {{end}} {{else if eq $column.HtmlType "imagefile"}} //单图地址赋值 imageUrl{{$column.GoField}}.value = data.{{$column.HtmlField}} ? proxy.getUpFileUrl(data.{{$column.HtmlField}}) : '' From 9a088be0daa18e095faec684ecc032ed83ea8d5a Mon Sep 17 00:00:00 2001 From: yxh Date: Wed, 12 Jul 2023 21:33:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/system/model/sys_job.go | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/internal/app/system/model/sys_job.go b/internal/app/system/model/sys_job.go index 2a6cdb7..5c208d9 100644 --- a/internal/app/system/model/sys_job.go +++ b/internal/app/system/model/sys_job.go @@ -17,20 +17,22 @@ import ( // SysJobInfoRes is the golang structure for table sys_job. type SysJobInfoRes struct { gmeta.Meta `orm:"table:sys_job"` - JobId uint64 `orm:"job_id,primary" json:"jobId"` // 任务ID - JobName string `orm:"job_name" json:"jobName"` // 任务名称 - JobParams string `orm:"job_params" json:"jobParams"` // 参数 - JobGroup string `orm:"job_group" json:"jobGroup"` // 任务组名 - InvokeTarget string `orm:"invoke_target" json:"invokeTarget"` // 任务方法 - CronExpression string `orm:"cron_expression" json:"cronExpression"` // cron执行表达式 - MisfirePolicy int `orm:"misfire_policy" json:"misfirePolicy"` // 计划执行策略 - Concurrent int `orm:"concurrent" json:"concurrent"` // 是否并发执行 - Status int `orm:"status" json:"status"` // 状态 - CreatedBy uint64 `orm:"created_by" json:"createdBy"` // 创建者 - UpdatedBy uint64 `orm:"updated_by" json:"updatedBy"` // 更新者 - Remark string `orm:"remark" json:"remark"` // 备注信息 - CreatedAt *gtime.Time `orm:"created_at" json:"createdAt"` // 创建时间 - UpdatedAt *gtime.Time `orm:"updated_at" json:"updatedAt"` // 更新时间 + JobId uint64 `orm:"job_id,primary" json:"jobId"` // 任务ID + JobName string `orm:"job_name" json:"jobName"` // 任务名称 + JobParams string `orm:"job_params" json:"jobParams"` // 参数 + JobGroup string `orm:"job_group" json:"jobGroup"` // 任务组名 + InvokeTarget string `orm:"invoke_target" json:"invokeTarget"` // 任务方法 + CronExpression string `orm:"cron_expression" json:"cronExpression"` // cron执行表达式 + MisfirePolicy int `orm:"misfire_policy" json:"misfirePolicy"` // 计划执行策略 + Concurrent int `orm:"concurrent" json:"concurrent"` // 是否并发执行 + Status int `orm:"status" json:"status"` // 状态 + CreatedBy uint64 `orm:"created_by" json:"createdBy"` // 创建者 + UpdatedBy uint64 `orm:"updated_by" json:"updatedBy"` // 更新者 + Remark string `orm:"remark" json:"remark"` // 备注信息 + CreatedAt *gtime.Time `orm:"created_at" json:"createdAt"` // 创建时间 + UpdatedAt *gtime.Time `orm:"updated_at" json:"updatedAt"` // 更新时间 + CreatedUser *LinkUserRes `orm:"with:id=created_by" json:"createdUser"` + UpdatedUser *LinkUserRes `orm:"with:id=updated_by" json:"updatedUser"` } type SysJobListRes struct {