Dev273 (#1868)
* fixed: 修复addFunction下前端api.js无法创建的bug。 * feature: 增加严格角色模式 * Update system.vue * fixed: 多点登录拦截模式下,jwt换票期间不需要拉黑token。 * fixed: 修复使用ast时候产生无意义的换行的问题 * fixed: 修复跨级操作角色权限的越权问题 * feature: 优化严格模式角色鉴权操作。 * fixed: 增加菜单和api设置越权问题的限制 * feature: 增加插件打包前的自动化同步所需菜单和api的功能 * feature: 自动化代码可以默认生成导入导出 * feature: 自动化导入导出对模板进行回滚 * feature: 剔除无用的packfile代码包 * feature: 发布V2.7.3版本公测。 --------- Co-authored-by: task <ms.yangdan@gmail.com>
This commit is contained in:
@@ -126,6 +126,14 @@ func (s *autoCodeTemplate) Create(ctx context.Context, info request.AutoCode) er
|
||||
{SysBaseMenuID: entity.ID, Name: "edit", Desc: "编辑"},
|
||||
{SysBaseMenuID: entity.ID, Name: "info", Desc: "详情"},
|
||||
}
|
||||
if info.HasExcel {
|
||||
excelBtn := []model.SysBaseMenuBtn{
|
||||
{SysBaseMenuID: entity.ID, Name: "exportTemplate", Desc: "导出模板"},
|
||||
{SysBaseMenuID: entity.ID, Name: "exportExcel", Desc: "导出Excel"},
|
||||
{SysBaseMenuID: entity.ID, Name: "importExcel", Desc: "导入Excel"},
|
||||
}
|
||||
entity.MenuBtn = append(entity.MenuBtn, excelBtn...)
|
||||
}
|
||||
}
|
||||
err = global.GVA_DB.WithContext(ctx).Create(&entity).Error
|
||||
id = entity.ID
|
||||
@@ -136,6 +144,31 @@ func (s *autoCodeTemplate) Create(ctx context.Context, info request.AutoCode) er
|
||||
history.MenuID = id
|
||||
}
|
||||
|
||||
if info.HasExcel {
|
||||
dbName := info.BusinessDB
|
||||
name := info.Package + "_" + info.StructName
|
||||
tableName := info.TableName
|
||||
fieldsMap := make(map[string]string, len(info.Fields))
|
||||
for _, field := range info.Fields {
|
||||
if field.Excel {
|
||||
fieldsMap[field.ColumnName] = field.FieldDesc
|
||||
}
|
||||
}
|
||||
templateInfo, _ := json.Marshal(fieldsMap)
|
||||
sysExportTemplate := model.SysExportTemplate{
|
||||
DBName: dbName,
|
||||
Name: name,
|
||||
TableName: tableName,
|
||||
TemplateID: name,
|
||||
TemplateInfo: string(templateInfo),
|
||||
}
|
||||
err = SysExportTemplateServiceApp.CreateSysExportTemplate(&sysExportTemplate)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
history.ExportTemplateID = sysExportTemplate.ID
|
||||
}
|
||||
|
||||
// 创建历史记录
|
||||
history.Templates = templates
|
||||
history.Injections = make(map[string]string, len(injections))
|
||||
|
Reference in New Issue
Block a user