diff --git a/ExcelFile.tsf b/ExcelFile.tsf index 896c19e..a5d6bd3 100755 --- a/ExcelFile.tsf +++ b/ExcelFile.tsf @@ -97,8 +97,8 @@ Type ExcelFile = Class End; ///复制sheet - ///from_sheet: string,工作表名称 - ///to_sheet: string,工作表名称 + ///from_sheet: int,工作表序号 + ///to_sheet: int,工作表序号 ///返回: [err, info] Function CopySheet(from_sheet, to_sheet); Begin @@ -796,7 +796,7 @@ Type ExcelFile = Class ///返回: [err, link:string] Function GetCellHyperLink(sheet, axis); Begin - return xlsx_call("GetCellHyperLink", fh_, sheet); + return xlsx_call("GetCellHyperLink", fh_, sheet, axis); End; ///设置富文本格式 @@ -880,7 +880,7 @@ Type ExcelFile = Class ///添加批注 ///sheet: string,工作表名称 ///axis: string,单元格,如"A7" - ///comment: string + ///comment: string,json串,如: '{"author":"Excelize: ","text":"This is a comment."}' ///返回: [err, info] Function AddComment(sheet, axis, comment); Begin @@ -1514,7 +1514,11 @@ Type ExcelFile = Class if err then return array(err, colNum); if IncludeHeader then Begin - [err, info] := SetSheetRow(sheet, axis, FieldNames(data)); + fields := FieldNames(data); + if IncludeIndex then Begin + fields := array("Index") union fields; + End; + [err, info] := SetSheetRow(sheet, axis, fields); if err then return array(err, info); rowNum ++; @@ -1591,7 +1595,7 @@ Type ExcelFile = Class r[cnt][0] := i - row1 + 1; End; for j:=col1 to col2 do Begin - [err, cell] := CoordinatesToCellName(col1, i); + [err, cell] := CoordinatesToCellName(j, i); if err then return array(err, cell); [err, v, datatype] := GetCellValue(sheet, cell); diff --git a/Linux-aarch64/libTsXlsx.so b/Linux-aarch64/libTsXlsx.so index 54d9950..815eb23 100755 Binary files a/Linux-aarch64/libTsXlsx.so and b/Linux-aarch64/libTsXlsx.so differ diff --git a/Linux-x86_64/libTsXlsx.so b/Linux-x86_64/libTsXlsx.so index b752b35..7822c69 100755 Binary files a/Linux-x86_64/libTsXlsx.so and b/Linux-x86_64/libTsXlsx.so differ diff --git a/Windows-X64/tsxlsx.dll b/Windows-X64/tsxlsx.dll index 2168413..2d3ffa7 100755 Binary files a/Windows-X64/tsxlsx.dll and b/Windows-X64/tsxlsx.dll differ