This commit is contained in:
csh 2023-12-01 10:42:08 +08:00
parent b617f235fa
commit 1e9b8f3a12
4 changed files with 13 additions and 5 deletions

View File

@ -1,4 +1,4 @@
// Version 1.5.1
// Version 1.5.2
Function TOfficeObj(n);
Begin

View File

@ -1,4 +1,4 @@
// Version 1.5.1
// Version 1.5.2
Type TSDocxFile = Class
///Version: V1.0 2022-09-20

View File

@ -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;
///按行赋值

View File

@ -1,5 +1,13 @@
# 更新日志
## 2023-12-1
### V1.5.2
#### excel
1. 修复公式中文转码问题
## 2023-11-15
### V1.5.1