v1.0.8

Demo/excel_demo.tsl

@@ -463,7 +463,7 @@ appProps.ScaleCrop := "true";
 appProps.Company := "TS";
 appProps.LinksUpToDate := "true";
 appProps.HyperlinksChanged := "true";
-appProps.AppVersion := "1.000";
+appProps.Version := "1.000";
 appProps.Manager := "这是主管";
 //appProps.HyperlinkBase := "这是超链接基础";
 excel.SetAppProps(appProps);

funcext/TSOffice/TSDocxFile.tsf

@@ -1,4 +1,4 @@
-// Version 1.0.7
+// Version 1.0.8
 
 Type TSDocxFile = Class
 	///Version: V1.0 2022-09-20
@@ -136,7 +136,7 @@ Type TSDocxFile = Class
 		return document_.Body().AddBreak(getPosNode(posOpt), 'column');
 	End;
 	
-	///删除指定段落
+	///删除指定段落(表格、图片、图表、文本框等)
 	///posOpt: 段落位置，0 DOCX文件开头；-1 文件尾；N 第N段；posOpt段落
 	///返回：true
 	Function DelParagraph(posOpt);
@@ -309,8 +309,6 @@ Type TSDocxFile = Class
 		c := TOfficeObj('TDocComment');
 		c.p.Run.SetText( txt );
 		c.Author := author;
-		if author and not class(TSXml).IsUtf8() then
-			c.Author := class(TSXml).CurCodePageToUtf8(author);
 		c.ID := id;
 		xmlfile.FirstChildElement('w:comments').InsertEndChild(c.Marshal());
 		return c;

funcext/TSOffice/TSExcelFile.tsf

@@ -1,4 +1,4 @@
-// Version 1.0.7
+// Version 1.0.8
 
 Type TSExcelFile = Class
 	///Version: V1.0 2022-08-08

funcext/TSOffice/TSUtils/NodeInfo.tsf

@@ -161,6 +161,7 @@ public
 			rootNode := p.Root();
 			p := p.Parent;
 		End;
+		if not ifObj(rootNode) then return nil;
 
 		attrs := GetAttrsEx();
 		lName := lowerCase(name);
@@ -187,9 +188,9 @@ public
 			key := r['attrName'] ? r['attrName'] : r['attrEx'] ? r['attrEx'] : 'val';
 			if r['nodeType'] = 'empty_string' then
 			begin
-				value := node.GetAttribute(key);
-				if not value then return true;
-				return value;
+				val := node.GetAttribute(key);
+				if not val then return true;
+				return val;
 			end
 			return node.GetAttribute(key);//返回属性
 		End;

funcext/TSOffice/TSUtils/TOfficeApi.tsf

@@ -191,4 +191,4 @@ private
 	End;
 	
 	hash_;
-End;
+End;

funcext/TSOffice/document/TTableContent.tsf

@@ -20,18 +20,19 @@ Type TTableContent = class
 	Begin
 		defultFont := impl_.stdPr.rPr;
 		defultFont.rFont.cstheme := 'minorBidi';
-		defultFont.rFont.eastAsia := '宋体';
-		defultFont.rFont.hAnsi := '宋体';
-		defultFont.rFont.ascii := '宋体';
+		defultFont.rFont.XMLeastAsia := '宋体';
+		defultFont.rFont.XMLhAnsi := '宋体';
+		defultFont.rFont.XMLascii := '宋体';
 		//defultFont.kern := 2;
 		defultFont.Size := 21;
 		defultFont.SzCs := 24;
 		defultFont.Lang := 'en-US';
 		defultFont.bidi := 'ar-SA';
 		defultFont.eastAsia := 'zh-CN';
+		defultFont.Color := 'DBDBDB';
 		defultFormat := impl_.stdPr;
 		defultFormat.ID := integer(time()*24*3600);
-		defultFormat.Color := 'DBDBDB';
+		//defultFormat.Color := 'DBDBDB';
 		defultFormat.docPartObj.docPartGallery := 'Table of Contents';
 		defultFormat.docPartObj.docPartUnique := 1;
 		//impl_.stdEndPr.rPr.Size := 20;
@@ -68,7 +69,7 @@ Type TTableContent = class
 		mParagraph.pPr.LeftChars := 0;
 		mParagraph.pPr.LeftIndent := 0;
 		mParagraph.Run.T := '目录';
-		mParagraph.Run.rPr.Name := '宋体';
+		mParagraph.Run.rPr.SetName('宋体', true);
 		mParagraph.Run.rPr.Size := 21;
 		mParagraph.Run.rPr.Bold := true;
 		_AddStdContent(mParagraph);
@@ -154,7 +155,7 @@ Type TTableContent = class
 			
 			//目录条目文字内容
 			r7 := p.AddRun();
-			r7.Font.Name := '宋体';
+			r7.Font.SetName('宋体', true);
 			numStr := '';	//数字项目编号
 			if r[i]['numId'] then Begin
 				style := docx_.NumberingObject().NumberStyle(r[i]['numId']);//支持数字、字符串StyleId

更新日志.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## 2023-1-11
+
+### V1.0.8
+
+#### word
+
+1. 修复`copyFormat`和`AddTableContent`
+
 ## 2023-1-10
 
 ### V1.0.7