tinysoft
/
TSOffice
5
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

v1.7.7

This commit is contained in:
csh 2025-01-17 18:33:30 +08:00
parent 0f07603d73
commit 93533c41a0
5 changed files with 8415 additions and 8399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
funcext/TSOffice/TOfficeObj.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.6 // Version 1.7.7
Function TOfficeObj(n); Function TOfficeObj(n);
Begin Begin
case lowercase(n) of case lowercase(n) of
@ -11509,8 +11509,8 @@ Type TPicture = Class(DocObject, TPictureImpl)
Function ScaledDimensions(image); Function ScaledDimensions(image);
Begin Begin
ETU := 360045;//1cm单位 ETU := 360045;//1cm单位
maxX := 17.0;//水平方向17cm maxX := CanvasWidth ?: 19.0;//水平方向17cm
maxY := 23.0;//垂直方向23cm maxY := CanvasHeight ?: 23.0;//垂直方向23cm
imageW := image.Width() / 28.346 * ETU; imageW := image.Width() / 28.346 * ETU;
imageH := image.Height() / 28.346 * ETU; imageH := image.Height() / 28.346 * ETU;
if Width <= 0 and Height <= 0 then Begin //图像缺省大小 if Width <= 0 and Height <= 0 then Begin //图像缺省大小
@ -11559,6 +11559,8 @@ Type TPicture = Class(DocObject, TPictureImpl)
Descr; Descr;
Width;//厘米 Width;//厘米
Height;//厘米 Height;//厘米
CanvasWidth;
CanvasHeight;
End; End;
Type TChart = Class(TChartImpl) Type TChart = Class(TChartImpl)
@ -13242,7 +13244,7 @@ Type TDocumentBody = Class(DocObject)
para.PPr.RPr := customCell[i, j, 2]; para.PPr.RPr := customCell[i, j, 2];
else else
para.PPr.RPr := defaultParagraph.pPr.rpr; para.PPr.RPr := defaultParagraph.pPr.rpr;
para.Run.SetText(tbl.Data_[i, j]); para.Run.SetText(ifstring(tbl.Data_[i, j]) ? tbl.Data_[i, j] : '');
para.Run.RPr := para.PPr.RPr; para.Run.RPr := para.PPr.RPr;
tcNode.InsertEndChild(para.Marshal()); tcNode.InsertEndChild(para.Marshal());
End End
@ -13459,6 +13461,7 @@ Type TDocumentBody = Class(DocObject)
p.pPr.NewChildNode( array("field":"", "name":"w:sectPr", "obj":section, "attrEx":"", "nodeType":"") ); p.pPr.NewChildNode( array("field":"", "name":"w:sectPr", "obj":section, "attrEx":"", "nodeType":"") );
p := AddParagraph(p, posOpt, '');//段落对象 p := AddParagraph(p, posOpt, '');//段落对象
sec := new TDocSection(p.node_, -2, zipfile_); sec := new TDocSection(p.node_, -2, zipfile_);
sec.NodeUri := 'w:pPr/w:sectPr'; sec.NodeUri := 'w:pPr/w:sectPr';
return sec; return sec;
End; End;

2
funcext/TSOffice/TSDocxFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.6 // Version 1.7.7
Type TSDocxFile = Class Type TSDocxFile = Class
///Version: V1.0 2022-09-20 ///Version: V1.0 2022-09-20
///适用于 Microsoft Word docx格式文件 ///适用于 Microsoft Word docx格式文件

2
funcext/TSOffice/TSXlsxFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.7.6 // Version 1.7.7
Type TSXlsxFile = Class Type TSXlsxFile = Class
///Version: V1.0 2022-08-08 ///Version: V1.0 2022-08-08
///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。 ///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。

2
funcext/TSOffice/worksheet/xlsxWorkBook.tsf
View File

@ -1494,7 +1494,7 @@ Type xlsxWorkBook = Class
if col >= min and col <= max then if col >= min and col <= max then
Begin Begin
level_val := node.GetAttribute('outlineLevel'); level_val := node.GetAttribute('outlineLevel');
if strtoint(level_val) = level then return; if trystrtoint(level_val, r) and r = level then return;
else Begin else Begin
if col = min and col = max then node.SetAttribute('outlineLevel', level); if col = min and col = max then node.SetAttribute('outlineLevel', level);
else begin else begin

13
更新日志.md
View File

@ -1,5 +1,18 @@
# 更新日志 # 更新日志
## 2025-1-17
### V1.7.7
#### word
1. **feat**：`TPicture`对象设置画布大小`CanvasWidth`、`CanvasHeight`
2. **fix**：`InsertTable`表格数据不对齐报错
#### excel
1. **fix**：`SetColOutlineLevel`错误
## 2025-1-8 ## 2025-1-8
### V1.7.6 ### V1.7.6