apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-10-05 08:07:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

大量更改，主要是int,float类型支持null、字符串

Browse Source
This commit is contained in:
xiangheng
2024-09-11 18:34:39 +08:00
parent 4176d76157
commit 79fb646900
57 changed files with 1174 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/util/excel2/excel_export.go
View File

@@ -26,7 +26,7 @@ func GetExcelColumnName(columnNumber int) string {
func Export(lists any, cols []Col, sheet string, title string) (file *excelize.File, err error) {
e := ExcelInit()
data := util.ConvertUtil.StructsToMaps(lists)
data := util.ConvertUtil.ShallowStructsToMaps(lists)
err = ExportExcel(sheet, title, data, cols, e)
if err != nil {
@@ -87,7 +87,7 @@ func buildTitle(e *Excel, sheet, title string, cols []Col) (endColName string, s
}
// 构造数据行
func buildDataRow(e *Excel, sheet, endColName string, startDataRow int, lists []map[string]interface{}, cols []Col) (err error) {
func buildDataRow(e *Excel, sheet, endColName string, startDataRow int, lists []map[string]any, cols []Col) (err error) {
//实时写入数据
for i := 0; i < len(lists); i++ {
startCol := fmt.Sprintf("A%d", startDataRow)
@@ -105,7 +105,10 @@ func buildDataRow(e *Excel, sheet, endColName string, startDataRow int, lists []
// 先编码
if col.Encode != nil {
val = col.Encode(val)
} else if v, ok := val.(Encode); ok {
val = v.String()
}
// 再替换
for replaceKey, v := range replace {
@@ -132,4 +135,5 @@ func buildDataRow(e *Excel, sheet, endColName string, startDataRow int, lists []
startDataRow++
}
return
}