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}}) : ''