v1.2.4
This commit is contained in:
parent
387c2fbccc
commit
fbec04c5e7
|
|
@ -1,4 +1,4 @@
|
||||||
// Version 1.2.3
|
// Version 1.2.4
|
||||||
|
|
||||||
Function TOfficeObj(n);
|
Function TOfficeObj(n);
|
||||||
Begin
|
Begin
|
||||||
|
|
@ -3704,7 +3704,7 @@ type TBorders=class(NodeInfo)
|
||||||
Function GetAttrs(); override;
|
Function GetAttrs(); override;
|
||||||
Begin
|
Begin
|
||||||
HandleAttrs();
|
HandleAttrs();
|
||||||
return ExtAttr;
|
return array(("DiagonalDown", "diagonalDown", XMLDiagonalDown, ""),("DiagonalUp", "diagonalUp", XMLDiagonalUp, "")) union ExtAttr;
|
||||||
End;
|
End;
|
||||||
|
|
||||||
Function GetChildren(); override;
|
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":"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":"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":"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;
|
) union ExtNodes;
|
||||||
End;
|
End;
|
||||||
|
|
||||||
//Attributes
|
//Attributes
|
||||||
|
XMLDiagonalDown;
|
||||||
|
XMLDiagonalUp;
|
||||||
|
|
||||||
//Nodes
|
//Nodes
|
||||||
Left;
|
Left;
|
||||||
|
|
@ -3728,8 +3728,6 @@ type TBorders=class(NodeInfo)
|
||||||
Top;
|
Top;
|
||||||
Bottom;
|
Bottom;
|
||||||
Diagonal;
|
Diagonal;
|
||||||
XMLDiagonalDown;
|
|
||||||
XMLDiagonalUp;
|
|
||||||
End;
|
End;
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Version 1.2.3
|
// Version 1.2.4
|
||||||
|
|
||||||
Type TSDocxFile = Class
|
Type TSDocxFile = Class
|
||||||
///Version: V1.0 2022-09-20
|
///Version: V1.0 2022-09-20
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Version 1.2.3
|
// Version 1.2.4
|
||||||
|
|
||||||
Type TSExcelFile = Class
|
Type TSExcelFile = Class
|
||||||
///Version: V1.0 2022-08-08
|
///Version: V1.0 2022-08-08
|
||||||
|
|
|
||||||
|
|
@ -99,6 +99,7 @@ public
|
||||||
if node_type = 'empty' then // <b/>
|
if node_type = 'empty' then // <b/>
|
||||||
begin
|
begin
|
||||||
if obj = 0 then arr['attributes'] := array('val': 0);
|
if obj = 0 then arr['attributes'] := array('val': 0);
|
||||||
|
else if obj = 1 then arr['attributes'] := array('val': 1)
|
||||||
end
|
end
|
||||||
else if node_type = 'pcdata' then
|
else if node_type = 'pcdata' then
|
||||||
begin
|
begin
|
||||||
|
|
@ -175,13 +176,7 @@ public
|
||||||
if istable(r) then Begin
|
if istable(r) then Begin
|
||||||
r := r[0];
|
r := r[0];
|
||||||
node := node.FirstChildElement(r['name']);
|
node := node.FirstChildElement(r['name']);
|
||||||
if not ifObj(node) then
|
if not ifObj(node) then return nil;
|
||||||
begin
|
|
||||||
if r['nodeType'] = 'empty' then return false;
|
|
||||||
return nil;
|
|
||||||
end
|
|
||||||
if r['nodeType'] = 'empty' then
|
|
||||||
return true;
|
|
||||||
if r['nodeType'] = 'pcdata' then //返回文本串
|
if r['nodeType'] = 'pcdata' then //返回文本串
|
||||||
return node.GetText();
|
return node.GetText();
|
||||||
if ifObj(r['obj']) then //对象,返回XML串
|
if ifObj(r['obj']) then //对象,返回XML串
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,7 @@ private
|
||||||
Function getNodeNumFmts(rootNode, id);
|
Function getNodeNumFmts(rootNode, id);
|
||||||
Begin
|
Begin
|
||||||
if not ifObj(rootNode) then return nil;
|
if not ifObj(rootNode) then return nil;
|
||||||
node := rootNode.FirstChildElement('numFmts');
|
node := rootNode.FirstChildElement('numFmt');
|
||||||
num_id := inttostr(id);
|
num_id := inttostr(id);
|
||||||
while ifObj(node) do
|
while ifObj(node) do
|
||||||
begin
|
begin
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue