Skip to content

Commit 4b54262

Browse files
author
piexlmax（奇淼
committed
Merge remote-tracking branch 'origin/main'
2 parents 458b035 + 379b632 commit 4b54262

File tree

15 files changed

+311
-125
lines changed

15 files changed

+311
-125
lines changed

‎server/model/system/response/sys_auto_code.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ type Column struct {
1313
ColumnName string `json:"columnName" gorm:"column:column_name"`
1414
DataTypeLong string `json:"dataTypeLong" gorm:"column:data_type_long"`
1515
ColumnComment string `json:"columnComment" gorm:"column:column_comment"`
16+
PrimaryKey bool `json:"primaryKey" gorm:"column:primary_key"`
1617
}

‎server/model/system/sys_auto_code.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ type AutoCodeStruct struct {
2020
AutoCreateResource bool `json:"autoCreateResource"` // 是否自动创建资源标识
2121
AutoMoveFile bool `json:"autoMoveFile"` // 是否自动移动文件
2222
BusinessDB string `json:"businessDB"` // 业务数据库
23-
Fields []*Field `json:"fields,omitempty"`
24-
HasTimer bool
23+
GvaModel bool `json:"gvaModel"` // 是否使用gva默认Model
24+
Fields []*Field `json:"fields"`
25+
PrimaryField *Field `json:"primaryField"`
26+
HasTimer bool `json:"-"`
27+
HasSearchTimer bool `json:"-"`
2528
DictTypes []string `json:"-"`
2629
Package string `json:"package"`
2730
PackageT string `json:"-"`
@@ -67,6 +70,7 @@ type Field struct {
6770
ErrorText string `json:"errorText"` // 校验失败文字
6871
Clearable bool `json:"clearable"` // 是否可清空
6972
Sort bool `json:"sort"` // 是否增加排序
73+
PrimaryKey bool `json:"primaryKey"` // 是否主键
7074
}
7175

7276
var ErrAutoMove error = errors.New("创建代码成功并移动文件成功")

‎server/resource/autocode_template/server/api.go.tpl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Con
5757
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
5858
// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete]
5959
func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Context) {
60-
id := c.Query("ID")
60+
{{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}")
6161
{{- if .AutoCreateResource }}
6262
userID := utils.GetUserID(c)
6363
{{- end }}
64-
if err := {{.Abbreviation}}Service.Delete{{.StructName}}(id{{- if .AutoCreateResource -}},userID{{- end -}}); err != nil {
64+
if err := {{.Abbreviation}}Service.Delete{{.StructName}}({{.PrimaryField.FieldJson}} {{- if .AutoCreateResource -}},userID{{- end -}}); err != nil {
6565
global.GVA_LOG.Error("删除失败!", zap.Error(err))
6666
response.FailWithMessage("删除失败", c)
6767
} else {
@@ -75,15 +75,14 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Con
7575
// @Security ApiKeyAuth
7676
// @accept application/json
7777
// @Produce application/json
78-
// @Param data body request.IdsReq true "批量删除{{.Description}}"
7978
// @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}"
8079
// @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete]
8180
func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gin.Context) {
82-
ids := c.QueryArray("ids[]")
81+
{{.PrimaryField.FieldJson}}s := c.QueryArray("{{.PrimaryField.FieldJson}}s[]")
8382
{{- if .AutoCreateResource }}
8483
userID := utils.GetUserID(c)
8584
{{- end }}
86-
if err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds(ids{{- if .AutoCreateResource }},userID{{- end }}); err != nil {
85+
if err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s{{- if .AutoCreateResource }},userID{{- end }}); err != nil {
8786
global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
8887
response.FailWithMessage("批量删除失败", c)
8988
} else {
@@ -129,8 +128,8 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
129128
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
130129
// @Router /{{.Abbreviation}}/find{{.StructName}} [get]
131130
func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) {
132-
id := c.Query("ID")
133-
if re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}(id); err != nil {
131+
{{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}")
132+
if re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}({{.PrimaryField.FieldJson}}); err != nil {
134133
global.GVA_LOG.Error("查询失败!", zap.Error(err))
135134
response.FailWithMessage("查询失败", c)
136135
} else {

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,31 @@
22
package {{.Package}}
33

44
import (
5-
"github.com/flipped-aurora/gin-vue-admin/server/global"
6-
{{ if .HasTimer }}"time"{{ end }}
5+
{{ if .GvaModel }}"github.com/flipped-aurora/gin-vue-admin/server/global"{{ end }}
6+
{{ if or .HasTimer }}"time"{{ end }}
77
{{ if .NeedJSON }}"gorm.io/datatypes"{{ end }}
88
)
99

1010
// {{.Description}} 结构体 {{.StructName}}
1111
type {{.StructName}} struct {
12-
global.GVA_MODEL {{- range .Fields}}
12+
{{ if .GvaModel }} global.GVA_MODEL {{ end }}
13+
{{- range .Fields}}
1314
{{- if eq .FieldType "enum" }}
14-
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require -}}binding:"required"{{- end -}}`
15+
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require -}}binding:"required"{{- end -}}`
1516
{{- else if eq .FieldType "picture" }}
16-
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
17+
{{.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 -}}`
1718
{{- else if eq .FieldType "video" }}
18-
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
19+
{{.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 -}}`
1920
{{- else if eq .FieldType "file" }}
20-
{{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
21+
{{.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 -}}`
2122
{{- else if eq .FieldType "pictures" }}
22-
{{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
23+
{{.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 -}}`
2324
{{- else if eq .FieldType "richtext" }}
24-
{{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require -}}binding:"required"{{- end -}}`
25+
{{.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 -}}`
2526
{{- else if ne .FieldType "string" }}
26-
{{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
27+
{{.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 -}}`
2728
{{- else }}
28-
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}`
29+
{{.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 -}}`
2930
{{- end }} {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }} {{- end }}
3031
{{- if .AutoCreateResource }}
3132
CreatedBy uint `gorm:"column:created_by;comment:创建者"`

‎server/resource/autocode_template/server/request.go.tpl‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ package request
22

33
import (
44
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
5-
"time"
5+
{{ if or .HasSearchTimer .GvaModel}}"time"{{ end }}
66
{{ if .NeedJSON }}"gorm.io/datatypes"{{ end }}
77
)
88

99
type {{.StructName}}Search struct{
10-
StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
11-
EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
10+
{{ if .GvaModel }}
11+
StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
12+
EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
13+
{{ end }}
1214
{{- range .Fields}}
1315
{{- if ne .FieldSearchType ""}}
1416
{{- if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}

‎server/resource/autocode_template/server/service.go.tpl‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,38 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service) Create{{.StructName}}({{
2828

2929
// Delete{{.StructName}} 删除{{.Description}}记录
3030
// Author [piexlmax](https://github.com/piexlmax)
31-
func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}(id string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) {
31+
func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}({{.PrimaryField.FieldJson}} string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) {
3232
{{- if .AutoCreateResource }}
3333
err = {{$db}}.Transaction(func(tx *gorm.DB) error {
34-
if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("id = ?", id).Update("deleted_by", userID).Error; err != nil {
34+
if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).Update("deleted_by", userID).Error; err != nil {
3535
return err
3636
}
37-
if err = tx.Delete(&{{.Package}}.{{.StructName}}{},"id = ?",id).Error; err != nil {
37+
if err = tx.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error; err != nil {
3838
return err
3939
}
4040
return nil
4141
})
4242
{{- else }}
43-
err = {{$db}}.Delete(&{{.Package}}.{{.StructName}}{},"id = ?",id).Error
43+
err = {{$db}}.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error
4444
{{- end }}
4545
return err
4646
}
4747

4848
// Delete{{.StructName}}ByIds 批量删除{{.Description}}记录
4949
// Author [piexlmax](https://github.com/piexlmax)
50-
func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds(ids []string{{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) {
50+
func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s []string {{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) {
5151
{{- if .AutoCreateResource }}
5252
err = {{$db}}.Transaction(func(tx *gorm.DB) error {
53-
if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("id in ?", ids).Update("deleted_by", deleted_by).Error; err != nil {
53+
if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Update("deleted_by", deleted_by).Error; err != nil {
5454
return err
5555
}
56-
if err := tx.Where("id in ?", ids).Delete(&{{.Package}}.{{.StructName}}{}).Error; err != nil {
56+
if err := tx.Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Delete(&{{.Package}}.{{.StructName}}{}).Error; err != nil {
5757
return err
5858
}
5959
return nil
6060
})
6161
{{- else}}
62-
err = {{$db}}.Delete(&[]{{.Package}}.{{.StructName}}{},"id in ?",ids).Error
62+
err = {{$db}}.Delete(&[]{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} in ?",{{.PrimaryField.FieldJson}}s).Error
6363
{{- end}}
6464
return err
6565
}
@@ -71,10 +71,10 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Update{{.StructName}}({{.
7171
return err
7272
}
7373

74-
// Get{{.StructName}} 根据id获取{{.Description}}记录
74+
// Get{{.StructName}} 根据{{.PrimaryField.FieldJson}}获取{{.Description}}记录
7575
// Author [piexlmax](https://github.com/piexlmax)
76-
func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}(id string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) {
77-
err = {{$db}}.Where("id = ?", id).First(&{{.Abbreviation}}).Error
76+
func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}({{.PrimaryField.FieldJson}} string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) {
77+
err = {{$db}}.Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).First(&{{.Abbreviation}}).Error
7878
return
7979
}
8080

@@ -87,9 +87,11 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
8787
db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{})
8888
var {{.Abbreviation}}s []{{.Package}}.{{.StructName}}
8989
// 如果有条件搜索 下方会自动创建搜索语句
90+
{{- if .GvaModel }}
9091
if info.StartCreatedAt !=nil && info.EndCreatedAt !=nil {
9192
db = db.Where("created_at BETWEEN ? AND ?", info.StartCreatedAt, info.EndCreatedAt)
9293
}
94+
{{- end }}
9395
{{- range .Fields}}
9496
{{- if .FieldSearchType}}
9597
{{- if or (eq .FieldType "string") (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "richtext") }}

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<div>
33
<div class="gva-search-box">
44
<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
5+
{{- if .GvaModel }}
56
<el-form-item label="创建日期" prop="createdAt">
67
<template #label>
78
<span>
@@ -15,6 +16,7 @@
1516
—
1617
<el-date-picker v-model="searchInfo.endCreatedAt" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.startCreatedAt ? time.getTime() < searchInfo.startCreatedAt.getTime() : false"></el-date-picker>
1718
</el-form-item>
19+
{{ end -}}
1820
{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
1921
<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
2022
<el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择">
@@ -100,16 +102,18 @@
100102
style="width: 100%"
101103
tooltip-effect="dark"
102104
:data="tableData"
103-
row-key="ID"
105+
row-key="{{.PrimaryField.FieldJson}}"
104106
@selection-change="handleSelectionChange"
105107
{{- if .NeedSort}}
106108
@sort-change="sortChange"
107109
{{- end}}
108110
>
109111
<el-table-column type="selection" width="55" />
112+
{{ if .GvaModel }}
110113
<el-table-column align="left" label="日期" width="180">
111114
<template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
112115
</el-table-column>
116+
{{ end }}
113117
{{- range .Fields}}
114118
{{- if .DictType}}
115119
<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
@@ -169,7 +173,7 @@
169173
<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
170174
{{- end }}
171175
{{- end }}
172-
<el-table-column align="left" label="操作" min-width="120">
176+
<el-table-column align="left" label="操作" fixed="right" min-width="240">
173177
<template #default="scope">
174178
<el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
175179
<el-icon style="margin-right: 5px"><InfoFilled /></el-icon>
@@ -536,7 +540,7 @@ const deleteVisible = ref(false)
536540
537541
// 多选删除
538542
const onDelete = async() => {
539-
const ids = []
543+
const {{.PrimaryField.FieldJson}}s = []
540544
if (multipleSelection.value.length === 0) {
541545
ElMessage({
542546
type: 'warning',
@@ -546,15 +550,15 @@ const onDelete = async() => {
546550
}
547551
multipleSelection.value &&
548552
multipleSelection.value.map(item => {
549-
ids.push(item.ID)
553+
{{.PrimaryField.FieldJson}}s.push(item.{{.PrimaryField.FieldJson}})
550554
})
551-
const res = await delete{{.StructName}}ByIds({ ids })
555+
const res = await delete{{.StructName}}ByIds({ {{.PrimaryField.FieldJson}}s })
552556
if (res.code === 0) {
553557
ElMessage({
554558
type: 'success',
555559
message: '删除成功'
556560
})
557-
if (tableData.value.length === ids.length && page.value > 1) {
561+
if (tableData.value.length === {{.PrimaryField.FieldJson}}s.length && page.value > 1) {
558562
page.value--
559563
}
560564
deleteVisible.value = false
@@ -567,7 +571,7 @@ const type = ref('')
567571
568572
// 更新行
569573
const update{{.StructName}}Func = async(row) => {
570-
const res = await find{{.StructName}}({ ID: row.ID })
574+
const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
571575
type.value = 'update'
572576
if (res.code === 0) {
573577
formData.value = res.data.re{{.Abbreviation}}
@@ -578,7 +582,7 @@ const update{{.StructName}}Func = async(row) => {
578582
579583
// 删除行
580584
const delete{{.StructName}}Func = async (row) => {
581-
const res = await delete{{.StructName}}({ ID: row.ID })
585+
const res = await delete{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
582586
if (res.code === 0) {
583587
ElMessage({
584588
type: 'success',
@@ -608,7 +612,7 @@ const openDetailShow = () => {
608612
// 打开详情
609613
const getDetails = async (row) => {
610614
// 打开弹窗
611-
const res = await find{{.StructName}}({ ID: row.ID })
615+
const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
612616
if (res.code === 0) {
613617
formData.value = res.data.re{{.Abbreviation}}
614618
openDetailShow()

0 commit comments

Comments
 (0)