- Resolve qax-os#485 use sheet index instead of ID

-  added 3 internal function: getSheetID, getActiveSheetID, getSheetNameByID

Author: xuri

README.md

@@ -13,8 +13,7 @@
 
 ## Introduction
 
-Excelize is a library written in pure Go providing a set of functions that allow you to write to and read from XLSX files. Supports reading and writing XLSX file generated by Microsoft Excel™ 2007 and later.
-Supports saving a file without losing original charts of XLSX. This library needs Go version 1.10 or later. The full API docs can be seen using go's built-in documentation tool, or online at [go.dev](https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc) and [docs reference](https://xuri.me/excelize/).
+Excelize is a library written in pure Go providing a set of functions that allow you to write to and read from XLSX / XLSM / XLTM files. Supports reading and writing spreadsheet documents generated by Microsoft Excel™ 2007 and later. Supports complex components by high compatibility, and provided streaming API for generating or reading data from a worksheet with huge amounts of data. This library needs Go version 1.10 or later. The full API docs can be seen using go's built-in documentation tool, or online at [go.dev](https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc) and [docs reference](https://xuri.me/excelize/).
 
 ## Basic Usage
 
@@ -24,6 +23,12 @@ Supports saving a file without losing original charts of XLSX. This library need
 go get github.com/360EntSecGroup-Skylar/excelize
 ```
 
+- If your package management with [Go Modules](https://blog.golang.org/using-go-modules), please install with following command.
+
+```bash
+go get github.com/360EntSecGroup-Skylar/excelize/v2
+```
+
 ### Create XLSX file
 
 Here is a minimal example usage that will create XLSX file.

README_zh.md

@@ -13,7 +13,7 @@
 
 ## 简介
 
-Excelize 是 Go 语言编写的用于操作 Office Excel 文档类库，基于 ECMA-376 Office OpenXML 标准。可以使用它来读取、写入由 Microsoft Excel™ 2007 及以上版本创建的 XLSX 文档。相比较其他的开源类库，Excelize 支持写入原本带有图片(表)、透视表和切片器等复杂样式的文档，还支持向 Excel 文档中插入图片与图表，并且在保存后不会丢失文档原有样式，可以应用于各类报表系统中。使用本类库要求使用的 Go 语言为 1.10 或更高版本，完整的 API 使用文档请访问 [go.dev](https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc) 或查看 [参考文档](https://xuri.me/excelize/)。
+Excelize 是 Go 语言编写的用于操作 Office Excel 文档基础库，基于 ECMA-376，ISO/IEC 29500 国际标准。可以使用它来读取、写入由 Microsoft Excel™ 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM 等多种文档格式，高度兼容带有样式、图片(表)、透视表、切片器等复杂组件的文档，并提供流式读写 API，用于处理包含大规模数据的工作簿。可应用于各类报表平台、云计算、边缘计算等系统。使用本类库要求使用的 Go 语言为 1.10 或更高版本，完整的 API 使用文档请访问 [go.dev](https://pkg.go.dev/github.com/360EntSecGroup-Skylar/excelize/v2?tab=doc) 或查看 [参考文档](https://xuri.me/excelize/)。
 
 ## 快速上手
 
@@ -23,6 +23,12 @@ Excelize 是 Go 语言编写的用于操作 Office Excel 文档类库，基于 E
 go get github.com/360EntSecGroup-Skylar/excelize
 ```
 
+- 如果您使用 [Go Modules](https://blog.golang.org/using-go-modules) 管理软件包，请使用下面的命令来安装最新版本。
+
+```bash
+go get github.com/360EntSecGroup-Skylar/excelize/v2
+```
+
 ### 创建 Excel 文档
 
 下面是一个创建 Excel 文档的简单例子：

cell.go

@@ -337,7 +337,7 @@ func (f *File) SetCellFormula(sheet, axis, formula string, opts ...FormulaOpts)
 	}
 	if formula == "" {
 		cellData.F = nil
-		f.deleteCalcChain(f.GetSheetIndex(sheet), axis)
+		f.deleteCalcChain(f.getSheetID(sheet), axis)
 		return err
 	}
 

chart.go

