@@ -248,3 +404,4 @@ const back = () => {
{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 556cb828f..f47ed5c85 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -1,5 +1,355 @@
{{- $global := . }}
{{- $templateID := printf "%s_%s" .Package .StructName }}
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
+
+
+
+
+
+
+
+
+ {{- else if .DictType}}
+
+
+
+
+
+ {{- else if .CheckDataSource}}
+
+
+
+
+
+ {{- else}}
+
+ {{- if eq .FieldType "float64" "int"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+—
+
+ {{- else}}
+ {{- if .DictType}}
+
+
+
+ {{- else}}
+
+ {{- end }}
+ {{- end}}
+ {{- else if eq .FieldType "time.Time"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+
+{{.FieldDesc}}
+
+
+
+
+
+
+—
+
+ {{- else}}
+
+ {{- end}}
+ {{- else}}
+
+ {{- end}}
+{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+ {{- if .Table}}
+ {{- if .CheckDataSource }}
+
+
+ {{if eq .DataSource.Association 2}}
+
+ {{ "{{ item }}" }}
+
+ {{ else }}
+ {{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}
+ {{ end }}
+
+
+ {{- else if .DictType}}
+
+
+ {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+
+
+ {{- else if eq .FieldType "bool" }}
+
+ {{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "time.Time" }}
+
+ {{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "picture" }}
+
+
+
+
+
+ {{- else if eq .FieldType "pictures" }}
+
+
+
+
+
+
+
+ {{- else if eq .FieldType "video" }}
+
+
+
+
+
+ {{- else if eq .FieldType "richtext" }}
+
+
+ [富文本内容]
+
+
+ {{- else if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}file.name{{"}}"}}
+
+
+
+ {{- else if eq .FieldType "json" }}
+
+
+ [JSON]
+
+
+ {{- else if eq .FieldType "array" }}
+
+
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+ {{- if .Form}}
+
+ {{- if .CheckDataSource}}
+
+
+
+ {{- else }}
+ {{- if eq .FieldType "bool" }}
+
+ {{- end }}
+ {{- if eq .FieldType "string" }}
+ {{- if .DictType}}
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- if eq .FieldType "richtext" }}
+
+ {{- end }}
+ {{- if eq .FieldType "json" }}
+ // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+ {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "int" }}
+
+ {{- end }}
+ {{- if eq .FieldType "time.Time" }}
+
+ {{- end }}
+ {{- if eq .FieldType "float64" }}
+
+ {{- end }}
+ {{- if eq .FieldType "enum" }}
+
+
+
+ {{- end }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "video" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+ {{- end }}
+ {{- end }}
+
+ {{- end }}
+ {{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+ {{- if .Desc }}
+
+ {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+ {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+ {{- else }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}item.name{{"}}"}}
+
+
+ {{- end }}
+ {{- end }}
+
+ {{- 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: '不能只输入空格',
+ 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}}
@@ -41,6 +391,12 @@
+ {{- else if .CheckDataSource}}
+
+
+
+
+
{{- else}}
{{- if eq .FieldType "float64" "int"}}
@@ -76,7 +432,6 @@
{{- else}}
{{- end}}
-
{{ end }}{{ end }}{{ end }}{{ end }}
@@ -264,8 +619,8 @@
{{- end }}
- 查看详情
- 变更
+ 查看
+ 编辑
删除
@@ -285,7 +640,7 @@
-
{{"{{"}}type==='create'?'添加':'修改'{{"}}"}}
+
{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}
确 定
取 消
@@ -367,7 +722,7 @@
-
+
{{- range .Fields}}
{{- if .Desc }}
@@ -906,4 +1261,6 @@ defineOptions({
-{{- end}}
\ No newline at end of file
+{{- end }}
+
+{{- end }}
\ No newline at end of file
diff --git a/server/resource/plugin/server/api/api.go.template b/server/resource/plugin/server/api/api.go.template
index 03321c74f..edf465180 100644
--- a/server/resource/plugin/server/api/api.go.template
+++ b/server/resource/plugin/server/api/api.go.template
@@ -2,17 +2,17 @@ package api
import (
{{if not .OnlyTemplate}}
- "github.com/flipped-aurora/gin-vue-admin/server/global"
- "github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model/request"
+ "{{.Module}}/global"
+ "{{.Module}}/model/common/response"
+ "{{.Module}}/plugin/{{.Package}}/model"
+ "{{.Module}}/plugin/{{.Package}}/model/request"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
{{- if .AutoCreateResource}}
- "github.com/flipped-aurora/gin-vue-admin/server/utils"
+ "{{.Module}}/utils"
{{- end }}
{{- else }}
- "github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+ "{{.Module}}/model/common/response"
"github.com/gin-gonic/gin"
{{- end }}
)
diff --git a/server/resource/plugin/server/initialize/api.go.template b/server/resource/plugin/server/initialize/api.go.template
index adf5d64cf..dfbea23d9 100644
--- a/server/resource/plugin/server/initialize/api.go.template
+++ b/server/resource/plugin/server/initialize/api.go.template
@@ -2,8 +2,8 @@ package initialize
import (
"context"
- model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/plugin-tool/utils"
+ model "{{.Module}}/model/system"
+ "{{.Module}}/plugin/plugin-tool/utils"
)
func Api(ctx context.Context) {
diff --git a/server/resource/plugin/server/initialize/gorm.go.template b/server/resource/plugin/server/initialize/gorm.go.template
index 0988bccff..52c818319 100644
--- a/server/resource/plugin/server/initialize/gorm.go.template
+++ b/server/resource/plugin/server/initialize/gorm.go.template
@@ -3,8 +3,7 @@ package initialize
import (
"context"
"fmt"
- "github.com/flipped-aurora/gin-vue-admin/server/global"
-
+ "{{.Module}}/global"
"github.com/pkg/errors"
"go.uber.org/zap"
)
diff --git a/server/resource/plugin/server/initialize/menu.go.template b/server/resource/plugin/server/initialize/menu.go.template
index 06993db3d..8774f356c 100644
--- a/server/resource/plugin/server/initialize/menu.go.template
+++ b/server/resource/plugin/server/initialize/menu.go.template
@@ -2,8 +2,8 @@ package initialize
import (
"context"
- model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/plugin-tool/utils"
+ model "{{.Module}}/model/system"
+ "{{.Module}}/plugin/plugin-tool/utils"
)
func Menu(ctx context.Context) {
diff --git a/server/resource/plugin/server/initialize/router.go.template b/server/resource/plugin/server/initialize/router.go.template
index f7f8ed0fb..fbf03a3aa 100644
--- a/server/resource/plugin/server/initialize/router.go.template
+++ b/server/resource/plugin/server/initialize/router.go.template
@@ -1,8 +1,8 @@
package initialize
import (
- "github.com/flipped-aurora/gin-vue-admin/server/global"
- "github.com/flipped-aurora/gin-vue-admin/server/middleware"
+ "{{.Module}}/global"
+ "{{.Module}}/middleware"
"github.com/gin-gonic/gin"
)
diff --git a/server/resource/plugin/server/initialize/viper.go.template b/server/resource/plugin/server/initialize/viper.go.template
index a1887ac28..e759ad637 100644
--- a/server/resource/plugin/server/initialize/viper.go.template
+++ b/server/resource/plugin/server/initialize/viper.go.template
@@ -2,8 +2,8 @@ package initialize
import (
"fmt"
- "github.com/flipped-aurora/gin-vue-admin/server/global"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/plugin"
+ "{{.Module}}/global"
+ "{{.Module}}/plugin/{{ .Package }}/plugin"
"github.com/pkg/errors"
"go.uber.org/zap"
)
diff --git a/server/resource/plugin/server/model/model.go.template b/server/resource/plugin/server/model/model.go.template
index 153ab3ba1..0f9528db3 100644
--- a/server/resource/plugin/server/model/model.go.template
+++ b/server/resource/plugin/server/model/model.go.template
@@ -1,9 +1,34 @@
+{{- 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 }}
package model
{{- if not .OnlyTemplate}}
import (
{{- if .GvaModel }}
- "github.com/flipped-aurora/gin-vue-admin/server/global"
+ "{{.Module}}/global"
{{- end }}
{{- if or .HasTimer }}
"time"
@@ -32,15 +57,13 @@ type {{.StructName}} struct {
{{- 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 -}}`
+ {{.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 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 -}}`
+ {{.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 }}
{{- if .AutoCreateResource }}
@@ -57,3 +80,4 @@ func ({{.StructName}}) TableName() string {
return "{{.TableName}}"
}
{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/server/resource/plugin/server/model/request/request.go.template b/server/resource/plugin/server/model/request/request.go.template
index cf2a56944..2100a6415 100644
--- a/server/resource/plugin/server/model/request/request.go.template
+++ b/server/resource/plugin/server/model/request/request.go.template
@@ -1,7 +1,28 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+ {{- if ne .FieldSearchType ""}}
+ {{- if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+Start{{.FieldName}} *{{.FieldType}} `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
+End{{.FieldName}} *{{.FieldType}} `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
+ {{- else }}
+ {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
+{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+ {{- else }}
+{{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+ {{- end }}
+ {{- end }}
+ {{- end}}
+{{- end }}
+{{- if .NeedSort}}
+Sort string `json:"sort" form:"sort"`
+Order string `json:"order" form:"order"`
+{{- end}}
+{{- else }}
package request
{{- if not .OnlyTemplate}}
import (
- "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+ "{{.Module}}/model/common/request"
{{ if or .HasSearchTimer .GvaModel}}"time"{{ end }}
)
{{- end}}
@@ -18,12 +39,10 @@ type {{.StructName}}Search struct{
Start{{.FieldName}} *{{.FieldType}} `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
End{{.FieldName}} *{{.FieldType}} `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
{{- else }}
- {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "richtext") (eq .FieldType "json") }}
+ {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
- {{- else if ne .FieldType "string" }}
- {{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
{{- else }}
- {{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+ {{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
{{- end }}
{{- end }}
{{- end}}
@@ -33,5 +52,6 @@ type {{.StructName}}Search struct{
Sort string `json:"sort" form:"sort"`
Order string `json:"order" form:"order"`
{{- end}}
-{{- end}}
+{{- end }}
}
+{{- end }}
\ No newline at end of file
diff --git a/server/resource/plugin/server/plugin.go.template b/server/resource/plugin/server/plugin.go.template
index 42c59f599..255b7af00 100644
--- a/server/resource/plugin/server/plugin.go.template
+++ b/server/resource/plugin/server/plugin.go.template
@@ -2,8 +2,8 @@ package {{ .Package }}
import (
"context"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/initialize"
- interfaces "github.com/flipped-aurora/gin-vue-admin/server/utils/plugin/v2"
+ "{{.Module}}/plugin/{{ .Package }}/initialize"
+ interfaces "{{.Module}}/utils/plugin/v2"
"github.com/gin-gonic/gin"
)
diff --git a/server/resource/plugin/server/plugin/plugin.go.template b/server/resource/plugin/server/plugin/plugin.go.template
index 9129584bb..7e25e0700 100644
--- a/server/resource/plugin/server/plugin/plugin.go.template
+++ b/server/resource/plugin/server/plugin/plugin.go.template
@@ -1,5 +1,5 @@
package plugin
-import "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/config"
+import "{{.Module}}/plugin/{{ .Package }}/config"
var Config config.Config
diff --git a/server/resource/plugin/server/router/router.go.template b/server/resource/plugin/server/router/router.go.template
index cc5cd2677..34bf4d891 100644
--- a/server/resource/plugin/server/router/router.go.template
+++ b/server/resource/plugin/server/router/router.go.template
@@ -1,7 +1,7 @@
package router
import (
- {{if .OnlyTemplate }} // {{end}}"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+ {{if .OnlyTemplate }} // {{end}}"{{.Module}}/middleware"
"github.com/gin-gonic/gin"
)
diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template
index e62426d44..d48aa36cd 100644
--- a/server/resource/plugin/server/service/service.go.template
+++ b/server/resource/plugin/server/service/service.go.template
@@ -1,10 +1,66 @@
+{{- $db := "" }}
+{{- if eq .BusinessDB "" }}
+ {{- $db = "global.GVA_DB" }}
+{{- else}}
+ {{- $db = printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB }}
+{{- end}}
+
+{{- if .IsAdd}}
+
+// Get{{.StructName}}InfoList 新增搜索语句
+ {{- range .Fields}}
+ {{- if .FieldSearchType}}
+ {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
+if info.{{.FieldName}} != "" {
+ {{- if or (eq .FieldType "enum") }}
+ db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+ {{- else}}
+// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
+ {{- end}}
+}
+ {{- else if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
+ db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
+}
+ {{- else}}
+if info.{{.FieldName}} != nil {
+ db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
+
+// Get{{.StructName}}InfoList 新增排序语句 请自行在搜索语句中添加orderMap内容
+ {{- range .Fields}}
+ {{- if .Sort}}
+orderMap["{{.ColumnName}}"] = true
+ {{- end}}
+ {{- end}}
+
+
+{{- if .HasDataSource }}
+// Get{{.StructName}}DataSource()方法新增关联语句
+ {{range $key, $value := .DataSourceMap}}
+{{$key}} := make([]map[string]any, 0)
+{{ $dataDB := "" }}
+{{- if eq $value.DBName "" }}
+{{ $dataDB = $db }}
+{{- else}}
+{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
+{{- end}}
+{{$dataDB}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
+res["{{$key}}"] = {{$key}}
+ {{- end }}
+{{- end }}
+{{- else}}
package service
import (
{{- if not .OnlyTemplate }}
- "github.com/flipped-aurora/gin-vue-admin/server/global"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model"
- "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model/request"
+ "{{.Module}}/global"
+ "{{.Module}}/plugin/{{.Package}}/model"
+ "{{.Module}}/plugin/{{.Package}}/model/request"
{{- if .AutoCreateResource }}
"gorm.io/gorm"
{{- end}}
@@ -97,9 +153,9 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
{{- end }}
{{- range .Fields}}
{{- if .FieldSearchType}}
- {{- if or (eq .FieldType "string") (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "richtext") (eq .FieldType "json") }}
+ {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
if info.{{.FieldName}} != "" {
- {{- if or (eq .FieldType "enum") (eq .FieldType "string") }}
+ {{- if or (eq .FieldType "enum")}}
db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
{{- else}}
// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
@@ -165,4 +221,5 @@ func (s *{{.Abbreviation}})Get{{.StructName}}DataSource() (res map[string][]map[
func (s *{{.Abbreviation}})Get{{.StructName}}Public() {
-}
\ No newline at end of file
+}
+{{- end }}
\ No newline at end of file
diff --git a/server/resource/plugin/web/form/form.vue.template b/server/resource/plugin/web/form/form.vue.template
index 882501e78..19499aa4a 100644
--- a/server/resource/plugin/web/form/form.vue.template
+++ b/server/resource/plugin/web/form/form.vue.template
@@ -1,3 +1,158 @@
+{{- if .IsAdd }}
+// 新增表单中增加如下代码
+{{- range .Fields}}
+ {{- if .Form}}
+
+ {{- if .CheckDataSource}}
+
+
+
+ {{- else }}
+ {{- if eq .FieldType "bool" }}
+
+ {{- end }}
+ {{- if eq .FieldType "string" }}
+ {{- if .DictType}}
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- if eq .FieldType "richtext" }}
+
+ {{- end }}
+ {{- if eq .FieldType "json" }}
+ // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+ {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "int" }}
+
+ {{- end }}
+ {{- if eq .FieldType "time.Time" }}
+
+ {{- end }}
+ {{- if eq .FieldType "float64" }}
+
+ {{- end }}
+ {{- if eq .FieldType "enum" }}
+
+
+
+ {{- end }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "video" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+ {{- end }}
+ {{- end }}
+
+ {{- end }}
+ {{- end }}
+
+// 字典增加如下代码
+ {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+ {{- 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: '不能只输入空格',
+ 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}}
@@ -248,4 +403,5 @@ const back = () => {
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index 05a5fb924..88f0e9a9d 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -1,5 +1,352 @@
{{- $global := . }}
{{- $templateID := printf "%s_%s" .Package .StructName }}
+
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
+
+
+
+
+
+
+
+
+ {{- else if .DictType}}
+
+
+
+
+
+ {{- else if .CheckDataSource}}
+
+
+
+
+
+ {{- else}}
+
+ {{- if eq .FieldType "float64" "int"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+—
+
+ {{- else}}
+ {{- if .DictType}}
+
+
+
+ {{- else}}
+
+ {{- end }}
+ {{- end}}
+ {{- else if eq .FieldType "time.Time"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+
+{{.FieldDesc}}
+
+
+
+
+
+
+—
+
+ {{- else}}
+
+ {{- end}}
+ {{- else}}
+
+ {{- end}}
+{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+ {{- if .Table}}
+ {{- if .CheckDataSource }}
+
+
+ {{if eq .DataSource.Association 2}}
+
+ {{ "{{ item }}" }}
+
+ {{ else }}
+ {{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}
+ {{ end }}
+
+
+ {{- else if .DictType}}
+
+
+ {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+
+
+ {{- else if eq .FieldType "bool" }}
+
+ {{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "time.Time" }}
+
+ {{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "picture" }}
+
+
+
+
+
+ {{- else if eq .FieldType "pictures" }}
+
+
+
+
+
+
+
+ {{- else if eq .FieldType "video" }}
+
+
+
+
+
+ {{- else if eq .FieldType "richtext" }}
+
+
+ [富文本内容]
+
+
+ {{- else if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}file.name{{"}}"}}
+
+
+
+ {{- else if eq .FieldType "json" }}
+
+
+ [JSON]
+
+
+ {{- else if eq .FieldType "array" }}
+
+
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+ {{- if .Form}}
+
+ {{- if .CheckDataSource}}
+
+
+
+ {{- else }}
+ {{- if eq .FieldType "bool" }}
+
+ {{- end }}
+ {{- if eq .FieldType "string" }}
+ {{- if .DictType}}
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- if eq .FieldType "richtext" }}
+
+ {{- end }}
+ {{- if eq .FieldType "json" }}
+ // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+ {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "int" }}
+
+ {{- end }}
+ {{- if eq .FieldType "time.Time" }}
+
+ {{- end }}
+ {{- if eq .FieldType "float64" }}
+
+ {{- end }}
+ {{- if eq .FieldType "enum" }}
+
+
+
+ {{- end }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "video" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+ {{- end }}
+ {{- end }}
+
+ {{- end }}
+ {{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+ {{- if .Desc }}
+
+ {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+ {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+ {{- else }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}item.name{{"}}"}}
+
+
+ {{- end }}
+ {{- end }}
+
+ {{- 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: '不能只输入空格',
+ 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}}
@@ -41,6 +388,12 @@
+ {{- else if .CheckDataSource}}
+
+
+
+
+
{{- else}}
{{- if eq .FieldType "float64" "int"}}
@@ -264,8 +617,8 @@
{{- end }}
- 查看详情
- 变更
+ 查看
+ 编辑
删除
@@ -285,7 +638,7 @@
-
{{"{{"}}type==='create'?'添加':'修改'{{"}}"}}
+
{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}
确 定
取 消
@@ -369,7 +722,7 @@
-
+
{{- range .Fields}}
{{- if .Desc }}
@@ -912,4 +1265,5 @@ defineOptions({
-{{- end}}
\ No newline at end of file
+{{- end}}
+{{- end}}
diff --git a/server/service/system/auto_code_template.go b/server/service/system/auto_code_template.go
index 542072ec7..bf366ee1b 100644
--- a/server/service/system/auto_code_template.go
+++ b/server/service/system/auto_code_template.go
@@ -290,6 +290,32 @@ func (s *autoCodeTemplate) AddFunc(info request.AutoFunc) error {
return nil
}
+func (s *autoCodeTemplate) GetApiAndServer(info request.AutoFunc) (map[string]string, error) {
+ autoPkg := model.SysAutoCodePackage{}
+ err := global.GVA_DB.First(&autoPkg, "package_name = ?", info.Package).Error
+ if err != nil {
+ return nil, err
+ }
+ if autoPkg.Template != "package" {
+ info.IsPlugin = true
+ }
+
+ apiStr, err := s.getTemplateStr("api.go", info)
+ if err != nil {
+ return nil, err
+ }
+ serverStr, err := s.getTemplateStr("server.go", info)
+ if err != nil {
+ return nil, err
+ }
+ jsStr, err := s.getTemplateStr("api.js", info)
+ if err != nil {
+ return nil, err
+ }
+ return map[string]string{"api": apiStr, "server": serverStr, "js": jsStr}, nil
+
+}
+
func (s *autoCodeTemplate) getTemplateStr(t string, info request.AutoFunc) (string, error) {
tempPath := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "resource", "function", t+".tpl")
files, err := template.ParseFiles(tempPath)
@@ -374,10 +400,19 @@ func (s *autoCodeTemplate) addTemplateToFile(t string, info request.AutoFunc) er
switch t {
case "api.go":
+ if info.IsAi && info.ApiFunc != "" {
+ getTemplateStr = info.ApiFunc
+ }
target = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", info.Package, info.HumpPackageName+".go")
case "server.go":
+ if info.IsAi && info.ServerFunc != "" {
+ getTemplateStr = info.ServerFunc
+ }
target = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "service", info.Package, info.HumpPackageName+".go")
case "api.js":
+ if info.IsAi && info.JsFunc != "" {
+ getTemplateStr = info.JsFunc
+ }
target = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Web, "api", info.Package, info.PackageName+".js")
}
if info.IsPlugin {
diff --git a/server/utils/upload/minio_oss.go b/server/utils/upload/minio_oss.go
new file mode 100644
index 000000000..3a6af72ce
--- /dev/null
+++ b/server/utils/upload/minio_oss.go
@@ -0,0 +1,98 @@
+package upload
+
+import (
+ "bytes"
+ "context"
+ "errors"
+ "io"
+ "mime/multipart"
+ "path/filepath"
+ "strings"
+ "time"
+
+ "github.com/flipped-aurora/gin-vue-admin/server/global"
+ "github.com/flipped-aurora/gin-vue-admin/server/utils"
+ "github.com/minio/minio-go/v7"
+ "github.com/minio/minio-go/v7/pkg/credentials"
+ "go.uber.org/zap"
+)
+
+var MinioClient *Minio // 优化性能，但是不支持动态配置
+
+type Minio struct {
+ Client *minio.Client
+ bucket string
+}
+
+func GetMinio(endpoint, accessKeyID, secretAccessKey, bucketName string, useSSL bool) (*Minio, error) {
+ if MinioClient != nil {
+ return MinioClient, nil
+ }
+ // Initialize minio client object.
+ minioClient, err := minio.New(endpoint, &minio.Options{
+ Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
+ Secure: useSSL, // Set to true if using https
+ })
+ if err != nil {
+ return nil, err
+ }
+ // 尝试创建bucket
+ err = minioClient.MakeBucket(context.Background(), bucketName, minio.MakeBucketOptions{})
+ if err != nil {
+ // Check to see if we already own this bucket (which happens if you run this twice)
+ exists, errBucketExists := minioClient.BucketExists(context.Background(), bucketName)
+ if errBucketExists == nil && exists {
+ // log.Printf("We already own %s\n", bucketName)
+ } else {
+ return nil, err
+ }
+ }
+ MinioClient = &Minio{Client: minioClient, bucket: bucketName}
+ return MinioClient, nil
+}
+
+func (m *Minio) UploadFile(file *multipart.FileHeader) (filePathres, key string, uploadErr error) {
+ f, openError := file.Open()
+ // mutipart.File to os.File
+ if openError != nil {
+ global.GVA_LOG.Error("function file.Open() Failed", zap.Any("err", openError.Error()))
+ return "", "", errors.New("function file.Open() Failed, err:" + openError.Error())
+ }
+
+ filecontent := bytes.Buffer{}
+ _, err := io.Copy(&filecontent, f)
+ if err != nil {
+ global.GVA_LOG.Error("读取文件失败", zap.Any("err", err.Error()))
+ return "", "", errors.New("读取文件失败, err:" + err.Error())
+ }
+ f.Close() // 创建文件 defer 关闭
+
+
+ // 对文件名进行加密存储
+ ext := filepath.Ext(file.Filename)
+ filename := utils.MD5V([]byte(strings.TrimSuffix(file.Filename, ext))) + ext
+ if global.GVA_CONFIG.Minio.BasePath == "" {
+ filePathres = "uploads" + "/" + time.Now().Format("2006-01-02") + "/" + filename
+ } else {
+ filePathres = global.GVA_CONFIG.Minio.BasePath + "/" + time.Now().Format("2006-01-02") + "/" + filename
+ }
+
+ // 设置超时10分钟
+ ctx, cancel := context.WithTimeout(context.Background(), time.Minute*10)
+ defer cancel()
+
+ // Upload the file with PutObject 大文件自动切换为分片上传
+ info, err := m.Client.PutObject(ctx, global.GVA_CONFIG.Minio.BucketName, filePathres, &filecontent, file.Size, minio.PutObjectOptions{ContentType: "application/octet-stream"})
+ if err != nil {
+ global.GVA_LOG.Error("上传文件到minio失败", zap.Any("err", err.Error()))
+ return "", "", errors.New("上传文件到minio失败, err:" + err.Error())
+ }
+ return global.GVA_CONFIG.Minio.BucketUrl + "/" + info.Key, filePathres, nil
+}
+
+func (m *Minio) DeleteFile(key string) error {
+ // Delete the object from MinIO
+ ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
+ err := m.Client.RemoveObject(ctx, m.bucket, key, minio.RemoveObjectOptions{})
+ return err
+}
diff --git a/server/utils/upload/upload.go b/server/utils/upload/upload.go
index 72fa44429..28266ab18 100644
--- a/server/utils/upload/upload.go
+++ b/server/utils/upload/upload.go
@@ -33,6 +33,13 @@ func NewOss() OSS {
return &AwsS3{}
case "cloudflare-r2":
return &CloudflareR2{}
+ case "minio":
+ minioClient, err := GetMinio(global.GVA_CONFIG.Minio.Endpoint, global.GVA_CONFIG.Minio.AccessKeyId, global.GVA_CONFIG.Minio.AccessKeySecret, global.GVA_CONFIG.Minio.BucketName, global.GVA_CONFIG.Minio.UseSSL)
+ if err != nil {
+ global.GVA_LOG.Warn("你配置了使用minio，但是初始化失败，请检查minio可用性或安全配置: " + err.Error())
+ panic("minio初始化失败") // 建议这样做，用户自己配置了minio，如果报错了还要把服务开起来，使用起来也很危险
+ }
+ return minioClient
default:
return &Local{}
}
diff --git a/web/package.json b/web/package.json
index bf2d07abc..dc7131596 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,6 +10,9 @@
"fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
},
"dependencies": {
+ "@codemirror/lang-go": "^6.0.1",
+ "@codemirror/lang-javascript": "^6.2.2",
+ "@codemirror/theme-one-dark": "^6.1.2",
"@element-plus/icons-vue": "^2.3.1",
"@form-create/designer": "^3.2.6",
"@form-create/element-ui": "^3.2.10",
@@ -21,10 +24,11 @@
"@wangeditor/editor-for-vue": "^5.1.12",
"axios": "^1.7.7",
"chokidar": "^4.0.0",
+ "codemirror": "^6.0.1",
"core-js": "^3.38.1",
"default-passive-events": "^2.0.0",
"echarts": "5.5.1",
- "element-plus": "^2.8.4",
+ "element-plus": "^2.8.5",
"highlight.js": "^11.10.0",
"js-cookie": "^3.0.5",
"marked": "14.1.1",
@@ -41,6 +45,7 @@
"vform3-builds": "^3.0.10",
"vite-auto-import-svg": "^1.1.0",
"vue": "^3.5.7",
+ "vue-codemirror": "^6.1.1",
"vue-echarts": "^7.0.3",
"vue-router": "^4.4.3",
"vuedraggable": "^4.1.0"
diff --git a/web/src/main.js b/web/src/main.js
index 766c970d1..8f43f06ad 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -13,7 +13,7 @@ import run from '@/core/gin-vue-admin.js'
import auth from '@/directive/auth'
import { store } from '@/pinia'
import App from './App.vue'
-//消除警告
+// 消除警告
import 'default-passive-events'
const app = createApp(App)
diff --git a/web/src/pathInfo.json b/web/src/pathInfo.json
index 23497294c..e08798c04 100644
--- a/web/src/pathInfo.json
+++ b/web/src/pathInfo.json
@@ -51,7 +51,7 @@
"/src/view/superAdmin/user/user.vue": "User",
"/src/view/system/state.vue": "State",
"/src/view/systemTools/autoCode/component/fieldDialog.vue": "FieldDialog",
- "/src/view/systemTools/autoCode/component/previewCodeDialg.vue": "PreviewCodeDialg",
+ "/src/view/systemTools/autoCode/component/previewCodeDialog.vue": "PreviewCodeDialog",
"/src/view/systemTools/autoCode/index.vue": "AutoCode",
"/src/view/systemTools/autoCodeAdmin/index.vue": "AutoCodeAdmin",
"/src/view/systemTools/autoPkg/autoPkg.vue": "AutoPkg",
diff --git a/web/src/view/layout/aside/asideComponent/menuItem.vue b/web/src/view/layout/aside/asideComponent/menuItem.vue
index b20bbfb60..a43b24afd 100644
--- a/web/src/view/layout/aside/asideComponent/menuItem.vue
+++ b/web/src/view/layout/aside/asideComponent/menuItem.vue
@@ -1,7 +1,7 @@
+ >
@@ -19,11 +19,23 @@ import { Marked } from "marked";
import { markedHighlight } from "marked-highlight";
import hljs from 'highlight.js'
import { ElMessage } from 'element-plus'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watchEffect } from 'vue'
import {useAppStore} from "@/pinia";
const appStore = useAppStore()
+const useCode = ref({})
+
+const createKey = [
+ "enter.go",
+ "gorm_biz.go",
+ "router_biz.go",
+ "api",
+ "router",
+ "initialize",
+ "gen.go",
+]
+
onMounted(() => {
const isDarkMode = appStore.config.darkMode === 'dark';
if (isDarkMode) {
@@ -39,6 +51,19 @@ const props = defineProps({
default() {
return {}
}
+ },
+ isAdd: {
+ type: Boolean,
+ default: false
+ }
+})
+
+watchEffect(() => {
+ for (const key in props.previewCode) {
+ if (props.isAdd && createKey.some(createKeyItem => key.includes(createKeyItem))) {
+ continue;
+ }
+ useCode.value[key] = props.previewCode[key]
}
})
@@ -48,7 +73,6 @@ onMounted(() => {
markedHighlight({
langPrefix: 'hljs language-',
highlight(code, lang, info) {
- console.log(code,lang,info)
const language = hljs.getLanguage(lang) ? lang : 'plaintext';
if (lang === 'vue') {
return hljs.highlight(code, { language: 'html' }).value;
@@ -57,11 +81,11 @@ onMounted(() => {
}
})
);
- for (const key in props.previewCode) {
+ for (const key in useCode.value) {
if (activeName.value === '') {
activeName.value = key
}
- document.getElementById(key).innerHTML = marked.parse(props.previewCode[key])
+ document.getElementById(key).innerHTML = marked.parse(useCode.value[key])
}
})
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 62d952f74..55cd21116 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -4,7 +4,7 @@
href="https://www.bilibili.com/video/BV1kv4y1g7nT?p=3"
title="此功能为开发环境使用，不建议发布到生产，具体使用效果请点我观看。"
/>
-
+
-
+
从数据库创建
自动化结构
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -551,7 +554,7 @@
label="字段Json"
>
-
+
-
+
-
+
-
+
导出json
@@ -697,32 +704,35 @@
show-file-list="false"
accept=".json"
>
- 导入json
+ 导入json
清除暂存
暂存
- 预览代码
-
-
生成代码
+
+ {{isAdd?'查看代码':'预览代码'}}
+
@@ -784,6 +794,7 @@
@@ -794,7 +805,7 @@
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 0130bdd1f..bff67d2c4 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -22,9 +22,6 @@ module.exports = {
},
},
darkMode: "class",
- plugins: [],
- corePlugins: {
- preflight: false
- }
+ plugins: []
}
diff --git a/web/vitePlugin/componentName/index.js b/web/vitePlugin/componentName/index.js
index 66d3ec065..78a4840b6 100644
--- a/web/vitePlugin/componentName/index.js
+++ b/web/vitePlugin/componentName/index.js
@@ -55,7 +55,6 @@ const vueFilePathPlugin = (outputFilePath) => {
const watchDirectories = [path.join(root, 'src/view'), path.join(root, 'src/plugin')];
const watcher = chokidar.watch(watchDirectories, { persistent: true, ignoreInitial: true });
watcher.on('all', (event, path) => {
- console.log(`File ${path} has been ${event}`);
generatePathNameMap();
});
};
@@ -67,8 +66,10 @@ const vueFilePathPlugin = (outputFilePath) => {
configResolved(resolvedConfig) {
root = resolvedConfig.root;
},
- buildEnd() {
+ buildStart() {
generatePathNameMap();
+ },
+ buildEnd() {
if (process.env.NODE_ENV === 'development') {
watchDirectoryChanges();
}