Resolve qax-os#580, revert commit qax-os@5ca7231

nullfy · Feb 18, 2020 · 2d12cfb · 2d12cfb
1 parent 7ecc8e6
commit 2d12cfb
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,11 @@ Here is a minimal example usage that will create XLSX file.
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     f := excelize.NewFile()
@@ -44,7 +48,7 @@ func main() {
     f.SetActiveSheet(index)
     // Save xlsx file by the given path.
     if err := f.SaveAs("Book1.xlsx"); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```
@@ -56,28 +60,32 @@ The following constitutes the bare to read a XLSX document.
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // Get value from cell by given worksheet name and axis.
     cell, err := f.GetCellValue("Sheet1", "B2")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
-    println(cell)
+    fmt.Println(cell)
     // Get all the rows in the Sheet1.
     rows, err := f.GetRows("Sheet1")
     for _, row := range rows {
         for _, colCell := range row {
-            print(colCell, "\t")
+            fmt.Print(colCell, "\t")
         }
-        println()
+        fmt.Println()
     }
 }
 ```
@@ -91,7 +99,11 @@ With Excelize chart generation and management is as easy as a few lines of code.
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     categories := map[string]string{"A2": "Small", "A3": "Normal", "A4": "Large", "B1": "Apple", "C1": "Orange", "D1": "Pear"}
@@ -104,12 +116,12 @@ func main() {
         f.SetCellValue("Sheet1", k, v)
     }
     if err := f.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // Save xlsx file by the given path.
     if err := f.SaveAs("Book1.xlsx"); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```
@@ -120,6 +132,7 @@ func main() {
 package main
 
 import (
+    "fmt"
     _ "image/gif"
     _ "image/jpeg"
     _ "image/png"
@@ -130,24 +143,24 @@ import (
 func main() {
     f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // Insert a picture.
     if err := f.AddPicture("Sheet1", "A2", "image.png", ""); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // Insert a picture to worksheet with scaling.
     if err := f.AddPicture("Sheet1", "D2", "image.jpg", `{"x_scale": 0.5, "y_scale": 0.5}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // Insert a picture offset in the cell with printing support.
     if err := f.AddPicture("Sheet1", "H2", "image.gif", `{"x_offset": 15, "y_offset": 10, "print_obj": true, "lock_aspect_ratio": false, "locked": false}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // Save the xlsx file with the origin path.
     if err = f.Save(); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```

diff --git a/README_zh.md b/README_zh.md
@@ -30,7 +30,11 @@ go get github.com/360EntSecGroup-Skylar/excelize
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     f := excelize.NewFile()
@@ -43,7 +47,7 @@ func main() {
     f.SetActiveSheet(index)
     // 根据指定路径保存文件
     if err := f.SaveAs("Book1.xlsx"); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```
@@ -55,28 +59,32 @@ func main() {
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // 获取工作表中指定单元格的值
     cell, err := f.GetCellValue("Sheet1", "B2")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
-    println(cell)
+    fmt.Println(cell)
     // 获取 Sheet1 上所有单元格
     rows, err := f.GetRows("Sheet1")
     for _, row := range rows {
         for _, colCell := range row {
-            print(colCell, "\t")
+            fmt.Print(colCell, "\t")
         }
-        println()
+        fmt.Println()
     }
 }
 ```
@@ -90,7 +98,11 @@ func main() {
 ```go
 package main
 
-import "github.com/360EntSecGroup-Skylar/excelize"
+import (
+    "fmt"
+
+    "github.com/360EntSecGroup-Skylar/excelize"
+)
 
 func main() {
     categories := map[string]string{"A2": "Small", "A3": "Normal", "A4": "Large", "B1": "Apple", "C1": "Orange", "D1": "Pear"}
@@ -103,12 +115,12 @@ func main() {
         f.SetCellValue("Sheet1", k, v)
     }
     if err := f.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"}}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // 根据指定路径保存文件
     if err := f.SaveAs("Book1.xlsx"); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```
@@ -119,6 +131,7 @@ func main() {
 package main
 
 import (
+    "fmt"
     _ "image/gif"
     _ "image/jpeg"
     _ "image/png"
@@ -129,24 +142,24 @@ import (
 func main() {
     f, err := excelize.OpenFile("Book1.xlsx")
     if err != nil {
-        println(err.Error())
+        fmt.Println(err)
         return
     }
     // 插入图片
     if err := f.AddPicture("Sheet1", "A2", "image.png", ""); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // 在工作表中插入图片，并设置图片的缩放比例
     if err := f.AddPicture("Sheet1", "D2", "image.jpg", `{"x_scale": 0.5, "y_scale": 0.5}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // 在工作表中插入图片，并设置图片的打印属性
     if err := f.AddPicture("Sheet1", "H2", "image.gif", `{"x_offset": 15, "y_offset": 10, "print_obj": true, "lock_aspect_ratio": false, "locked": false}`); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
     // 保存文件
     if err = f.Save(); err != nil {
-        println(err.Error())
+        fmt.Println(err)
     }
 }
 ```

diff --git a/cell_test.go b/cell_test.go
@@ -110,7 +110,7 @@ func ExampleFile_SetCellFloat() {
 	f := NewFile()
 	var x = 3.14159265
 	if err := f.SetCellFloat("Sheet1", "A1", x, 2, 64); err != nil {
-		println(err.Error())
+		fmt.Println(err)
 	}
 	val, _ := f.GetCellValue("Sheet1", "A1")
 	fmt.Println(val)

diff --git a/chart.go b/chart.go
@@ -503,7 +503,11 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
 //
 //    package main
 //
-//    import "github.com/360EntSecGroup-Skylar/excelize"
+//    import (
+//        "fmt"
+//
+//        "github.com/360EntSecGroup-Skylar/excelize"
+//    )
 //
 //    func main() {
 //        categories := map[string]string{"A2": "Small", "A3": "Normal", "A4": "Large", "B1": "Apple", "C1": "Orange", "D1": "Pear"}
@@ -516,12 +520,12 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
 //            f.SetCellValue("Sheet1", k, v)
 //        }
 //        if err := f.AddChart("Sheet1", "E1", `{"type":"col3DClustered","series":[{"name":"Sheet1!$A$2","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"},{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"title":{"name":"Fruit 3D Clustered Column Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true},"show_blanks_as":"zero","x_axis":{"reverse_order":true},"y_axis":{"maximum":7.5,"minimum":0.5}}`); err != nil {
-//            println(err.Error())
+//            fmt.Println(err)
 //            return
 //        }
 //        // Save xlsx file by the given path.
 //        if err := f.SaveAs("Book1.xlsx"); err != nil {
-//            println(err.Error())
+//            fmt.Println(err)
 //        }
 //    }
 //
@@ -697,7 +701,11 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
 //
 //    package main
 //
-//    import "github.com/360EntSecGroup-Skylar/excelize"
+//    import (
+//        "fmt"
+//
+//        "github.com/360EntSecGroup-Skylar/excelize"
+//    )
 //
 //    func main() {
 //        categories := map[string]string{"A2": "Small", "A3": "Normal", "A4": "Large", "B1": "Apple", "C1": "Orange", "D1": "Pear"}
@@ -710,12 +718,12 @@ func parseFormatChartSet(formatSet string) (*formatChart, error) {
 //            f.SetCellValue("Sheet1", k, v)
 //        }
 //        if err := f.AddChart("Sheet1", "E1", `{"type":"col","series":[{"name":"Sheet1!$A$2","categories":"","values":"Sheet1!$B$2:$D$2"},{"name":"Sheet1!$A$3","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$3:$D$3"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"left","show_legend_key":false},"title":{"name":"Clustered Column - Line Chart"},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`, `{"type":"line","series":[{"name":"Sheet1!$A$4","categories":"Sheet1!$B$1:$D$1","values":"Sheet1!$B$4:$D$4"}],"format":{"x_scale":1.0,"y_scale":1.0,"x_offset":15,"y_offset":10,"print_obj":true,"lock_aspect_ratio":false,"locked":false},"legend":{"position":"left","show_legend_key":false},"plotarea":{"show_bubble_size":true,"show_cat_name":false,"show_leader_lines":false,"show_percent":true,"show_series_name":true,"show_val":true}}`); err != nil {
-//            println(err.Error())
+//            fmt.Println(err)
 //            return
 //        }
 //        // Save xlsx file by the given path.
 //        if err := f.SaveAs("Book1.xlsx"); err != nil {
-//            println(err.Error())
+//            fmt.Println(err)
 //        }
 //    }
 //

diff --git a/excelize.go b/excelize.go
@@ -294,13 +294,13 @@ func (f *File) UpdateLinkedValue() error {
 // functions and/or macros. The file extension should be .xlsm. For example:
 //
 //    if err := f.SetSheetPrOptions("Sheet1", excelize.CodeName("Sheet1")); err != nil {
-//        println(err.Error())
+//        fmt.Println(err)
 //    }
 //    if err := f.AddVBAProject("vbaProject.bin"); err != nil {
-//        println(err.Error())
+//        fmt.Println(err)
 //    }
 //    if err := f.SaveAs("macros.xlsm"); err != nil {
-//        println(err.Error())
+//        fmt.Println(err)
 //    }
 //
 func (f *File) AddVBAProject(bin string) error {

diff --git a/excelize_test.go b/excelize_test.go
@@ -1259,7 +1259,7 @@ func fillCells(f *File, sheet string, colCount, rowCount int) {
 		for row := 1; row <= rowCount; row++ {
 			cell, _ := CoordinatesToCellName(col, row)
 			if err := f.SetCellStr(sheet, cell, cell); err != nil {
-				println(err.Error())
+				fmt.Println(err)
 			}
 		}
 	}