@@ -762,7 +762,7 @@ func (f *File) AddChart(sheet, cell, format string, combo ...string) error {
 // a chart.
 func (f *File) AddChartSheet(sheet, format string, combo ...string) error {
 	// Check if the worksheet already exists
-	if f.GetSheetIndex(sheet) != 0 {
+	if f.GetSheetIndex(sheet) != -1 {
 		return errors.New("the same name worksheet already exists")
 	}
 	formatSet, comboCharts, err := f.getFormatChart(format, combo)

chart_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestChartSize(t *testing.T) {
 	xlsx := NewFile()
-	sheet1 := xlsx.GetSheetName(1)
+	sheet1 := xlsx.GetSheetName(0)
 
 	categories := map[string]string{
 		"A2": "Small",
@@ -220,14 +220,14 @@ func TestAddChartSheet(t *testing.T) {
 	}
 	assert.NoError(t, f.AddChartSheet("Chart1", `{"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"}}`))
 	// Test set the chartsheet as active sheet
-	var sheetID int
-	for idx, sheetName := range f.GetSheetMap() {
+	var sheetIdx int
+	for idx, sheetName := range f.GetSheetList() {
 		if sheetName != "Chart1" {
 			continue
 		}
-		sheetID = idx
+		sheetIdx = idx
 	}
-	f.SetActiveSheet(sheetID)
+	f.SetActiveSheet(sheetIdx)
 
 	// Test cell value on chartsheet
 	assert.EqualError(t, f.SetCellValue("Chart1", "A1", true), "sheet Chart1 is chart sheet")

col_test.go

@@ -170,7 +170,7 @@ func TestColWidth(t *testing.T) {
 
 func TestInsertCol(t *testing.T) {
 	f := NewFile()
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	fillCells(f, sheet1, 10, 10)
 
@@ -188,7 +188,7 @@ func TestInsertCol(t *testing.T) {
 
 func TestRemoveCol(t *testing.T) {
 	f := NewFile()
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	fillCells(f, sheet1, 10, 15)
 

excelize.go

@@ -268,7 +268,7 @@ func (f *File) UpdateLinkedValue() error {
 	wb := f.workbookReader()
 	// recalculate formulas
 	wb.CalcPr = nil
-	for _, name := range f.GetSheetMap() {
+	for _, name := range f.GetSheetList() {
 		xlsx, err := f.workSheetReader(name)
 		if err != nil {
 			return err

excelize_test.go

@@ -239,7 +239,7 @@ func TestBrokenFile(t *testing.T) {
 		// Test set active sheet without BookViews and Sheets maps in xl/workbook.xml.
 		f3, err := OpenFile(filepath.Join("test", "BadWorkbook.xlsx"))
 		f3.GetActiveSheetIndex()
-		f3.SetActiveSheet(2)
+		f3.SetActiveSheet(1)
 		assert.NoError(t, err)
 	})
 
@@ -908,7 +908,7 @@ func TestCopySheet(t *testing.T) {
 	}
 
 	idx := f.NewSheet("CopySheet")
-	assert.NoError(t, f.CopySheet(1, idx))
+	assert.NoError(t, f.CopySheet(0, idx))
 
 	assert.NoError(t, f.SetCellValue("CopySheet", "F1", "Hello"))
 	val, err := f.GetCellValue("Sheet1", "F1")
@@ -924,8 +924,8 @@ func TestCopySheetError(t *testing.T) {
 		t.FailNow()
 	}
 
-	assert.EqualError(t, f.copySheet(0, -1), "sheet  is not exist")
-	if !assert.EqualError(t, f.CopySheet(0, -1), "invalid worksheet index") {
+	assert.EqualError(t, f.copySheet(-1, -2), "sheet  is not exist")
+	if !assert.EqualError(t, f.CopySheet(-1, -2), "invalid worksheet index") {
 		t.FailNow()
 	}
 
@@ -957,7 +957,7 @@ func TestSetSheetVisible(t *testing.T) {
 func TestGetActiveSheetIndex(t *testing.T) {
 	f := NewFile()
 	f.WorkBook.BookViews = nil
-	assert.Equal(t, 1, f.GetActiveSheetIndex())
+	assert.Equal(t, 0, f.GetActiveSheetIndex())
 }
 
 func TestRelsWriter(t *testing.T) {
@@ -974,7 +974,7 @@ func TestGetSheetView(t *testing.T) {
 
 func TestConditionalFormat(t *testing.T) {
 	f := NewFile()
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	fillCells(f, sheet1, 10, 15)
 
@@ -1060,7 +1060,7 @@ func TestConditionalFormat(t *testing.T) {
 
 func TestConditionalFormatError(t *testing.T) {
 	f := NewFile()
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	fillCells(f, sheet1, 10, 15)
 

merge_test.go

@@ -108,7 +108,7 @@ func TestGetMergeCells(t *testing.T) {
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	mergeCells, err := f.GetMergeCells(sheet1)
 	if !assert.Len(t, mergeCells, len(wants)) {
@@ -132,7 +132,7 @@ func TestUnmergeCell(t *testing.T) {
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 
 	xlsx, err := f.workSheetReader(sheet1)
 	assert.NoError(t, err)

rows_test.go

@@ -92,7 +92,7 @@ func TestRowsError(t *testing.T) {
 
 func TestRowHeight(t *testing.T) {
 	xlsx := NewFile()
-	sheet1 := xlsx.GetSheetName(1)
+	sheet1 := xlsx.GetSheetName(0)
 
 	assert.EqualError(t, xlsx.SetRowHeight(sheet1, 0, defaultRowHeightPixels+1.0), "invalid row number 0")
 
@@ -199,7 +199,7 @@ func TestRowVisibility(t *testing.T) {
 
 func TestRemoveRow(t *testing.T) {
 	f := NewFile()
-	sheet1 := f.GetSheetName(1)
+	sheet1 := f.GetSheetName(0)
 	r, err := f.workSheetReader(sheet1)
 	assert.NoError(t, err)
 	const (
@@ -260,7 +260,7 @@ func TestRemoveRow(t *testing.T) {
 
 func TestInsertRow(t *testing.T) {
 	xlsx := NewFile()
-	sheet1 := xlsx.GetSheetName(1)
+	sheet1 := xlsx.GetSheetName(0)
 	r, err := xlsx.workSheetReader(sheet1)
 	assert.NoError(t, err)
 	const (
@@ -292,7 +292,7 @@ func TestInsertRow(t *testing.T) {
 // It is important for insert workflow to be constant to avoid side effect with functions related to internal structure.
 func TestInsertRowInEmptyFile(t *testing.T) {
 	xlsx := NewFile()
-	sheet1 := xlsx.GetSheetName(1)
+	sheet1 := xlsx.GetSheetName(0)
 	r, err := xlsx.workSheetReader(sheet1)
 	assert.NoError(t, err)
 	assert.NoError(t, xlsx.InsertRow(sheet1, 1))