diff --git a/server/go.sum b/server/go.sum
index 03df950b6a..ec6a18e60a 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -140,6 +140,8 @@ github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GM
 github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
+github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -292,6 +294,7 @@ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -332,6 +335,10 @@ github.com/mholt/archiver/v4 v4.0.0-alpha.8/go.mod h1:5f7FUYGXdJWUjESffJaYR4R60V
 github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU=
 github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA=
 github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.78 h1:LqW2zy52fxnI4gg8C2oZviTaKHcBV36scS+RzJnxUFs=
+github.com/minio/minio-go/v7 v7.0.78/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -406,6 +413,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
 github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl
index 1384567967..743bc93631 100644
--- a/server/resource/package/server/model/model.go.tpl
+++ b/server/resource/package/server/model/model.go.tpl
@@ -1,3 +1,28 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+{{- if eq .FieldType "enum" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "picture" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "video" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "file" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+{{- else if eq .FieldType "pictures" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+{{- else if eq .FieldType "richtext" }}
+{{.FieldName}}  *string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "json" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"object"`
+{{- else if eq .FieldType "array" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+{{- else }}
+{{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }}
+{{- end }}
+
+{{ else }}
 // 自动生成模板{{.StructName}}
 package {{.Package}}
 
@@ -38,9 +63,6 @@ type {{.StructName}} struct {
     {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"object"`
     {{- else if eq .FieldType "array" }}
     {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
-    {{- else if ne .FieldType "string" }}
-    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
-    {{- else }}
     {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
     {{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }}
 {{- end }}
@@ -57,4 +79,6 @@ type {{.StructName}} struct {
 func ({{.StructName}}) TableName() string {
     return "{{.TableName}}"
 }
-{{ end }}
\ No newline at end of file
+{{ end }}
+
+{{ end }}
diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl
index 8269af454a..b30fdd7ed6 100644
--- a/server/resource/package/web/view/form.vue.tpl
+++ b/server/resource/package/web/view/form.vue.tpl
@@ -1,4 +1,157 @@
 {{- $top := . -}}
+{{- if .IsAdd }}
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
+       {{- if .CheckDataSource}}
+        <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+          <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+        </el-select>
+       {{- else }}
+      {{- if eq .FieldType "bool" }}
+          <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('base.yes')" :inactive-text="t('base.no')" clearable ></el-switch>
+      {{- end }}
+      {{- if eq .FieldType "string" }}
+      {{- if .DictType}}
+           <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+           </el-select>
+      {{- else }}
+          <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+      {{- end }}
+      {{- end }}
+      {{- if eq .FieldType "richtext" }}
+          <RichEdit v-model="formData.{{.FieldJson}}"/>
+      {{- end }}
+      {{- if eq .FieldType "int" }}
+          <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('general.pleaseEnter')" />
+      {{- end }}
+      {{- if eq .FieldType "time.Time" }}
+          <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" :placeholder="t('general.selectDate')" :clearable="{{.Clearable}}"></el-date-picker>
+      {{- end }}
+      {{- if eq .FieldType "float64" }}
+          <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" :clearable="{{.Clearable}}"></el-input-number>
+      {{- end }}
+      {{- if eq .FieldType "enum" }}
+        <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('base.pleaseSelect')" style="width:100%" :clearable="{{.Clearable}}">
+          <el-option v-for="item in [{{ .DataTypeLong }}]" :key="item" :label="item" :value="item" />
+        </el-select>
+      {{- end }}
+       {{- if eq .FieldType "picture" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "video" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="video"/>
+       {{- end }}
+       {{- if eq .FieldType "pictures" }}
+           <SelectImage v-model="formData.{{ .FieldJson }}" multiple file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "file" }}
+          <SelectFile v-model="formData.{{ .FieldJson }}" />
+       {{- end }}
+       {{- if eq .FieldType "json" }}
+          // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+          {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+       {{- end }}
+       {{- if eq .FieldType "array" }}
+          <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+       {{- end }}
+       {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// init方法中增加如下调用
+
+{{- range $index, $element := .DictTypes }}
+    {{ $element }}Options.value = await getDictFunc('{{$element}}')
+{{- end }}
+
+// 基础formData结构增加如下字段
+{{- range .Fields}}
+          {{- if .Form}}
+            {{- if eq .FieldType "bool" }}
+{{.FieldJson}}: false,
+            {{- end }}
+            {{- if eq .FieldType "string" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "richtext" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "int" }}
+{{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+            {{- end }}
+            {{- if eq .FieldType "time.Time" }}
+{{.FieldJson}}: new Date(),
+            {{- end }}
+            {{- if eq .FieldType "float64" }}
+{{.FieldJson}}: 0,
+            {{- end }}
+            {{- if eq .FieldType "picture" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "video" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "pictures" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "file" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "json" }}
+{{.FieldJson}}: {},
+            {{- end }}
+            {{- if eq .FieldType "array" }}
+{{.FieldJson}}: [],
+            {{- end }}
+          {{- end }}
+        {{- end }}
+// 验证规则中增加如下字段
+
+   {{- range .Fields }}
+        {{- if .Form }}
+            {{- if eq .Require true }}
+               {{.FieldJson }} : [{
+                   required: true,
+                   message: '{{ .ErrorText }}',
+                   trigger: ['input','blur'],
+               },
+               {{- if eq .FieldType "string" }}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
+              {{- end }}
+              ],
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+{{- if .HasDataSource }}
+// 请引用
+get{{.StructName}}DataSource,
+
+//  获取数据源
+const dataSource = ref([])
+const getDataSourceFunc = async()=>{
+  const res = await get{{.StructName}}DataSource()
+  if (res.code === 0) {
+    dataSource.value = res.data
+  }
+}
+getDataSourceFunc()
+{{- end }}
+{{- else }}
+
 {{- if not .OnlyTemplate }}
 <template>
   <div>
@@ -164,16 +317,27 @@ const formData = ref({
           {{- end }}
         {{- end }}
         })
+
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
+        {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
                    message: '{{ .ErrorText }}',
                    trigger: ['input','blur'],
-               }],
+               },
+               {{- if eq .FieldType "string" }}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
+              {{- end }}
+              ],
             {{- end }}
+        {{- end }}
     {{- end }}
 })
 
@@ -251,3 +415,4 @@ const back = () => {
 <style>
 </style>
 {{- end }}
+{{- end }}
diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 7a44881503..31e74be219 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -1,6 +1,351 @@
 {{- $global := . }}
 {{- $top := . -}}
 {{- $templateID := printf "%s_%s" .Package .StructName }}
+
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}}  {{- if .FieldSearchType}} {{- if not .FieldSearchHide }} {{- if eq .FieldType "bool" }}
+ <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+ <el-select v-model="searchInfo.{{.FieldJson}}" clearable :placeholder="t('general.pleaseSelect')">
+     <el-option
+         key="true"
+         :label="t('general.yes')"
+         value="true">
+     </el-option>
+     <el-option
+         key="false"
+         label="t('general.no')"
+         value="false">
+     </el-option>
+ </el-select>
+ </el-form-item>
+{{- else if .DictType}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+ <el-select v-model="searchInfo.{{.FieldJson}}" clearable :placeholder="t('general.pleaseSelect')" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+   <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+ </el-select>
+ </el-form-item>
+    {{- else}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+{{- if eq .FieldType "float64" "int"}}
+    {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+    <el-input v-model.number="searchInfo.start{{.FieldName}}" :placeholder="t('general.min')" />
+    —
+    <el-input v-model.number="searchInfo.end{{.FieldName}}" :placeholder="t('general.max')" />
+   {{- else}}
+     {{- if .DictType}}
+      <el-select v-model="searchInfo.{{.FieldJson}}" :placeholder="t('general.pleaseSelect')" style="width:100%" :clearable="true" >
+       <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+     </el-select>
+            {{- else}}
+     <el-input v-model.number="searchInfo.{{.FieldJson}}" :placeholder="t('general.searchCriteria')" />
+            {{- end }}
+  {{- end}}
+{{- else if eq .FieldType "time.Time"}}
+    {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+    <template #label>
+    <span>
+      {{"{{"}} t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}') {{"}}"}}
+      <el-tooltip :content="t('general.searchDesc')">
+        <el-icon><QuestionFilled /></el-icon>
+      </el-tooltip>
+    </span>
+  </template>
+    <el-date-picker v-model="searchInfo.start{{.FieldName}}" type="datetime" :placeholder="t('general.startData')" :disabled-date="time=> searchInfo.end{{.FieldName}} ? time.getTime() > searchInfo.end{{.FieldName}}.getTime() : false"></el-date-picker>
+    —
+    <el-date-picker v-model="searchInfo.end{{.FieldName}}" type="datetime" :placeholder="t('general.endData')" :disabled-date="time=> searchInfo.start{{.FieldName}} ? time.getTime() < searchInfo.start{{.FieldName}}.getTime() : false"></el-date-picker>
+   {{- else}}
+   <el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime" :placeholder="t('general.searchCriteria')"></el-date-picker>
+  {{- end}}
+{{- else}}
+ <el-input v-model="searchInfo.{{.FieldJson}}" :placeholder="t('general.searchCriteria')" />
+{{
+</el-form-item>{{ end }}{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+{{- if .Table}}
+{{- if .CheckDataSource }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+  <template #default="scope">
+        {{if eq .DataSource.Association 2}}
+            <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
+                {{ "{{ item }}" }}
+            </el-tag>
+        {{ else }}
+            <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
+        {{ end }}
+ </template>
+ </el-table-column>
+{{- else if .DictType}}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+    {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+    </template>
+</el-table-column>
+{{- else if eq .FieldType "bool" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+ {{- else if eq .FieldType "time.Time" }}
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="180">
+    <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+ </el-table-column>
+  {{- else if eq .FieldType "picture" }}
+  <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+        <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+      </template>
+  </el-table-column>
+   {{- else if eq .FieldType "pictures" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+         <div class="multiple-img-box">
+            <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+        </div>
+      </template>
+   </el-table-column>
+   {{- else if eq .FieldType "video" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+       <video
+          style="width: 100px; height: 100px"
+          muted
+          preload="metadata"
+          >
+            <source :src="getUrl(scope.row.{{.FieldJson}}) + '#t=1'">
+          </video>
+      </template>
+   </el-table-column>
+   {{- else if eq .FieldType "richtext" }}
+              <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+                 <template #default="scope">
+                    [RichText]
+                 </template>
+              </el-table-column>
+   {{- else if eq .FieldType "file" }}
+            <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+                <template #default="scope">
+                     <div class="file-list">
+                       <el-tag v-for="file in scope.row.{{.FieldJson}}" :key="file.uid" @click="downloadFile(file.url)">{{"{{"}}file.name{{"}}"}}</el-tag>
+                     </div>
+                </template>
+            </el-table-column>
+ {{- else if eq .FieldType "json" }}
+  <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+          [JSON]
+      </template>
+  </el-table-column>
+   {{- else if eq .FieldType "array" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+       <template #default="scope">
+          <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+       </template>
+   </el-table-column>
+  {{- else }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120" />
+  {{- end }}
+{{- end }}
+{{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+{{- if .Form}}
+  <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
+{{- if .CheckDataSource}}
+  <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+    <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+  </el-select>
+{{- else }}
+{{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('general.yes')" :inactive-text="t('general.no')" clearable ></el-switch>
+{{- end }}
+{{- if eq .FieldType "string" }}
+{{- if .DictType}}
+    <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+      <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+{{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+{{- end }}
+{{- end }}
+{{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+{{- end }}
+{{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+{{- end }}
+ {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+ {{- end }}
+{{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+{{- end }}
+{{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" :placeholder="t('general.selectData')" :clearable="{{.Clearable}}"  />
+{{- end }}
+{{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+{{- end }}
+{{- if eq .FieldType "enum" }}
+      <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+         <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+      </el-select>
+{{- end }}
+{{- if eq .FieldType "picture" }}
+      <SelectImage
+       v-model="formData.{{ .FieldJson }}"
+       file-type="image"
+      />
+{{- end }}
+{{- if eq .FieldType "pictures" }}
+      <SelectImage
+       multiple
+       v-model="formData.{{ .FieldJson }}"
+       file-type="image"
+       />
+{{- end }}
+{{- if eq .FieldType "video" }}
+      <SelectImage
+      v-model="formData.{{ .FieldJson }}"
+      file-type="video"
+      />
+ {{- end }}
+{{- if eq .FieldType "file" }}
+      <SelectFile v-model="formData.{{ .FieldJson }}" />
+{{- end }}
+{{- end }}
+  </el-form-item>
+{{- end }}
+{{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+{{- if .Desc }}
+      <el-descriptions-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')">
+  {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+          {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+  {{- else }}
+      {{- if eq .FieldType "picture" }}
+              <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+      {{- end }}
+      {{- if eq .FieldType "array" }}
+              <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+      {{- end }}
+      {{- if eq .FieldType "pictures" }}
+              <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+      {{- end }}
+      {{- if eq .FieldType "file" }}
+              <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                  <el-icon style="margin-right: 5px"><Download /></el-icon>
+                  {{"{{"}}item.name{{"}}"}}
+                </el-button>
+              </div>
+      {{- end }}
+  {{- end }}
+      </el-descriptions-item>
+{{- end }}
+{{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// setOptions方法中增加如下调用
+
+{{- range $index, $element := .DictTypes }}
+    {{ $element }}Options.value = await getDictFunc('{{$element}}')
+{{- end }}
+
+// 基础formData结构（变量处和关闭表单处）增加如下字段
+{{- range .Fields}}
+          {{- if .Form}}
+            {{- if eq .FieldType "bool" }}
+{{.FieldJson}}: false,
+            {{- end }}
+            {{- if eq .FieldType "string" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "richtext" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "int" }}
+{{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+            {{- end }}
+            {{- if eq .FieldType "time.Time" }}
+{{.FieldJson}}: new Date(),
+            {{- end }}
+            {{- if eq .FieldType "float64" }}
+{{.FieldJson}}: 0,
+            {{- end }}
+            {{- if eq .FieldType "picture" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "video" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "pictures" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "file" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "json" }}
+{{.FieldJson}}: {},
+            {{- end }}
+            {{- if eq .FieldType "array" }}
+{{.FieldJson}}: [],
+            {{- end }}
+          {{- end }}
+        {{- end }}
+// 验证规则中增加如下字段
+
+{{- range .Fields }}
+        {{- if .Form }}
+            {{- if eq .Require true }}
+{{.FieldJson }} : [{
+    required: true,
+    message: '{{ .ErrorText }}',
+    trigger: ['input','blur'],
+},
+               {{- if eq .FieldType "string" }}
+{
+    whitespace: true,
+    message: t('general.noOnlySpace'),
+    trigger: ['input', 'blur'],
+}
+              {{- end }}
+],
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+
+
+{{- if .HasDataSource }}
+// 请引用
+get{{.StructName}}DataSource,
+
+//  获取数据源
+const dataSource = ref([])
+const getDataSourceFunc = async()=>{
+  const res = await get{{.StructName}}DataSource()
+  if (res.code === 0) {
+    dataSource.value = res.data
+  }
+}
+getDataSourceFunc()
+{{- end }}
+
+{{- else }}
+
 {{- if not .OnlyTemplate}}
 <template>
   <div>
@@ -910,3 +1255,5 @@ defineOptions({
 <style>
 </style>
 {{- end}}
+
+{{- end }}
diff --git a/server/resource/plugin/web/form/form.vue.template b/server/resource/plugin/web/form/form.vue.template
index f829660fd4..b30fdd7ed6 100644
--- a/server/resource/plugin/web/form/form.vue.template
+++ b/server/resource/plugin/web/form/form.vue.template
@@ -1,18 +1,172 @@
 {{- $top := . -}}
-{{- if not .OnlyTemplate}}
+{{- if .IsAdd }}
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
+       {{- if .CheckDataSource}}
+        <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+          <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+        </el-select>
+       {{- else }}
+      {{- if eq .FieldType "bool" }}
+          <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('base.yes')" :inactive-text="t('base.no')" clearable ></el-switch>
+      {{- end }}
+      {{- if eq .FieldType "string" }}
+      {{- if .DictType}}
+           <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+           </el-select>
+      {{- else }}
+          <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+      {{- end }}
+      {{- end }}
+      {{- if eq .FieldType "richtext" }}
+          <RichEdit v-model="formData.{{.FieldJson}}"/>
+      {{- end }}
+      {{- if eq .FieldType "int" }}
+          <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('general.pleaseEnter')" />
+      {{- end }}
+      {{- if eq .FieldType "time.Time" }}
+          <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" :placeholder="t('general.selectDate')" :clearable="{{.Clearable}}"></el-date-picker>
+      {{- end }}
+      {{- if eq .FieldType "float64" }}
+          <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" :clearable="{{.Clearable}}"></el-input-number>
+      {{- end }}
+      {{- if eq .FieldType "enum" }}
+        <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('base.pleaseSelect')" style="width:100%" :clearable="{{.Clearable}}">
+          <el-option v-for="item in [{{ .DataTypeLong }}]" :key="item" :label="item" :value="item" />
+        </el-select>
+      {{- end }}
+       {{- if eq .FieldType "picture" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "video" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="video"/>
+       {{- end }}
+       {{- if eq .FieldType "pictures" }}
+           <SelectImage v-model="formData.{{ .FieldJson }}" multiple file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "file" }}
+          <SelectFile v-model="formData.{{ .FieldJson }}" />
+       {{- end }}
+       {{- if eq .FieldType "json" }}
+          // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+          {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+       {{- end }}
+       {{- if eq .FieldType "array" }}
+          <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+       {{- end }}
+       {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// init方法中增加如下调用
+
+{{- range $index, $element := .DictTypes }}
+    {{ $element }}Options.value = await getDictFunc('{{$element}}')
+{{- end }}
+
+// 基础formData结构增加如下字段
+{{- range .Fields}}
+          {{- if .Form}}
+            {{- if eq .FieldType "bool" }}
+{{.FieldJson}}: false,
+            {{- end }}
+            {{- if eq .FieldType "string" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "richtext" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "int" }}
+{{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+            {{- end }}
+            {{- if eq .FieldType "time.Time" }}
+{{.FieldJson}}: new Date(),
+            {{- end }}
+            {{- if eq .FieldType "float64" }}
+{{.FieldJson}}: 0,
+            {{- end }}
+            {{- if eq .FieldType "picture" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "video" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "pictures" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "file" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "json" }}
+{{.FieldJson}}: {},
+            {{- end }}
+            {{- if eq .FieldType "array" }}
+{{.FieldJson}}: [],
+            {{- end }}
+          {{- end }}
+        {{- end }}
+// 验证规则中增加如下字段
+
+   {{- range .Fields }}
+        {{- if .Form }}
+            {{- if eq .Require true }}
+               {{.FieldJson }} : [{
+                   required: true,
+                   message: '{{ .ErrorText }}',
+                   trigger: ['input','blur'],
+               },
+               {{- if eq .FieldType "string" }}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
+              {{- end }}
+              ],
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+{{- if .HasDataSource }}
+// 请引用
+get{{.StructName}}DataSource,
+
+//  获取数据源
+const dataSource = ref([])
+const getDataSourceFunc = async()=>{
+  const res = await get{{.StructName}}DataSource()
+  if (res.code === 0) {
+    dataSource.value = res.data
+  }
+}
+getDataSourceFunc()
+{{- end }}
+{{- else }}
+
+{{- if not .OnlyTemplate }}
 <template>
   <div>
     <div class="gva-form-box">
       <el-form :model="formData" ref="elFormRef" label-position="right" :rules="rule" label-width="80px">
       {{- range .Fields}}
-        <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+      {{- if .Form }}
+       <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
        {{- if .CheckDataSource}}
         <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
           <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
         </el-select>
        {{- else }}
       {{- if eq .FieldType "bool" }}
-          <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('general.yes')" :inactive-text="t('general.no')" clearable ></el-switch>
+          <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('base.yes')" :inactive-text="t('base.no')" clearable ></el-switch>
       {{- end }}
       {{- if eq .FieldType "string" }}
       {{- if .DictType}}
@@ -30,13 +184,13 @@
           <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('general.pleaseEnter')" />
       {{- end }}
       {{- if eq .FieldType "time.Time" }}
-          <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" :placeholder="t('general.selectData')" :clearable="{{.Clearable}}"></el-date-picker>
+          <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" :placeholder="t('general.selectDate')" :clearable="{{.Clearable}}"></el-date-picker>
       {{- end }}
       {{- if eq .FieldType "float64" }}
           <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" :clearable="{{.Clearable}}"></el-input-number>
       {{- end }}
       {{- if eq .FieldType "enum" }}
-        <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('general.pleaseSelect')" style="width:100%" :clearable="{{.Clearable}}">
+        <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('base.pleaseSelect')" style="width:100%" :clearable="{{.Clearable}}">
           <el-option v-for="item in [{{ .DataTypeLong }}]" :key="item" :label="item" :value="item" />
         </el-select>
       {{- end }}
@@ -58,13 +212,14 @@
        {{- end }}
        {{- if eq .FieldType "array" }}
           <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
-        {{- end }}
+       {{- end }}
        {{- end }}
        </el-form-item>
+      {{- end }}
       {{- end }}
         <el-form-item>
-          <el-button type="primary" @click="save">{{"{{"}} t('general.save') {{"}}"}}</el-button>
-          <el-button type="primary" @click="back">{{"{{"}} t('general.back') {{"}}"}}</el-button>
+          <el-button type="primary" @click="save">{{ "{{ t('general.save') }}" }}</el-button>
+          <el-button type="primary" @click="back">{{ "{{ t('general.back') }}" }}</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -79,7 +234,7 @@ import {
   create{{.StructName}},
   update{{.StructName}},
   find{{.StructName}}
-} from '@/plugin/{{.Package}}/api/{{.PackageName}}'
+} from '@/api/{{.Package}}/{{.PackageName}}'
 
 defineOptions({
     name: '{{.StructName}}Form'
@@ -112,6 +267,7 @@ import RichEdit from '@/components/richtext/rich-edit.vue'
 import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
 {{- end }}
 
+
 const route = useRoute()
 const router = useRouter()
 
@@ -161,18 +317,27 @@ const formData = ref({
           {{- end }}
         {{- end }}
         })
+
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
-      {{- if .Form }}
+        {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
                    message: '{{ .ErrorText }}',
                    trigger: ['input','blur'],
-               }],
+               },
+               {{- if eq .FieldType "string" }}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
+              {{- end }}
+              ],
             {{- end }}
-       {{- end }}
+        {{- end }}
     {{- end }}
 })
 
@@ -250,3 +415,4 @@ const back = () => {
 <style>
 </style>
 {{- end }}
+{{- end }}
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index 4276647242..b51a10704f 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -1,6 +1,351 @@
 {{- $global := . }}
-{{- $templateID := printf "%s_%s" .Package .StructName }}
 {{- $top := . -}}
+{{- $templateID := printf "%s_%s" .Package .StructName }}
+
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}}  {{- if .FieldSearchType}} {{- if not .FieldSearchHide }} {{- if eq .FieldType "bool" }}
+ <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+ <el-select v-model="searchInfo.{{.FieldJson}}" clearable :placeholder="t('general.pleaseSelect')">
+     <el-option
+         key="true"
+         :label="t('general.yes')"
+         value="true">
+     </el-option>
+     <el-option
+         key="false"
+         label="t('general.no')"
+         value="false">
+     </el-option>
+ </el-select>
+ </el-form-item>
+{{- else if .DictType}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+ <el-select v-model="searchInfo.{{.FieldJson}}" clearable :placeholder="t('general.pleaseSelect')" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+   <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+ </el-select>
+ </el-form-item>
+    {{- else}}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}">
+{{- if eq .FieldType "float64" "int"}}
+    {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+    <el-input v-model.number="searchInfo.start{{.FieldName}}" :placeholder="t('general.min')" />
+    —
+    <el-input v-model.number="searchInfo.end{{.FieldName}}" :placeholder="t('general.max')" />
+   {{- else}}
+     {{- if .DictType}}
+      <el-select v-model="searchInfo.{{.FieldJson}}" :placeholder="t('general.pleaseSelect')" style="width:100%" :clearable="true" >
+       <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+     </el-select>
+            {{- else}}
+     <el-input v-model.number="searchInfo.{{.FieldJson}}" :placeholder="t('general.searchCriteria')" />
+            {{- end }}
+  {{- end}}
+{{- else if eq .FieldType "time.Time"}}
+    {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+    <template #label>
+    <span>
+      {{"{{"}} t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}') {{"}}"}}
+      <el-tooltip :content="t('general.searchDesc')">
+        <el-icon><QuestionFilled /></el-icon>
+      </el-tooltip>
+    </span>
+  </template>
+    <el-date-picker v-model="searchInfo.start{{.FieldName}}" type="datetime" :placeholder="t('general.startData')" :disabled-date="time=> searchInfo.end{{.FieldName}} ? time.getTime() > searchInfo.end{{.FieldName}}.getTime() : false"></el-date-picker>
+    —
+    <el-date-picker v-model="searchInfo.end{{.FieldName}}" type="datetime" :placeholder="t('general.endData')" :disabled-date="time=> searchInfo.start{{.FieldName}} ? time.getTime() < searchInfo.start{{.FieldName}}.getTime() : false"></el-date-picker>
+   {{- else}}
+   <el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime" :placeholder="t('general.searchCriteria')"></el-date-picker>
+  {{- end}}
+{{- else}}
+ <el-input v-model="searchInfo.{{.FieldJson}}" :placeholder="t('general.searchCriteria')" />
+{{
+</el-form-item>{{ end }}{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+{{- if .Table}}
+{{- if .CheckDataSource }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+  <template #default="scope">
+        {{if eq .DataSource.Association 2}}
+            <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
+                {{ "{{ item }}" }}
+            </el-tag>
+        {{ else }}
+            <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
+        {{ end }}
+ </template>
+ </el-table-column>
+{{- else if .DictType}}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+    {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+    </template>
+</el-table-column>
+{{- else if eq .FieldType "bool" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+ {{- else if eq .FieldType "time.Time" }}
+ <el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="180">
+    <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+ </el-table-column>
+  {{- else if eq .FieldType "picture" }}
+  <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+        <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+      </template>
+  </el-table-column>
+   {{- else if eq .FieldType "pictures" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+         <div class="multiple-img-box">
+            <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+        </div>
+      </template>
+   </el-table-column>
+   {{- else if eq .FieldType "video" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+       <video
+          style="width: 100px; height: 100px"
+          muted
+          preload="metadata"
+          >
+            <source :src="getUrl(scope.row.{{.FieldJson}}) + '#t=1'">
+          </video>
+      </template>
+   </el-table-column>
+   {{- else if eq .FieldType "richtext" }}
+              <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+                 <template #default="scope">
+                    [RichText]
+                 </template>
+              </el-table-column>
+   {{- else if eq .FieldType "file" }}
+            <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+                <template #default="scope">
+                     <div class="file-list">
+                       <el-tag v-for="file in scope.row.{{.FieldJson}}" :key="file.uid" @click="downloadFile(file.url)">{{"{{"}}file.name{{"}}"}}</el-tag>
+                     </div>
+                </template>
+            </el-table-column>
+ {{- else if eq .FieldType "json" }}
+  <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+      <template #default="scope">
+          [JSON]
+      </template>
+  </el-table-column>
+   {{- else if eq .FieldType "array" }}
+   <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+       <template #default="scope">
+          <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+       </template>
+   </el-table-column>
+  {{- else }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120" />
+  {{- end }}
+{{- end }}
+{{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+{{- if .Form}}
+  <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
+{{- if .CheckDataSource}}
+  <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+    <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+  </el-select>
+{{- else }}
+{{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('general.yes')" :inactive-text="t('general.no')" clearable ></el-switch>
+{{- end }}
+{{- if eq .FieldType "string" }}
+{{- if .DictType}}
+    <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+      <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+{{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+{{- end }}
+{{- end }}
+{{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+{{- end }}
+{{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+{{- end }}
+ {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+ {{- end }}
+{{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+{{- end }}
+{{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" :placeholder="t('general.selectData')" :clearable="{{.Clearable}}"  />
+{{- end }}
+{{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+{{- end }}
+{{- if eq .FieldType "enum" }}
+      <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+         <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+      </el-select>
+{{- end }}
+{{- if eq .FieldType "picture" }}
+      <SelectImage
+       v-model="formData.{{ .FieldJson }}"
+       file-type="image"
+      />
+{{- end }}
+{{- if eq .FieldType "pictures" }}
+      <SelectImage
+       multiple
+       v-model="formData.{{ .FieldJson }}"
+       file-type="image"
+       />
+{{- end }}
+{{- if eq .FieldType "video" }}
+      <SelectImage
+      v-model="formData.{{ .FieldJson }}"
+      file-type="video"
+      />
+ {{- end }}
+{{- if eq .FieldType "file" }}
+      <SelectFile v-model="formData.{{ .FieldJson }}" />
+{{- end }}
+{{- end }}
+  </el-form-item>
+{{- end }}
+{{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+{{- if .Desc }}
+      <el-descriptions-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')">
+  {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+          {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+  {{- else }}
+      {{- if eq .FieldType "picture" }}
+              <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+      {{- end }}
+      {{- if eq .FieldType "array" }}
+              <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+      {{- end }}
+      {{- if eq .FieldType "pictures" }}
+              <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+      {{- end }}
+      {{- if eq .FieldType "file" }}
+              <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                  <el-icon style="margin-right: 5px"><Download /></el-icon>
+                  {{"{{"}}item.name{{"}}"}}
+                </el-button>
+              </div>
+      {{- end }}
+  {{- end }}
+      </el-descriptions-item>
+{{- end }}
+{{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// setOptions方法中增加如下调用
+
+{{- range $index, $element := .DictTypes }}
+    {{ $element }}Options.value = await getDictFunc('{{$element}}')
+{{- end }}
+
+// 基础formData结构（变量处和关闭表单处）增加如下字段
+{{- range .Fields}}
+          {{- if .Form}}
+            {{- if eq .FieldType "bool" }}
+{{.FieldJson}}: false,
+            {{- end }}
+            {{- if eq .FieldType "string" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "richtext" }}
+{{.FieldJson}}: '',
+            {{- end }}
+            {{- if eq .FieldType "int" }}
+{{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+            {{- end }}
+            {{- if eq .FieldType "time.Time" }}
+{{.FieldJson}}: new Date(),
+            {{- end }}
+            {{- if eq .FieldType "float64" }}
+{{.FieldJson}}: 0,
+            {{- end }}
+            {{- if eq .FieldType "picture" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "video" }}
+{{.FieldJson}}: "",
+            {{- end }}
+            {{- if eq .FieldType "pictures" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "file" }}
+{{.FieldJson}}: [],
+            {{- end }}
+            {{- if eq .FieldType "json" }}
+{{.FieldJson}}: {},
+            {{- end }}
+            {{- if eq .FieldType "array" }}
+{{.FieldJson}}: [],
+            {{- end }}
+          {{- end }}
+        {{- end }}
+// 验证规则中增加如下字段
+
+{{- range .Fields }}
+        {{- if .Form }}
+            {{- if eq .Require true }}
+{{.FieldJson }} : [{
+    required: true,
+    message: '{{ .ErrorText }}',
+    trigger: ['input','blur'],
+},
+               {{- if eq .FieldType "string" }}
+{
+    whitespace: true,
+    message: t('general.noOnlySpace'),
+    trigger: ['input', 'blur'],
+}
+              {{- end }}
+],
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+
+
+{{- if .HasDataSource }}
+// 请引用
+get{{.StructName}}DataSource,
+
+//  获取数据源
+const dataSource = ref([])
+const getDataSourceFunc = async()=>{
+  const res = await get{{.StructName}}DataSource()
+  if (res.code === 0) {
+    dataSource.value = res.data
+  }
+}
+getDataSourceFunc()
+{{- end }}
+
+{{- else }}
+
 {{- if not .OnlyTemplate}}
 <template>
   <div>
@@ -31,7 +376,7 @@
                 </el-option>
                 <el-option
                     key="false"
-                    :label="t('general.no')"
+                    label="t('general.no')"
                     value="false">
                 </el-option>
             </el-select>
@@ -62,7 +407,7 @@
             {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
             <template #label>
             <span>
-             {{"{{"}}t({{$top.Package}}.{{$top.StructName}}.{{.FieldDesc}}){{"}}"}}
+              {{"{{"}} t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}') {{"}}"}}
               <el-tooltip :content="t('general.searchDesc')">
                 <el-icon><QuestionFilled /></el-icon>
               </el-tooltip>
@@ -123,7 +468,7 @@
                       {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
                       <template #label>
                       <span>
-                      {{"{{"}}t({{$top.Package}}.{{$top.StructName}}.{{.FieldDesc}}){{"}}"}}
+                        {{"{{"}} t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}') {{"}}"}}
                         <el-tooltip :content="t('general.searchDesc')">
                           <el-icon><QuestionFilled /></el-icon>
                         </el-tooltip>
@@ -133,7 +478,7 @@
                       —
                       <el-date-picker v-model="searchInfo.end{{.FieldName}}" type="datetime" :placeholder="t('general.endData')" :disabled-date="time=> searchInfo.start{{.FieldName}} ? time.getTime() < searchInfo.start{{.FieldName}}.getTime() : false"></el-date-picker>
                      {{- else}}
-                     <el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime" :placeholder="t('general.searchCriteria')"></el-date-picker>
+                     <el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime":placeholder="t('general.searchCriteria')"></el-date-picker>
                     {{- end}}
                   {{- else}}
                    <el-input v-model="searchInfo.{{.FieldJson}}" :placeholder="t('general.searchCriteria')" />
@@ -252,23 +597,23 @@
                   [JSON]
               </template>
           </el-table-column>
-          {{- else if eq .FieldType "array" }}
-          <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
-              <template #default="scope">
+           {{- else if eq .FieldType "array" }}
+           <el-table-column :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="200">
+               <template #default="scope">
                   <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
-              </template>
-          </el-table-column>
-        {{- else }}
+               </template>
+           </el-table-column>
+          {{- else }}
         <el-table-column {{- if .Sort}} sortable{{- end}} align="left" :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" prop="{{.FieldJson}}" width="120" />
-        {{- end }}
+          {{- end }}
         {{- end }}
         {{- end }}
         <el-table-column align="left" :label="t('general.operations')" fixed="right" min-width="240">
-            <template #default="scope">
+          <template #default="scope">
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.info"{{ end }} type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>{{"{{"}}t('general.desc'){{"}}"}}</el-button>
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.edit"{{ end }} type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">{{"{{"}}t('general.change'){{"}}"}}</el-button>
             <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.delete"{{ end }} type="primary" link icon="delete" @click="deleteRow(scope.row)">{{"{{"}}t('general.delete'){{"}}"}}</el-button>
-            </template>
+          </template>
         </el-table-column>
         </el-table>
         <div class="gva-pagination">
@@ -296,8 +641,8 @@
 
           <el-form :model="formData" label-position="top" ref="elFormRef" :rules="rule" label-width="80px">
         {{- range .Fields}}
-        {{- if .Form}}
-            <el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
+          {{- if .Form}}
+            <el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
           {{- if .CheckDataSource}}
             <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
               <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
@@ -312,7 +657,7 @@
                 <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
               </el-select>
           {{- else }}
-              <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
+              <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
           {{- end }}
           {{- end }}
           {{- if eq .FieldType "richtext" }}
@@ -326,7 +671,7 @@
               <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
            {{- end }}
           {{- if eq .FieldType "int" }}
-              <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
+              <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
           {{- end }}
           {{- if eq .FieldType "time.Time" }}
               <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" :placeholder="t('general.selectData')" :clearable="{{.Clearable}}"  />
@@ -368,39 +713,37 @@
           </el-form>
     </el-drawer>
 
-        <el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow">
-                <el-descriptions column="1" border>
-                {{- range .Fields}}
-                  {{- if .Desc }}
-                        <el-descriptions-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')">
+    <el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow">
+            <el-descriptions :column="1" border>
+            {{- range .Fields}}
+              {{- if .Desc }}
+                    <el-descriptions-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')">
                 {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
-                            {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
-                    {{- else }}
-                        {{- if eq .FieldType "picture" }}
-                                <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
-                        {{- end }}
-                        {{- if eq .FieldType "array" }}
-                             <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
-                        {{- end }}
-                        {{- if eq .FieldType "pictures" }}
-                                <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
-                        {{- end }}
-                        {{- if eq .FieldType "file" }}
-                                <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
-                                  <el-button type="primary" text bg @click="onDownloadFile(item.url)">
-                                    <el-icon style="margin-right: 5px"><Download /></el-icon>
-                                    {{"{{"}}item.name{{"}}"}}
-                                  </el-button>
-                                </div>
-                        {{- end }}
+                        {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+                            <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+                            <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+                            <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "file" }}
+                            <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                              <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                                <el-icon style="margin-right: 5px"><Download /></el-icon>
+                                {{"{{"}}item.name{{"}}"}}
+                              </el-button>
+                            </div>
                     {{- end }}
-                        </el-descriptions-item>
-                  {{- end }}
                 {{- end }}
-                </el-descriptions>
-            </el-drawer>
-
-
+                    </el-descriptions-item>
+              {{- end }}
+            {{- end }}
+            </el-descriptions>
+        </el-drawer>
 
   </div>
 </template>
@@ -416,7 +759,7 @@ import {
   update{{.StructName}},
   find{{.StructName}},
   get{{.StructName}}List
-} from '@/plugin/{{.Package}}/api/{{.PackageName}}'
+} from '@/api/{{.Package}}/{{.PackageName}}'
 
 {{- if or .HasPic .HasFile}}
 import { getUrl } from '@/utils/image'
@@ -431,7 +774,6 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 import RichEdit from '@/components/richtext/rich-edit.vue'
 {{- end }}
 
-
 {{- if .HasFile }}
 // 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
@@ -446,6 +788,9 @@ import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
 import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, returnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+
 {{- if .AutoCreateBtnAuth }}
 // 引入按钮权限标识
 import { useBtnAuth } from '@/utils/btnAuth'
@@ -460,9 +805,6 @@ import ImportExcel from '@/components/exportExcel/importExcel.vue'
 import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
 {{- end}}
 
-import { useI18n } from 'vue-i18n'
-const { t } = useI18n()
-
 defineOptions({
     name: '{{.StructName}}'
 })
@@ -538,7 +880,7 @@ const formData = ref({
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
-      {{- if .Form }}
+        {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
@@ -554,7 +896,7 @@ const rule = reactive({
               {{- end }}
               ],
             {{- end }}
-       {{- end }}
+        {{- end }}
     {{- end }}
 })
 
@@ -606,13 +948,13 @@ const searchInfo = ref({})
 const sortChange = ({ prop, order }) => {
   const sortMap = {
     {{- range .Fields}}
-      {{- if .Table}}
-        {{- if and .Sort}}
-          {{- if not (eq .ColumnName "")}}
-              {{.FieldJson}}: '{{.ColumnName}}',
-          {{- end}}
+     {{- if .Table}}
+      {{- if and .Sort}}
+        {{- if not (eq .ColumnName "")}}
+            {{.FieldJson}}: '{{.ColumnName}}',
         {{- end}}
       {{- end}}
+     {{- end}}
     {{- end}}
   }
 
@@ -852,7 +1194,6 @@ const downloadFile = (url) => {
 }
 {{end}}
 
-
 const detailFrom = ref({})
 
 // 查看详情控制标记
@@ -913,4 +1254,6 @@ defineOptions({
 </script>
 <style>
 </style>
-{{- end}}
\ No newline at end of file
+{{- end}}
+
+{{- end }}