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

v1.8.4

This commit is contained in:
csh 2025-11-07 14:24:12 +08:00
parent 95a00e7002
commit ea528f3094
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
funcext/TSOffice/TOfficeObj.tsf
View File

@ -1,4 +1,4 @@
// Version 1.8.3 // Version 1.8.4
Function TOfficeObj(n); Function TOfficeObj(n);
Begin Begin
case lowercase(n) of case lowercase(n) of
@ -15093,10 +15093,16 @@ Type TTable = Class(DocObject, TTableImpl)
for row:=top2 to bottom2 do Begin for row:=top2 to bottom2 do Begin
c := Cell(row, left2); c := Cell(row, left2);
c.mergeSpan_ := val; c.mergeSpan_ := val;
gridSpan := class(TSXml).GetNode(c.node_, 'w:tcPr/w:gridSpan', true); if left2 <> right2 then
gridSpan.SetAttribute('w:val', val); begin
node := class(TSXml).GetNode(c.node_, 'w:tcPr/w:vMerge', true); gridSpan := class(TSXml).GetNode(c.node_, 'w:tcPr/w:gridSpan', true);
node.SetAttribute('w:val', row=top2 ? 'restart' : 'continue'); gridSpan.SetAttribute('w:val', val);
end
if top2 <> bottom2 then
begin
node := class(TSXml).GetNode(c.node_, 'w:tcPr/w:vMerge', true);
node.SetAttribute('w:val', row=top2 ? 'restart' : 'continue');
end
if row <> top2 then Begin if row <> top2 then Begin
if not del then if not del then
theCell.Append(c); theCell.Append(c);

2
funcext/TSOffice/TSDocxFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.8.3 // Version 1.8.4
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.8.3 // Version 1.8.4
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 等多种文档格式。

8
更新日志.md
View File

@ -1,5 +1,13 @@
# 更新日志 # 更新日志
## 2025-11-07
### V1.8.4
#### word
1. 修复合并单元格时候设置属性不规范
## 2025-10-30 ## 2025-10-30
### V1.8.3 ### V1.8.3