v1.7.7

funcext/TSOffice/TOfficeObj.tsf

@@ -1,4 +1,4 @@
-// Version 1.7.6
+// Version 1.7.7
 Function TOfficeObj(n);
 Begin
 	case lowercase(n) of
@@ -11509,8 +11509,8 @@ Type TPicture = Class(DocObject, TPictureImpl)
 	Function ScaledDimensions(image);
 	Begin
 		ETU := 360045;//1cm单位
-		maxX := 17.0;//水平方向17cm
-		maxY := 23.0;//垂直方向23cm
+		maxX := CanvasWidth ?: 19.0;//水平方向17cm
+		maxY := CanvasHeight ?: 23.0;//垂直方向23cm
 		imageW := image.Width() / 28.346 * ETU;
 		imageH := image.Height() / 28.346 * ETU;
 		if Width <= 0 and Height <= 0 then Begin	//图像缺省大小
@@ -11559,6 +11559,8 @@ Type TPicture = Class(DocObject, TPictureImpl)
 	Descr;
 	Width;//厘米
 	Height;//厘米
+    CanvasWidth;
+    CanvasHeight;
 End;
 
 Type TChart = Class(TChartImpl)
@@ -13242,7 +13244,7 @@ Type TDocumentBody = Class(DocObject)
 						para.PPr.RPr := customCell[i, j, 2];
 					else
 						para.PPr.RPr := defaultParagraph.pPr.rpr;
-					para.Run.SetText(tbl.Data_[i, j]);
+					para.Run.SetText(ifstring(tbl.Data_[i, j]) ? tbl.Data_[i, j] : '');
 					para.Run.RPr := para.PPr.RPr;
 					tcNode.InsertEndChild(para.Marshal());
 				End
@@ -13459,6 +13461,7 @@ Type TDocumentBody = Class(DocObject)
 		p.pPr.NewChildNode( array("field":"", "name":"w:sectPr", "obj":section, "attrEx":"", "nodeType":"") );
 		p := AddParagraph(p, posOpt, '');//段落对象
 		sec := new TDocSection(p.node_, -2, zipfile_);
+
 		sec.NodeUri := 'w:pPr/w:sectPr';
 		return sec;
 	End;

funcext/TSOffice/TSDocxFile.tsf

@@ -1,4 +1,4 @@
-// Version 1.7.6
+// Version 1.7.7
 Type TSDocxFile = Class
 	///Version: V1.0 2022-09-20
 	///适用于 Microsoft Word docx格式文件

funcext/TSOffice/TSXlsxFile.tsf

@@ -1,4 +1,4 @@
-// Version 1.7.6
+// Version 1.7.7
 Type TSXlsxFile = Class
 	///Version: V1.0 2022-08-08
 	///适用于 Microsoft Excel? 2007 及以上版本创建的电子表格文档。支持 XLSX / XLSM / XLTM / XLTX 等多种文档格式。

funcext/TSOffice/worksheet/xlsxWorkBook.tsf

@@ -1494,7 +1494,7 @@ Type xlsxWorkBook = Class
 			if col >= min and col <= max then
 			Begin
 				level_val := node.GetAttribute('outlineLevel');
-				if strtoint(level_val) = level then return;
+				if trystrtoint(level_val, r) and r = level then return;
 				else Begin
 					if col = min and col = max then node.SetAttribute('outlineLevel', level);
 					else begin

更新日志.md

@@ -1,5 +1,18 @@
 # 更新日志
 
+## 2025-1-17
+
+### V1.7.7
+
+#### word
+
+1. **feat**：`TPicture`对象设置画布大小`CanvasWidth`、`CanvasHeight`
+2. **fix**：`InsertTable`表格数据不对齐报错
+
+#### excel
+
+1. **fix**：`SetColOutlineLevel`错误
+
 ## 2025-1-8
 
 ### V1.7.6