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

v1.2.4

This commit is contained in:
csh 2023-03-16 18:08:35 +08:00
parent 387c2fbccc
commit fbec04c5e7
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
funcext/TSOffice/TOfficeObj.tsf
View File

@ -1,4 +1,4 @@
// Version 1.2.3
// Version 1.2.4
Function TOfficeObj(n);
Begin
@ -3704,7 +3704,7 @@ type TBorders=class(NodeInfo)
Function GetAttrs(); override;
Begin
HandleAttrs();
return ExtAttr;
return array(("DiagonalDown", "diagonalDown", XMLDiagonalDown, ""),("DiagonalUp", "diagonalUp", XMLDiagonalUp, "")) union ExtAttr;
End;
Function GetChildren(); override;
@ -3715,12 +3715,12 @@ type TBorders=class(NodeInfo)
,("field":"Top","name":Top.NodeName,"obj":Top,"attrEx":"","nodeType":"","attrName":"", "desc":"", "class":"TBorder")
,("field":"Bottom","name":Bottom.NodeName,"obj":Bottom,"attrEx":"","nodeType":"","attrName":"", "desc":"", "class":"TBorder")
,("field":"Diagonal","name":Diagonal.NodeName,"obj":Diagonal,"attrEx":"","nodeType":"","attrName":"", "desc":"", "class":"TBorder")
,("field":"DiagonalDown","name":"diagonalDown","obj":XMLDiagonalDown,"attrEx":"","nodeType":"","attrName":"", "desc":"", "class":"")
,("field":"DiagonalUp","name":"diagonalUp","obj":XMLDiagonalUp,"attrEx":"","nodeType":"","attrName":"", "desc":"", "class":"")
) union ExtNodes;
End;
//Attributes
XMLDiagonalDown;
XMLDiagonalUp;
//Nodes
Left;
@ -3728,8 +3728,6 @@ type TBorders=class(NodeInfo)
Top;
Bottom;
Diagonal;
XMLDiagonalDown;
XMLDiagonalUp;
End;
///////////////////////////////////////////////////////////////

2
funcext/TSOffice/TSDocxFile.tsf
View File

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

2
funcext/TSOffice/TSExcelFile.tsf
View File

@ -1,4 +1,4 @@
// Version 1.2.3
// Version 1.2.4
Type TSExcelFile = Class
///Version: V1.0 2022-08-08

9
funcext/TSOffice/TSUtils/NodeInfo.tsf
View File

@ -99,6 +99,7 @@ public
if node_type = 'empty' then // <b/>
begin
if obj = 0 then arr['attributes'] := array('val': 0);
else if obj = 1 then arr['attributes'] := array('val': 1)
end
else if node_type = 'pcdata' then
begin
@ -175,13 +176,7 @@ public
if istable(r) then Begin
r := r[0];
node := node.FirstChildElement(r['name']);
if not ifObj(node) then
begin
if r['nodeType'] = 'empty' then return false;
return nil;
end
if r['nodeType'] = 'empty' then
return true;
if not ifObj(node) then return nil;
if r['nodeType'] = 'pcdata' then //返回文本串
return node.GetText();
if ifObj(r['obj']) then //对象，返回XML串

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

@ -202,7 +202,7 @@ private
Function getNodeNumFmts(rootNode, id);
Begin
if not ifObj(rootNode) then return nil;
node := rootNode.FirstChildElement('numFmts');
node := rootNode.FirstChildElement('numFmt');
num_id := inttostr(id);
while ifObj(node) do
begin

10
更新日志.md
View File

@ -1,5 +1,15 @@
# 更新日志
## 2023-3-16
### V1.2.4
#### excel
1. 修复样式获取数字样式失败问题
2. 修复边框样式对角线未生效问题
3. 修复获取属性未正确返回属性值问题
## 2023-3-9
### V1.2.3