diff --git a/ExcelFile使用帮助.xlsx b/ExcelFile使用帮助.xlsx index a426014..b137f79 100644 Binary files a/ExcelFile使用帮助.xlsx and b/ExcelFile使用帮助.xlsx differ diff --git a/Windows-X64/office_plugin.dll b/Windows-X64/office_plugin.dll index 64a5515..1ad8a2b 100644 Binary files a/Windows-X64/office_plugin.dll and b/Windows-X64/office_plugin.dll differ diff --git a/funcext/TSOffice/TSUtils/NodeInfo.tsf b/funcext/TSOffice/TSUtils/NodeInfo.tsf index 3465427..cf8c7ab 100644 --- a/funcext/TSOffice/TSUtils/NodeInfo.tsf +++ b/funcext/TSOffice/TSUtils/NodeInfo.tsf @@ -184,7 +184,8 @@ public if ifObj(r['obj']) then //对象,返回XML串 return node.Data(); key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val'; - return node.GetAttribute(key);//返回属性 + value := node.GetAttribute(key); + return trystrtofloat(value, r) ? r : value; End; return nil; End; diff --git a/funcext/TSOffice/worksheet/xlsxStyles.tsf b/funcext/TSOffice/worksheet/xlsxStyles.tsf index 2b2ad8c..c87e6fd 100644 --- a/funcext/TSOffice/worksheet/xlsxStyles.tsf +++ b/funcext/TSOffice/worksheet/xlsxStyles.tsf @@ -52,7 +52,7 @@ Type xlsxStyles = Class cellXfs_node := style_node.FirstChildElement('cellXfs'); count := strtoint(cellXfs_node.GetAttribute('count')); Id := strtoint(oldStyleId); - if Id < count-1 then return nil; + if Id > count-1 then return nil; xf := getNode(cellXfs_node, 'xf', Id); marshal := xf.marshal()[0]; @@ -97,7 +97,7 @@ Type xlsxStyles = Class cellXfs_node := style_node.FirstChildElement('cellXfs'); count := strtoint(cellXfs_node.GetAttribute('count')); Id := strtoint(styleId); - if Id < count-1 then return nil; + if Id > count-1 then return nil; xf := getNode(cellXfs_node, 'xf', Id); attrs := xf.Attributes();