fix: 修复数据导入bug

pkg/app/handler/admin/uploads/file.go

@@ -30,6 +30,18 @@ func (p *File) Init() interface{} {
 		"image/jpeg",
 		"image/png",
 		"image/gif",
+		"audio/mpeg",
+		"audo/m4a",
+		"application/msword",
+		"application/x-xls",
+		"application/vnd.ms-excel",
+		"application/x-ppt",
+		"application/vnd.ms-powerpoint",
+		"application/zip",
+		"application/pdf",
+		"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+		"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+		"application/vnd.openxmlformats-officedocument.presentationml.presentation",
 	}
 
 	// 设置文件上传路径
@@ -83,7 +95,7 @@ func (p *File) AfterHandle(ctx *builder.Context, result *storage.FileInfo) inter
 	}
 
 	// 插入数据库
-	(&model.File{}).InsertGetId(&model.File{
+	id, err := (&model.File{}).InsertGetId(&model.File{
 		ObjType: "ADMINID",
 		ObjId:   adminInfo.Id,
 		Name:    result.Name,
@@ -94,6 +106,18 @@ func (p *File) AfterHandle(ctx *builder.Context, result *storage.FileInfo) inter
 		Hash:    result.Hash,
 		Status:  1,
 	})
+	if err != nil {
+		return ctx.JSON(200, msg.Error(err.Error(), ""))
+	}
 
-	return ctx.JSON(200, msg.Success("上传成功", "", result))
+	return ctx.JSON(200, msg.Success("上传成功", "", map[string]interface{}{
+		"id":          id,
+		"contentType": result.ContentType,
+		"ext":         result.Ext,
+		"hash":        result.Hash,
+		"name":        result.Name,
+		"path":        result.Path,
+		"size":        result.Size,
+		"url":         result.Url,
+	}))
 }

pkg/app/handler/admin/uploads/image.go

@@ -313,7 +313,7 @@ func (p *Image) AfterHandle(ctx *builder.Context, result *storage.FileInfo) inte
 	}
 
 	// 插入数据库
