From 6bdc7a836bab8271256199c0e93f0d67af8d3fdf Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Tue, 11 Jul 2023 22:30:24 +0800
Subject: [PATCH] =?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}}) : ''