hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yxh 2023-08-11 18:01:03 +08:00
commit 74ccac1d02
4 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
internal/app/system/model/sys_job.go
View File

@ -17,20 +17,22 @@ import (
// SysJobInfoRes is the golang structure for table sys_job. // SysJobInfoRes is the golang structure for table sys_job.
type SysJobInfoRes struct { type SysJobInfoRes struct {
gmeta.Meta `orm:"table:sys_job"` gmeta.Meta `orm:"table:sys_job"`
JobId uint64 `orm:"job_id,primary" json:"jobId"` // 任务ID JobId uint64 `orm:"job_id,primary" json:"jobId"` // 任务ID
JobName string `orm:"job_name" json:"jobName"` // 任务名称 JobName string `orm:"job_name" json:"jobName"` // 任务名称
JobParams string `orm:"job_params" json:"jobParams"` // 参数 JobParams string `orm:"job_params" json:"jobParams"` // 参数
JobGroup string `orm:"job_group" json:"jobGroup"` // 任务组名 JobGroup string `orm:"job_group" json:"jobGroup"` // 任务组名
InvokeTarget string `orm:"invoke_target" json:"invokeTarget"` // 任务方法 InvokeTarget string `orm:"invoke_target" json:"invokeTarget"` // 任务方法
CronExpression string `orm:"cron_expression" json:"cronExpression"` // cron执行表达式 CronExpression string `orm:"cron_expression" json:"cronExpression"` // cron执行表达式
MisfirePolicy int `orm:"misfire_policy" json:"misfirePolicy"` // 计划执行策略 MisfirePolicy int `orm:"misfire_policy" json:"misfirePolicy"` // 计划执行策略
Concurrent int `orm:"concurrent" json:"concurrent"` // 是否并发执行 Concurrent int `orm:"concurrent" json:"concurrent"` // 是否并发执行
Status int `orm:"status" json:"status"` // 状态 Status int `orm:"status" json:"status"` // 状态
CreatedBy uint64 `orm:"created_by" json:"createdBy"` // 创建者 CreatedBy uint64 `orm:"created_by" json:"createdBy"` // 创建者
UpdatedBy uint64 `orm:"updated_by" json:"updatedBy"` // 更新者 UpdatedBy uint64 `orm:"updated_by" json:"updatedBy"` // 更新者
Remark string `orm:"remark" json:"remark"` // 备注信息 Remark string `orm:"remark" json:"remark"` // 备注信息
CreatedAt *gtime.Time `orm:"created_at" json:"createdAt"` // 创建时间 CreatedAt *gtime.Time `orm:"created_at" json:"createdAt"` // 创建时间
UpdatedAt *gtime.Time `orm:"updated_at" json:"updatedAt"` // 更新时间 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 { type SysJobListRes struct {

2
internal/consts/version.go
View File

@ -8,5 +8,5 @@
package consts package consts
const ( const (
Version = "3.2.3" Version = "3.2.4"
) )

2
resource/template/vm/go/model.template
View File

@ -39,7 +39,7 @@ import (
{{if $hasArr}} {{if $hasArr}}
"github.com/gogf/gf/v2/container/garray" "github.com/gogf/gf/v2/container/garray"
{{end}} {{end}}
{{if and .table.HasTimeColumn $hasGtime}} {{if or .table.HasTimeColumn $hasGtime}}
"github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/os/gtime"
{{end}} {{end}}
"github.com/gogf/gf/v2/util/gmeta" "github.com/gogf/gf/v2/util/gmeta"

20
resource/template/vm/vue/edit-vue.template
View File

@ -385,6 +385,26 @@ export default defineComponent({
{{end}} {{end}}
{{else if and (eq $column.HtmlType "radio" "select") (ne $column.DictType "")}} {{else if and (eq $column.HtmlType "radio" "select") (ne $column.DictType "")}}
data.{{$column.HtmlField}} = ''+data.{{$column.HtmlField}} 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"}} {{else if eq $column.HtmlType "imagefile"}}
//单图地址赋值 //单图地址赋值
imageUrl{{$column.GoField}}.value = data.{{$column.HtmlField}} ? proxy.getUpFileUrl(data.{{$column.HtmlField}}) : '' imageUrl{{$column.GoField}}.value = data.{{$column.HtmlField}} ? proxy.getUpFileUrl(data.{{$column.HtmlField}}) : ''