From 84be55038360b2563485ae01599df0d1964835f4 Mon Sep 17 00:00:00 2001 From: csh Date: Thu, 23 Mar 2023 11:40:15 +0800 Subject: [PATCH] v1.2.7 --- funcext/TSOffice/TOfficeObj.tsf | 2 +- funcext/TSOffice/TSDocxFile.tsf | 2 +- funcext/TSOffice/TSExcelFile.tsf | 2 +- funcext/TSOffice/worksheet/xlsxWorkBook.tsf | 4 ++-- 更新日志.md | 8 ++++++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf index 5b6dc60..8f4fd15 100644 --- a/funcext/TSOffice/TOfficeObj.tsf +++ b/funcext/TSOffice/TOfficeObj.tsf @@ -1,4 +1,4 @@ -// Version 1.2.6 +// Version 1.2.7 Function TOfficeObj(n); Begin diff --git a/funcext/TSOffice/TSDocxFile.tsf b/funcext/TSOffice/TSDocxFile.tsf index 6403ded..eec34b3 100644 --- a/funcext/TSOffice/TSDocxFile.tsf +++ b/funcext/TSOffice/TSDocxFile.tsf @@ -1,4 +1,4 @@ -// Version 1.2.6 +// Version 1.2.7 Type TSDocxFile = Class ///Version: V1.0 2022-09-20 diff --git a/funcext/TSOffice/TSExcelFile.tsf b/funcext/TSOffice/TSExcelFile.tsf index 7862a52..0c6fa1f 100644 --- a/funcext/TSOffice/TSExcelFile.tsf +++ b/funcext/TSOffice/TSExcelFile.tsf @@ -1,4 +1,4 @@ -// Version 1.2.6 +// Version 1.2.7 Type TSExcelFile = Class ///Version: V1.0 2022-08-08 diff --git a/funcext/TSOffice/worksheet/xlsxWorkBook.tsf b/funcext/TSOffice/worksheet/xlsxWorkBook.tsf index c353a5f..fde0145 100644 --- a/funcext/TSOffice/worksheet/xlsxWorkBook.tsf +++ b/funcext/TSOffice/worksheet/xlsxWorkBook.tsf @@ -1042,11 +1042,11 @@ Type xlsxWorkBook = Class Function GetSheetDefaultColWidth(sheet); Begin sheet_xml_file := GetSheetXmlFile(sheet); - if not ifObj(sheet_xml_file) then return -1; + if not ifObj(sheet_xml_file) then return nil; work_node := sheet_xml_file.FirstChildElement('worksheet'); node := work_node.FirstChildElement('sheetFormatPr'); flag := trystrtofloat(node.GetAttribute('defaultColWidth'), width); - return flag ? width : -1; + return flag ? width : nil; End Function SetDefaultSheet(sheet); diff --git a/更新日志.md b/更新日志.md index 056bcf3..042768e 100644 --- a/更新日志.md +++ b/更新日志.md @@ -1,5 +1,13 @@ # 更新日志 +## 2023-3-23 + +### V1.2.7 + +#### excel + +1. `GetSheetDefaultColWidth`默认返回值改为`nil` + ## 2023-3-22 ### V1.2.6