|
@@ -43,15 +43,15 @@ func (f *File) GetComments() (comments map[string][]Comment) {
|
|
|
if target == "" {
|
|
if target == "" {
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
- if !filepath.IsAbs(target) {
|
|
|
|
|
|
|
+ if !strings.HasPrefix(target, "/") {
|
|
|
target = "xl" + strings.TrimPrefix(target, "..")
|
|
target = "xl" + strings.TrimPrefix(target, "..")
|
|
|
}
|
|
}
|
|
|
if d := f.commentsReader(strings.TrimPrefix(target, "/")); d != nil {
|
|
if d := f.commentsReader(strings.TrimPrefix(target, "/")); d != nil {
|
|
|
sheetComments := []Comment{}
|
|
sheetComments := []Comment{}
|
|
|
for _, comment := range d.CommentList.Comment {
|
|
for _, comment := range d.CommentList.Comment {
|
|
|
sheetComment := Comment{}
|
|
sheetComment := Comment{}
|
|
|
- if comment.AuthorID < len(d.Authors) {
|
|
|
|
|
- sheetComment.Author = d.Authors[comment.AuthorID].Author
|
|
|
|
|
|
|
+ if comment.AuthorID < len(d.Authors.Author) {
|
|
|
|
|
+ sheetComment.Author = d.Authors.Author[comment.AuthorID]
|
|
|
}
|
|
}
|
|
|
sheetComment.Ref = comment.Ref
|
|
sheetComment.Ref = comment.Ref
|
|
|
sheetComment.AuthorID = comment.AuthorID
|
|
sheetComment.AuthorID = comment.AuthorID
|
|
@@ -250,20 +250,19 @@ func (f *File) addComment(commentsXML, cell string, formatSet *formatComment) {
|
|
|
t = t[0:32512]
|
|
t = t[0:32512]
|
|
|
}
|
|
}
|
|
|
comments := f.commentsReader(commentsXML)
|
|
comments := f.commentsReader(commentsXML)
|
|
|
|
|
+ authorID := 0
|
|
|
if comments == nil {
|
|
if comments == nil {
|
|
|
- comments = &xlsxComments{
|
|
|
|
|
- Authors: []xlsxAuthor{
|
|
|
|
|
- {
|
|
|
|
|
- Author: formatSet.Author,
|
|
|
|
|
- },
|
|
|
|
|
- },
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ comments = &xlsxComments{Authors: xlsxAuthor{Author: []string{formatSet.Author}}}
|
|
|
|
|
+ }
|
|
|
|
|
+ if inStrSlice(comments.Authors.Author, formatSet.Author) == -1 {
|
|
|
|
|
+ comments.Authors.Author = append(comments.Authors.Author, formatSet.Author)
|
|
|
|
|
+ authorID = len(comments.Authors.Author) - 1
|
|
|
}
|
|
}
|
|
|
defaultFont := f.GetDefaultFont()
|
|
defaultFont := f.GetDefaultFont()
|
|
|
bold := ""
|
|
bold := ""
|
|
|
cmt := xlsxComment{
|
|
cmt := xlsxComment{
|
|
|
Ref: cell,
|
|
Ref: cell,
|
|
|
- AuthorID: 0,
|
|
|
|
|
|
|
+ AuthorID: authorID,
|
|
|
Text: xlsxText{
|
|
Text: xlsxText{
|
|
|
R: []xlsxR{
|
|
R: []xlsxR{
|
|
|
{
|
|
{
|