p30928647
/
excelize
1
0
Fork 1
Code Issues Pull Requests Projects Releases 23 Wiki Activity

This support get cell hyperlink for merged cells

This commit is contained in:
xuri 2023-03-29 00:00:27 +08:00
parent 9dbba9f34a
commit 3b807c4bfe
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cell.go
View File

@ -801,12 +801,13 @@ func (f *File) GetCellHyperLink(sheet, cell string) (bool, string, error) {
if err != nil { if err != nil {
return false, "", err return false, "", err
} }
if cell, err = f.mergeCellsParser(ws, cell); err != nil {
return false, "", err
}
if ws.Hyperlinks != nil { if ws.Hyperlinks != nil {
for _, link := range ws.Hyperlinks.Hyperlink { for _, link := range ws.Hyperlinks.Hyperlink {
if link.Ref == cell { ok, err := f.checkCellInRangeRef(cell, link.Ref)
if err != nil {
return false, "", err
}
if link.Ref == cell || ok {
if link.RID != "" { if link.RID != "" {
return true, f.getSheetRelationshipsTargetByID(sheet, link.RID), err return true, f.getSheetRelationshipsTargetByID(sheet, link.RID), err
} }

2
datavalidation_test.go
View File

@ -87,7 +87,7 @@ func TestDataValidation(t *testing.T) {
dataValidations, err = f.GetDataValidations("Sheet1") dataValidations, err = f.GetDataValidations("Sheet1")
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t,dataValidations, 3) assert.Len(t, dataValidations, 3)
// Test get data validation on no exists worksheet // Test get data validation on no exists worksheet
_, err = f.GetDataValidations("SheetN") _, err = f.GetDataValidations("SheetN")

32
excelize_test.go
View File

@ -480,7 +480,7 @@ func TestGetCellHyperLink(t *testing.T) {
ws, ok = f.Sheet.Load("xl/worksheets/sheet1.xml") ws, ok = f.Sheet.Load("xl/worksheets/sheet1.xml")
assert.True(t, ok) assert.True(t, ok)
ws.(*xlsxWorksheet).MergeCells = &xlsxMergeCells{Cells: []*xlsxMergeCell{{Ref: "A:A"}}} ws.(*xlsxWorksheet).Hyperlinks = &xlsxHyperlinks{Hyperlink: []xlsxHyperlink{{Ref: "A:A"}}}
link, target, err = f.GetCellHyperLink("Sheet1", "A1") link, target, err = f.GetCellHyperLink("Sheet1", "A1")
assert.EqualError(t, err, newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error()) assert.EqualError(t, err, newCellNameToCoordinatesError("A", newInvalidCellNameError("A")).Error())
assert.Equal(t, link, false) assert.Equal(t, link, false)
@ -1447,21 +1447,21 @@ func TestSetDefaultTimeStyle(t *testing.T) {
} }
func TestAddVBAProject(t *testing.T) { func TestAddVBAProject(t *testing.T) {
f := NewFile() f := NewFile()
file, err := os.ReadFile(filepath.Join("test", "Book1.xlsx")) file, err := os.ReadFile(filepath.Join("test", "Book1.xlsx"))
assert.NoError(t, err) assert.NoError(t, err)
assert.NoError(t, f.SetSheetProps("Sheet1", &SheetPropsOptions{CodeName: stringPtr("Sheet1")})) assert.NoError(t, f.SetSheetProps("Sheet1", &SheetPropsOptions{CodeName: stringPtr("Sheet1")}))
assert.EqualError(t, f.AddVBAProject(file), ErrAddVBAProject.Error()) assert.EqualError(t, f.AddVBAProject(file), ErrAddVBAProject.Error())
file, err = os.ReadFile(filepath.Join("test", "vbaProject.bin")) file, err = os.ReadFile(filepath.Join("test", "vbaProject.bin"))
assert.NoError(t, err) assert.NoError(t, err)
assert.NoError(t, f.AddVBAProject(file)) assert.NoError(t, f.AddVBAProject(file))
// Test add VBA project twice // Test add VBA project twice
assert.NoError(t, f.AddVBAProject(file)) assert.NoError(t, f.AddVBAProject(file))
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddVBAProject.xlsm"))) assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddVBAProject.xlsm")))
// Test add VBA with unsupported charset workbook relationships // Test add VBA with unsupported charset workbook relationships
f.Relationships.Delete(defaultXMLPathWorkbookRels) f.Relationships.Delete(defaultXMLPathWorkbookRels)
f.Pkg.Store(defaultXMLPathWorkbookRels, MacintoshCyrillicCharset) f.Pkg.Store(defaultXMLPathWorkbookRels, MacintoshCyrillicCharset)
assert.EqualError(t, f.AddVBAProject(file), "XML syntax error on line 1: invalid UTF-8") assert.EqualError(t, f.AddVBAProject(file), "XML syntax error on line 1: invalid UTF-8")
} }
func TestContentTypesReader(t *testing.T) { func TestContentTypesReader(t *testing.T) {