fix Excel.Import return; test valid.Valid

dreamlu · Jan 11, 2024 · 3fb0262 · 3fb0262
1 parent 2ad4037
commit 3fb0262
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/office/excel/excel.go b/office/excel/excel.go
@@ -90,7 +90,7 @@ func (f *Excel[T]) sheetCellCharChange(ch, preCh *int32, pre *string) {
 	return
 }
 
-func (f *Excel[T]) Import(r io.Reader, opts ...excelize.Options) (err error, datas []*T) {
+func (f *Excel[T]) Import(r io.Reader, opts ...excelize.Options) (datas []*T, err error) {
 
 	f.File, err = excelize.OpenReader(r, opts...)
 	if err != nil {
@@ -99,7 +99,7 @@ func (f *Excel[T]) Import(r io.Reader, opts ...excelize.Options) (err error, dat
 	defer f.Close()
 	rows, err := f.GetRows(f.sheet)
 	if err != nil {
-		return err, nil
+		return nil, err
 	}
 
 	var (

diff --git a/office/excel/excel_sugar.go b/office/excel/excel_sugar.go
@@ -11,7 +11,7 @@ import (
 // eg: func (User) ExcelHandle(users []*User) {}
 func Import[T comparable](r io.Reader, opts ...excelize.Options) (datas []*T, err error) {
 	e := NewExcel[T]()
-	err, datas = e.Import(r, opts...)
+	datas, err = e.Import(r, opts...)
 	return
 }
 

diff --git a/office/excel/excel_test.go b/office/excel/excel_test.go
@@ -10,9 +10,9 @@ import (
 
 type User struct {
 	ID     int        `json:"id" gt:"excel:id"`
-	Name   string     `json:"name" gt:"excel:名称"`
+	Name   string     `json:"name" gt:"excel:名称;valid:required,len=2-5;trans:用户名"`
 	Gender int        `json:"gender"`
-	Date   time.CDate `json:"date" gt:"excel:日期"`
+	Date   time.CDate `json:"date" gt:"excel:日期;valid:required"`
 }
 
 func TestExport(t *testing.T) {
@@ -56,6 +56,7 @@ func TestImport(t *testing.T) {
 	}
 	for _, user := range datas {
 		t.Log(user)
+		//t.Log(valid.Valid(user))
 	}
 }