Merge pull request #1 from gochore/dev

wolfogre · web-flow · commit 5455592044ac · 2020-04-07T15:10:22.000+08:00
update style; support map dataset
diff --git a/email.go b/email.go
@@ -22,7 +22,7 @@ func (e *Email) Render(writer io.Writer) error {
   <title></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 </head>
-<body style="margin: 0; padding: 0;">
+<body>
 `)
 
 	for _, element := range e.elements {
diff --git a/email_test.go b/email_test.go
@@ -26,16 +26,16 @@ func TestEmail_Render(t *testing.T) {
 			fields: fields{
 				elements: []Element{
 					Table{
-						Dataset: []interface{}{
-							TestStruct1{
+						Dataset: []TestStruct1{
+							{
 								A: "a1",
 								B: 1,
 							},
-							TestStruct1{
+							{
 								A: "a2",
 								B: 2,
 							},
-							TestStruct1{
+							{
 								A: "a3",
 								B: 3,
 							},
diff --git a/table.go b/table.go
@@ -5,11 +5,12 @@ import (
 	"html/template"
 	"io"
 	"reflect"
+	"sort"
 	"strings"
 )
 
 type Table struct {
-	Dataset    []interface{}
+	Dataset    interface{}
 	Columns    []Column
 	Attr       Attributes
 	HeaderAttr Attributes
@@ -24,7 +25,7 @@ func NewTable() Table {
 	}
 }
 
-func (t Table) WithDataset(dataset []interface{}) Table {
+func (t Table) WithDataset(dataset interface{}) Table {
 	t.Dataset = dataset
 	return t
 }
@@ -35,31 +36,58 @@ func (t Table) WithColumns(columns []Column) Table {
 }
 
 func (t Table) Render(writer io.Writer) error {
-	if len(t.Dataset) == 0 {
+	dataset := reflect.ValueOf(t.Dataset)
+	if dataset.Kind() != reflect.Slice {
+		return fmt.Errorf("%v is not a slice", dataset.Type())
+	}
+
+	if dataset.Len() == 0 {
 		return fmt.Errorf("empty data")
 	}
 
-	typ := reflect.TypeOf(t.Dataset[0])
-	if typ.Kind() != reflect.Struct {
+	mapItem := false
+	typ := dataset.Index(0).Type()
+	switch typ.Kind() {
+	case reflect.Map:
+		mapItem = true
+	case reflect.Struct:
+		// do nothing
+	default:
+		return fmt.Errorf("unsupported slice item type: %v", typ)
+	}
+	if typ.Kind() != reflect.Struct && typ.Kind() != reflect.Map {
 		return fmt.Errorf("%v is not a struct", typ)
 	}
 
-	for i, v := range t.Dataset {
-		t := reflect.TypeOf(v)
-		if t != typ {
+	for i := 0; i < dataset.Len(); i++ {
+		if t := dataset.Index(i).Type(); t != typ {
 			return fmt.Errorf("item %v is %v, not %v", i, t, typ)
 		}
 	}
 
 	columns := t.Columns
 	if len(columns) == 0 {
-		numField := typ.NumField()
-		for i := 0; i < numField; i++ {
-			field := typ.Field(i)
-			columns = append(columns, Column{
-				Name:     field.Name,
-				Template: fmt.Sprintf("{{.%s}}", field.Name),
-			})
+		if mapItem {
+			var keys []string
+			for _, v := range dataset.Index(0).MapKeys() {
+				keys = append(keys, fmt.Sprint(v.Interface()))
+			}
+			sort.Strings(keys)
+			for _, key := range keys {
+				columns = append(columns, Column{
+					Name:     key,
+					Template: fmt.Sprintf("{{.%s}}", key),
+				})
+			}
+		} else {
+			numField := typ.NumField()
+			for i := 0; i < numField; i++ {
+				field := typ.Field(i)
+				columns = append(columns, Column{
+					Name:     field.Name,
+					Template: fmt.Sprintf("{{.%s}}", field.Name),
+				})
+			}
 		}
 	}
 	var rowTemplate *template.Template
@@ -88,8 +116,8 @@ func (t Table) Render(writer io.Writer) error {
 	}
 	render.Println("</tr>")
 
-	for _, row := range t.Dataset {
-		if err := rowTemplate.Execute(render, row); err != nil {
+	for i := 0; i < dataset.Len(); i++ {
+		if err := rowTemplate.Execute(render, dataset.Index(i)); err != nil {
 			return fmt.Errorf("Execute: %w", err)
 		}
 		render.Println()
@@ -107,12 +135,12 @@ type Column struct {
 
 var (
 	DefaultTableAttr = Attributes{
-		{Name: "style", Value: "font-family: verdana,arial,sans-serif;font-size:14px;color:#333333;border-width: 1px;border-color: #666666;border-collapse: collapse;"},
+		{Name: "style", Value: "border:1px black solid; padding:3px 3px 3px 3px; border-collapse:collapse;"},
 	}
 	DefaultTableHeaderAttr = Attributes{
-		{Name: "style", Value: "border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;"},
+		{Name: "style", Value: "border:1px black solid; padding:3px 3px 3px 3px; border-collapse:collapse; background-color:#dedede;"},
 	}
 	DefaultTableDataAttr = Attributes{
-		{Name: "style", Value: "border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff"},
+		{Name: "style", Value: "border:1px black solid; padding:3px 3px 3px 3px; border-collapse:collapse;"},
 	}
 )
diff --git a/table_test.go b/table_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestTable_Render(t1 *testing.T) {
 	type fields struct {
-		Dataset []interface{}
+		Dataset interface{}
 		Columns []Column
 	}
 	tests := []struct {
@@ -24,16 +24,16 @@ func TestTable_Render(t1 *testing.T) {
 		{
 			name: "regular",
 			fields: fields{
-				Dataset: []interface{}{
-					TestStruct1{
+				Dataset: []TestStruct1{
+					{
 						A: "a1",
 						B: 1,
 					},
-					TestStruct1{
+					{
 						A: "a2",
 						B: 2,
 					},
-					TestStruct1{
+					{
 						A: "a3",
 						B: 3,
 					},
@@ -45,16 +45,16 @@ func TestTable_Render(t1 *testing.T) {
 		{
 			name: "with_columns",
 			fields: fields{
-				Dataset: []interface{}{
-					TestStruct1{
+				Dataset: []TestStruct1{
+					{
 						A: "a1",
 						B: 1,
 					},
-					TestStruct1{
+					{
 						A: "a2",
 						B: 2,
 					},
-					TestStruct1{
+					{
 						A: "a3",
 						B: 3,
 					},
@@ -76,6 +76,27 @@ func TestTable_Render(t1 *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "map_dataset",
+			fields: fields{
+				Dataset: []map[string]interface{}{
+					{
+						"A": "a1",
+						"B": 1,
+					},
+					{
+						"A": "a2",
+						"B": 2,
+					},
+					{
+						"A": "a3",
+						"B": 3,
+					},
+				},
+				Columns: nil,
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t1.Run(tt.name, func(t1 *testing.T) {
