diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf index 734a341..0dce95e 100644 --- a/funcext/TSOffice/TOfficeObj.tsf +++ b/funcext/TSOffice/TOfficeObj.tsf @@ -1,4 +1,4 @@ -// Version 1.5.1 +// Version 1.5.2 Function TOfficeObj(n); Begin diff --git a/funcext/TSOffice/TSDocxFile.tsf b/funcext/TSOffice/TSDocxFile.tsf index 96ee594..dfb3ca6 100644 --- a/funcext/TSOffice/TSDocxFile.tsf +++ b/funcext/TSOffice/TSDocxFile.tsf @@ -1,4 +1,4 @@ -// Version 1.5.1 +// Version 1.5.2 Type TSDocxFile = Class ///Version: V1.0 2022-09-20 diff --git a/funcext/TSOffice/TSXlsxFile.tsf b/funcext/TSOffice/TSXlsxFile.tsf index 3c08a1a..bc61151 100644 --- a/funcext/TSOffice/TSXlsxFile.tsf +++ b/funcext/TSOffice/TSXlsxFile.tsf @@ -1,4 +1,4 @@ -// Version 1.5.1 +// Version 1.5.2 Type TSXlsxFile = Class ///Version: V1.0 2022-08-08 @@ -287,7 +287,7 @@ Type TSXlsxFile = Class ///formula: string,公式 Function SetCellFormula(sheet, axis, formula); Begin - return workbook_.SetCellFormula(class(TSXml).CurCodePageToUtf8(sheet), axis, formula); + return workbook_.SetCellFormula(class(TSXml).CurCodePageToUtf8(sheet), axis, class(TSXml).CurCodePageToUtf8(formula)); End; ///获取公式 @@ -296,7 +296,7 @@ Type TSXlsxFile = Class ///返回: [err, formula:string] Function GetCellFormula(sheet, axis); Begin - return workbook_.GetCellFormula(class(TSXml).CurCodePageToUtf8(sheet), axis); + return class(TSXml).Utf8ToCurCodePage(workbook_.GetCellFormula(class(TSXml).CurCodePageToUtf8(sheet), axis)); End; ///按行赋值 diff --git a/更新日志.md b/更新日志.md index de91861..78e591c 100644 --- a/更新日志.md +++ b/更新日志.md @@ -1,5 +1,13 @@ # 更新日志 +## 2023-12-1 + +### V1.5.2 + +#### excel + +1. 修复公式中文转码问题 + ## 2023-11-15 ### V1.5.1