diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf
index 166b7b1..ea7288a 100644
--- a/funcext/TSOffice/TOfficeObj.tsf
+++ b/funcext/TSOffice/TOfficeObj.tsf
@@ -1,4 +1,4 @@
-// Version 1.4.4
+// Version 1.4.5
Function TOfficeObj(n);
Begin
diff --git a/funcext/TSOffice/TSDocxFile.tsf b/funcext/TSOffice/TSDocxFile.tsf
index ca72dc0..8dffa1c 100644
--- a/funcext/TSOffice/TSDocxFile.tsf
+++ b/funcext/TSOffice/TSDocxFile.tsf
@@ -1,4 +1,4 @@
-// Version 1.4.4
+// Version 1.4.5
Type TSDocxFile = Class
///Version: V1.0 2022-09-20
diff --git a/funcext/TSOffice/TSExcelFile.tsf b/funcext/TSOffice/TSExcelFile.tsf
index 4dbce57..8338e9b 100644
--- a/funcext/TSOffice/TSExcelFile.tsf
+++ b/funcext/TSOffice/TSExcelFile.tsf
@@ -1,4 +1,4 @@
-// Version 1.4.4
+// Version 1.4.5
Type TSExcelFile = Class
///Version: V1.0 2022-08-08
diff --git a/funcext/TSOffice/TSUtils/TSXml.tsf b/funcext/TSOffice/TSUtils/TSXml.tsf
index 326849a..b045b89 100644
--- a/funcext/TSOffice/TSUtils/TSXml.tsf
+++ b/funcext/TSOffice/TSUtils/TSXml.tsf
@@ -15,7 +15,7 @@ Type TSXml = Class
'sharedStrings':('FileName':'xl/sharedStrings.xml','Template':''),
'styles':('FileName':'xl/styles.xml','Template':''),
'workbook':('FileName':'xl/workbook.xml','Template':''),
- 'sheet1':('FileName':'xl/worksheets/sheet1.xml','Template':''),
+ 'sheet1':('FileName':'xl/worksheets/sheet1.xml','Template':''),
'theme1':('FileName':'xl/theme/theme1.xml','Template':''),
'workbook_rels':('FileName':'xl/_rels/workbook.xml.rels','Template':''),
'sheet_rels':('FileName':'','Template':''),
diff --git a/funcext/TSOffice/document/TTableContent.tsf b/funcext/TSOffice/document/TTableContent.tsf
index 9d45b46..a746a7b 100644
--- a/funcext/TSOffice/document/TTableContent.tsf
+++ b/funcext/TSOffice/document/TTableContent.tsf
@@ -220,6 +220,26 @@ Type TTableContent = class
Function UpdatePageNumbers();
Begin
End;
+
+ Function Paragraphs();
+ Begin
+ node := class(TSXml).GetNode(docx_.Document().Body().Node(), 'w:sdt/w:sdtContent');
+ r := array();
+ if ifObj(node) then
+ begin
+ twbody := TOfficeObj('TwBody');
+ twbody.Create(nil, 'w:sdtContent');
+ twbody.InitRootNode(node);
+ twbody.InitNode(node);
+ parts := twbody.Paragraphs();
+ for i:=0 to length(parts)-1 do
+ begin
+ r[i] := TOfficeObj('TParagraph');
+ r[i].Init(parts[i].node_);
+ end
+ end
+ return r;
+ End;
Function Marshal();
Begin
@@ -299,3 +319,4 @@ Type TTableContent = class
node_;
impl_;
End;
+
diff --git a/funcext/TSOffice/worksheet/xlsxWorkBook.tsf b/funcext/TSOffice/worksheet/xlsxWorkBook.tsf
index 5b9395f..ddb75bd 100644
--- a/funcext/TSOffice/worksheet/xlsxWorkBook.tsf
+++ b/funcext/TSOffice/worksheet/xlsxWorkBook.tsf
@@ -1106,7 +1106,7 @@ Type xlsxWorkBook = Class
end
if name = sheet then
Begin
- node.SetAttribute('tabselected', 1);
+ node.SetAttribute('tabSelected', 1);
workbook := GetXmlFileObj('xl/workbook.xml');
workbook_node := workbook.FirstChildElement('workbook');
book_view_node := workbook_node.FirstChildElement('bookViews');
@@ -1126,7 +1126,7 @@ Type xlsxWorkBook = Class
else
begin
node := root_node.FirstChildElement('sheetViews').FirstChildElement('sheetView');
- node.SetAttribute('tabselected', 0);
+ node.SetAttribute('tabSelected', 0);
end
end
End
diff --git a/更新日志.md b/更新日志.md
index 1e8ec34..40be208 100644
--- a/更新日志.md
+++ b/更新日志.md
@@ -1,5 +1,17 @@
# 更新日志
+## 2023-8-30
+
+### V1.4.5
+
+#### word
+
+1. 支持生成目录后返回目录对象的所有段落内容`目录对象.Paragraphs()`
+
+#### excel
+
+1. 修复`NewSheet`excel打开遇到提示错误问题
+
## 2023-8-28
### V1.4.4