feature:代码生成器可拖拽行，修复pgsql从库创建代码的bug，增加默认值属性。

server/model/system/sys_auto_code.go

@@ -68,6 +68,7 @@ type Field struct {
 	FieldSearchType string `json:"fieldSearchType"` // 搜索条件
 	DictType        string `json:"dictType"`        // 字典
 	Require         bool   `json:"require"`         // 是否必填
+	DefaultValue    string `json:"defaultValue"`    // 是否必填
 	ErrorText       string `json:"errorText"`       // 校验失败文字
 	Clearable       bool   `json:"clearable"`       // 是否可清空
 	Sort            bool   `json:"sort"`            // 是否增加排序

server/resource/autocode_template/server/model.go.tpl

@@ -12,23 +12,23 @@ type {{.StructName}} struct {
 {{ if .GvaModel }} global.GVA_MODEL {{ end }}
       {{- range .Fields}}
             {{- if eq .FieldType "enum" }}
-      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 "pictures" }}
-      {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 "richtext" }}
-      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 ne .FieldType "string" }}
-      {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+      {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- 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 }}
       {{- if .AutoCreateResource }}
       CreatedBy  uint   `gorm:"column:created_by;comment:创建者"`

server/resource/autocode_template/web/table.vue.tpl

@@ -192,7 +192,7 @@
         </div>
     </div>
     <el-drawer size="800" v-model="dialogFormVisible" :show-close="false" :before-close="closeDialog">
-       <template #title>
+       <template #header>
               <div class="flex justify-between items-center">
                 <span class="text-lg">{{"{{"}}type==='create'?'添加':'修改'{{"}}"}}</span>
                 <div>
@@ -271,8 +271,8 @@
           </el-form>
     </el-drawer>
 
-    <el-drawer size="800" v-model="detailShow" :before-close="closeDetailShow" title="查看详情" destroy-on-close>
-          <template #title>
+    <el-drawer size="800" v-model="detailShow" :before-close="closeDetailShow" destroy-on-close>
+          <template #header>
              <div class="flex justify-between items-center">
                <span class="text-lg">查看详情</span>
              </div>

server/service/system/sys_auto_code_pgsql.go

@@ -46,74 +46,74 @@ func (a *autoCodePgsql) GetTables(businessDB string, dbName string) (data []resp
 func (a *autoCodePgsql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) {
 	// todo 数据获取不全, 待完善sql
 	sql := `
-SELECT 
-  psc.COLUMN_NAME AS COLUMN_NAME,
-  psc.udt_name AS data_type,
-  CASE
-    psc.udt_name 
-    WHEN 'text' THEN
-      concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
-    WHEN 'varchar' THEN
-      concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) 
-    WHEN 'smallint' THEN
-      concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
-    WHEN 'decimal' THEN
-      concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) 
-    WHEN 'integer' THEN
-      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-    WHEN 'int4' THEN
-      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-    WHEN 'int8' THEN
-      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-    WHEN 'bigint' THEN
-      concat_ws ( '', '', psc.NUMERIC_PRECISION ) 
-    WHEN 'timestamp' THEN
-      concat_ws ( '', '', psc.datetime_precision ) 
-    ELSE '' 
-  END AS data_type_long,
-  (
-    SELECT
-      pd.description 
-    FROM
-      pg_description pd 
-    WHERE
-      (pd.objoid,pd.objsubid) in (
-        SELECT pa.attrelid,pa.attnum
-        FROM
-          pg_attribute pa 
-        WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE 
-        pc.relname = psc.table_name
-        ) 
-        and attname = psc.column_name
-      ) 
-  ) AS column_comment,
-  (
-    SELECT
-      COUNT(*) 
-    FROM
-      pg_constraint 
-    WHERE
-      contype = 'p' 
-      AND conrelid = (
+SELECT
+    psc.COLUMN_NAME AS COLUMN_NAME,
+    psc.udt_name AS data_type,
+    CASE
+        psc.udt_name
+        WHEN 'text' THEN
+            concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH )
+        WHEN 'varchar' THEN
+            concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH )
+        WHEN 'smallint' THEN
+            concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE )
+        WHEN 'decimal' THEN
+            concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE )
+        WHEN 'integer' THEN
+            concat_ws ( '', '', psc.NUMERIC_PRECISION )
+        WHEN 'int4' THEN
+            concat_ws ( '', '', psc.NUMERIC_PRECISION )
+        WHEN 'int8' THEN
+            concat_ws ( '', '', psc.NUMERIC_PRECISION )
+        WHEN 'bigint' THEN
+            concat_ws ( '', '', psc.NUMERIC_PRECISION )
+        WHEN 'timestamp' THEN
+            concat_ws ( '', '', psc.datetime_precision )
+        ELSE ''
+        END AS data_type_long,
+    (
         SELECT
-          oid 
+            pd.description
         FROM
-          pg_class 
+            pg_description pd
         WHERE
-          relname = psc.table_name
-      ) 
-      AND conkey::int[] @> ARRAY[(
+            (pd.objoid,pd.objsubid) in (
+                SELECT pa.attrelid,pa.attnum
+                FROM
+                    pg_attribute pa
+                WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE
+                    pc.relname = psc.table_name
+                )
+                  and attname = psc.column_name
+            )
+    ) AS column_comment,
+    (
         SELECT
-          attnum 
+            COUNT(*)
         FROM
-          pg_attribute 
+            pg_constraint
         WHERE
-          attrelid = conrelid 
-          AND attname = psc.column_name
-      )]
-  ) > 0 AS primary_key
+            contype = 'p'
+          AND conrelid = (
+            SELECT
+                oid
+            FROM
+                pg_class
+            WHERE
+                relname = psc.table_name
+        )
+          AND conkey::int[] @> ARRAY[(
+            SELECT
+                attnum::integer
+            FROM
+                pg_attribute
+            WHERE
+                attrelid = conrelid
+              AND attname = psc.column_name
+        )]
+    ) > 0 AS primary_key
 FROM
-  INFORMATION_SCHEMA.COLUMNS psc 
+    INFORMATION_SCHEMA.COLUMNS psc
 WHERE
   table_catalog = ?
   AND table_schema = 'public'