-	(&model.Picture{}).InsertGetId(&model.Picture{
+	id, err := (&model.Picture{}).InsertGetId(&model.Picture{
 		ObjType: "ADMINID",
 		ObjId:   adminInfo.Id,
 		Name:    result.Name,
@@ -327,5 +327,20 @@ func (p *Image) AfterHandle(ctx *builder.Context, result *storage.FileInfo) inte
 		Status:  1,
 	})
 
-	return ctx.JSON(200, msg.Success("上传成功", "", result))
+	if err != nil {
+		return ctx.JSON(200, msg.Error(err.Error(), ""))
+	}
+
+	return ctx.JSON(200, msg.Success("上传成功", "", map[string]interface{}{
+		"id":          id,
+		"contentType": result.ContentType,
+		"ext":         result.Ext,
+		"hash":        result.Hash,
+		"height":      result.Height,
+		"width":       result.Width,
+		"name":        result.Name,
+		"path":        result.Path,
+		"size":        result.Size,
+		"url":         result.Url,
+	}))
 }

pkg/app/model/file.go

@@ -154,20 +154,16 @@ func (model *File) GetPaths(id interface{}) []string {
 
 // 获取Excel文件数据
 func (model *File) GetExcelData(fileId int) (data [][]interface{}, Error error) {
-	filePath := ""
 	file := &File{}
 	err := db.Client.Where("id", fileId).Where("status", 1).First(&file).Error
 	if err != nil {
 		return data, err
 	}
-	if file.Id != 0 {
-		filePath = file.Path
-	}
-	if filePath == "" {
+	if file.Id == 0 {
 		return data, errors.New("参数错误！")
 	}
 
-	f, err := excelize.OpenFile(filePath)
+	f, err := excelize.OpenFile(file.Path + file.Name)
 	if err != nil {
 		return data, err
 	}

pkg/builder/engine.go

@@ -19,7 +19,7 @@ const (
 	AppName = "QuarkGo"
 
 	// Version of current package
-	Version = "1.1.24"
+	Version = "1.1.25"
 
 	// 静态文件URL
 	RespositoryURL = "https://github.com/quarkcms/quark-go/tree/main/website/"

pkg/builder/template/adminresource/handlers_import.go

@@ -90,14 +90,13 @@ func (p *ImportRequest) Handle(ctx *builder.Context) interface{} {
 			importFailedData = append(importFailedData, item)
 		}
 
-		submitData := ctx.Template.(interface {
-			BeforeSaving(ctx *builder.Context, data map[string]interface{}) interface{}
-		}).BeforeSaving(ctx, formValues) // 保存前回调
-
-		if value, ok := submitData.(error); ok {
+		submitData, err := ctx.Template.(interface {
+			BeforeSaving(ctx *builder.Context, data map[string]interface{}) (map[string]interface{}, error)
+		}).BeforeSaving(ctx, formValues)
+		if err != nil {
 			importResult = false
 			importFailedNum = importFailedNum + 1 // 记录错误条数
-			item = append(item, value.Error())    // 记录错误信息
+			item = append(item, err.Error())      // 记录错误信息
 
 			//记录错误数据
 			importFailedData = append(importFailedData, item)
@@ -160,19 +159,19 @@ func (p *ImportRequest) Handle(ctx *builder.Context) interface{} {
 
 		f.SetActiveSheet(index)
 
-		filePath := "./storage/app/public/failImports/"
+		filePath := "./website/storage/failImports/"
 		fileName := rand.MakeAlphanumeric(40) + ".xlsx"
 
 		// 不存在路径，则创建
 		if isExist(filePath) == false {
 			err := os.MkdirAll(filePath, 0666)
 			if err != nil {
-				return msg.Error(err.Error(), "")
+				return ctx.JSON(200, msg.Error(err.Error(), ""))
 			}
 		}
 
 		if err := f.SaveAs(filePath + fileName); err != nil {
-			return msg.Error(err.Error(), "")
+			return ctx.JSON(200, msg.Error(err.Error(), ""))
 		}
 
 		importTotalNumTpl := (&tpl.Component{}).
@@ -185,7 +184,7 @@ func (p *ImportRequest) Handle(ctx *builder.Context) interface{} {
 
 		importFailedNumTpl := (&tpl.Component{}).
 			Init().
-			SetBody("失败数量: <span style='color:#ff4d4f'>" + strconv.Itoa(importFailedNum) + "</span> <a href='" + ctx.Host() + "/storage/failImports/" + fileName + "' target='_blank'>下载失败数据</a>")
+			SetBody("失败数量: <span style='color:#ff4d4f'>" + strconv.Itoa(importFailedNum) + "</span> <a href='//" + ctx.Host() + "/storage/failImports/" + fileName + "' target='_blank'>下载失败数据</a>")
 
 		component := (&space.Component{}).
 			Init().
@@ -201,7 +200,7 @@ func (p *ImportRequest) Handle(ctx *builder.Context) interface{} {
 				"marginBottom": "20px",
 			})
 
-		return component
+		return ctx.JSON(200, component)
 	}
 }
 

pkg/builder/template/adminupload/adminupload.go

@@ -64,10 +64,10 @@ func (p *Template) Handle(ctx *builder.Context) interface{} {
 
 	contentTypes := strings.Split(ctx.Header("Content-Type"), "; ")
 	if len(contentTypes) != 2 {
-		return ctx.JSON(200, msg.Error("Content-Type error", ""))
+		return msg.Error("Content-Type error", "")
 	}
 	if contentTypes[0] != "multipart/form-data" {
-		return ctx.JSON(200, msg.Error("Content-Type must use multipart/form-data", ""))
+		return msg.Error("Content-Type must use multipart/form-data", "")
 	}
 
 	limitSize := reflect.
@@ -158,6 +158,9 @@ func (p *Template) Handle(ctx *builder.Context) interface{} {
 				RandName().
 				Path(savePath).
 				Save()
+			if err != nil {
+				return ctx.JSON(200, msg.Error(err.Error(), ""))
+			}
 		}
 	}
 

pkg/storage/contenttype.go

@@ -4,6 +4,10 @@ package storage
 var ContentTypeList = map[string]string{
 	"application/x-dosexec":             "exe",
 	"application/msword":                "doc",
+	"application/vnd.ms-excel":          "xls",
+	"application/x-xls":                 "xls",
+	"application/vnd.ms-powerpoint":     "ppt",
+	"application/x-ppt":                 "ppt",
 	"application/x-dmg":                 "dmg",
 	"application/x-gzip":                "gz",
 	"application/x-rar":                 "rar",