From c3afbaa4d3ae47bb98ec1f1969956c8cb81c41a9 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Mon, 22 Apr 2024 10:46:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/consts/version.go                         | 2 +-
 library/liberr/err.go                              | 2 +-
 resource/data/gfast-v32-pg.sql                     | 4 ++--
 resource/template/vm/vue/list-vue.template         | 6 +++---
 resource/template/vm/vue/tree-virtual-vue.template | 6 +++---
 resource/template/vm/vue/tree-vue.template         | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/internal/consts/version.go b/internal/consts/version.go
index 05ff019..96e2bcd 100644
--- a/internal/consts/version.go
+++ b/internal/consts/version.go
@@ -9,5 +9,5 @@ package consts
 
 const (
 	Logo    = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg`
-	Version = "3.2.22"
+	Version = "3.2.23"
 )
diff --git a/library/liberr/err.go b/library/liberr/err.go
index dd5ec83..71205ff 100644
--- a/library/liberr/err.go
+++ b/library/liberr/err.go
@@ -18,7 +18,7 @@ func ErrIsNil(ctx context.Context, err error, msg ...string) {
 			g.Log().Error(ctx, err.Error())
 			panic(msg[0])
 		} else {
-			panic(err.Error())
+			panic(err)
 		}
 	}
 }
diff --git a/resource/data/gfast-v32-pg.sql b/resource/data/gfast-v32-pg.sql
index 7dee9c2..ba1fa55 100644
--- a/resource/data/gfast-v32-pg.sql
+++ b/resource/data/gfast-v32-pg.sql
@@ -5010,7 +5010,7 @@ CREATE TABLE "sys_role" (
   "updated_at" timestamp(6),
   "created_by" int8 NOT NULL DEFAULT 0,
   "pid" int8 NOT NULL DEFAULT 0,
-  "effectiveTime" text COLLATE "pg_catalog"."default"
+  "effective_time" text COLLATE "pg_catalog"."default"
 )
 ;
 COMMENT ON COLUMN "sys_role"."status" IS '状态;0:禁用;1:正常';
@@ -5022,7 +5022,7 @@ COMMENT ON COLUMN "sys_role"."created_at" IS '创建时间';
 COMMENT ON COLUMN "sys_role"."updated_at" IS '更新时间';
 COMMENT ON COLUMN "sys_role"."created_by" IS '添加人';
 COMMENT ON COLUMN "sys_role"."pid" IS '父级ID';
-COMMENT ON COLUMN "sys_role"."effectiveTime" IS '角色有效日期';
+COMMENT ON COLUMN "sys_role"."effective_time" IS '角色有效日期';
 COMMENT ON TABLE "sys_role" IS '角色表';
 
 -- ----------------------------
diff --git a/resource/template/vm/vue/list-vue.template b/resource/template/vm/vue/list-vue.template
index 54ff54f..91607ef 100644
--- a/resource/template/vm/vue/list-vue.template
+++ b/resource/template/vm/vue/list-vue.template
@@ -47,7 +47,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option
                             v-for="dict in {{$column.DictType}}"
                             :key="dict.value"
@@ -124,7 +124,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.LinkTableName "")}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}}>
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} style="width:200px;">
                       <el-option
                       {{if $column.IsCascade}}
                           v-for="item in {{$column.HtmlField}}QueryOptions"
@@ -164,7 +164,7 @@
                 {{else}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option label="请选择字典生成" value="" />
                     </el-select>
                   </el-form-item>
diff --git a/resource/template/vm/vue/tree-virtual-vue.template b/resource/template/vm/vue/tree-virtual-vue.template
index 40f1d9b..967f94a 100644
--- a/resource/template/vm/vue/tree-virtual-vue.template
+++ b/resource/template/vm/vue/tree-virtual-vue.template
@@ -52,7 +52,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option
                             v-for="dict in {{$column.DictType}}"
                             :key="dict.value"
@@ -129,7 +129,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.LinkTableName "")}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}}>
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} style="width:200px;">
                       <el-option
                       {{if $column.IsCascade}}
                           v-for="item in {{$column.HtmlField}}QueryOptions"
@@ -169,7 +169,7 @@
                 {{else}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option label="请选择字典生成" value="" />
                     </el-select>
                   </el-form-item>
diff --git a/resource/template/vm/vue/tree-vue.template b/resource/template/vm/vue/tree-vue.template
index d24664c..0a498ce 100644
--- a/resource/template/vm/vue/tree-vue.template
+++ b/resource/template/vm/vue/tree-vue.template
@@ -50,7 +50,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.DictType "") }}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option
                             v-for="dict in {{$column.DictType}}"
                             :key="dict.value"
@@ -127,7 +127,7 @@
                 {{else if and (eq $column.HtmlType "select" "radio" "checkbox" "selects") (ne $column.LinkTableName "")}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}}>
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable  {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} style="width:200px;">
                       <el-option
                       {{if $column.IsCascade}}
                           v-for="item in {{$column.HtmlField}}QueryOptions"
@@ -167,7 +167,7 @@
                 {{else}}
                 <el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
                   <el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
-                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
+                    <el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable style="width:200px;">
                         <el-option label="请选择字典生成" value="" />
                     </el-select>
                   </el-form-item>