1. 升级装饰器和适配器代码

2. 修复components的bug

autoclass/docx/AlternateContent@DOCX.tsf

@@ -40,7 +40,7 @@ end;
 
 function AlternateContent.Init();override;
 begin
-    {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", "http://schemas.openxmlformats.org/markup-compatibility/2006");
+    {self.}XmlAttrXmlnsMc := new OpenXmlAttribute("xmlns", "mc", nil);
     {self.}Choice := new Choice(self, {self.}Prefix, "Choice");
     {self.}Fallback := new Fallback(self, {self.}Prefix, "Fallback");
 end;

autoclass/docx/ChartSpace@DOCX.tsf

@@ -56,9 +56,9 @@ end;
 
 function ChartSpace.Init();override;
 begin
-    {self.}XmlAttrXmlnsC := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/drawingml/2006/chart");
-    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main");
-    {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "c", "http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+    {self.}XmlAttrXmlnsC := new OpenXmlAttribute("xmlns", "c", nil);
+    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", nil);
+    {self.}XmlAttrXmlnsR := new OpenXmlAttribute("xmlns", "c", nil);
     {self.}Date1904 := new PureVal(self, {self.}Prefix, "date1904");
     {self.}XmlChildLang := new PureVal(self, {self.}Prefix, "lang");
     {self.}AlternateContent := new AlternateContent(self, "mc", "alternateContent");

autoclass/docx/Choice@DOCX.tsf

@@ -44,7 +44,7 @@ end;
 function Choice.Init();override;
 begin
     {self.}XmlAttrRequires := new OpenXmlAttribute(nil, "Requires", nil);
-    {self.}XmlAttrXmlnsC14 := new OpenXmlAttribute("xmlns", "c14", "http://schemas.microsoft.com/office/drawing/2007/8/2/chart");
+    {self.}XmlAttrXmlnsC14 := new OpenXmlAttribute("xmlns", "c14", nil);
     {self.}Style := new PureVal(self, "c14", "style");
 end;
 

autoclass/docx/CoreProperties@DOCX.tsf

@@ -64,11 +64,11 @@ end;
 
 function CoreProperties.Init();override;
 begin
-    {self.}XmlAttrXmlnsCp := new OpenXmlAttribute("xmlns", "cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
-    {self.}XmlAttrXmlnsDc := new OpenXmlAttribute("xmlns", "dc", "http://purl.org/dc/elements/1.1/");
-    {self.}XmlAttrXmlnsDcterms := new OpenXmlAttribute("xmlns", "dcterms", "http://purl.org/dc/terms/");
-    {self.}XmlAttrXmlnsDcmitype := new OpenXmlAttribute("xmlns", "dcmitype", "http://purl.org/dc/dcmitype/");
-    {self.}XmlAttrXmlnsXsi := new OpenXmlAttribute("xmlns", "xsi", "http://www.w3.org/2001/XMLSchema-instance");
+    {self.}XmlAttrXmlnsCp := new OpenXmlAttribute("xmlns", "cp", nil);
+    {self.}XmlAttrXmlnsDc := new OpenXmlAttribute("xmlns", "dc", nil);
+    {self.}XmlAttrXmlnsDcterms := new OpenXmlAttribute("xmlns", "dcterms", nil);
+    {self.}XmlAttrXmlnsDcmitype := new OpenXmlAttribute("xmlns", "dcmitype", nil);
+    {self.}XmlAttrXmlnsXsi := new OpenXmlAttribute("xmlns", "xsi", nil);
     {self.}Title := new OpenXmlPcdata(self, "dc", "title");
     {self.}Subject := new OpenXmlPcdata(self, "dc", "subject");
     {self.}Creator := new OpenXmlPcdata(self, "dc", "creator");

autoclass/docx/Graphic@DOCX.tsf

@@ -39,7 +39,7 @@ end;
 
 function Graphic.Init();override;
 begin
-    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main");
+    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", nil);
     {self.}GraphicData := new GraphicData(self, "a", "graphicData");
 end;
 

autoclass/docx/GraphicData@DOCX.tsf

@@ -40,7 +40,7 @@ end;
 
 function GraphicData.Init();override;
 begin
-    {self.}XmlAttrUri := new OpenXmlAttribute(nil, "uri", "http://schemas.openxmlformats.org/drawingml/2006/picture");
+    {self.}XmlAttrUri := new OpenXmlAttribute(nil, "uri", nil);
     {self.}Pic := new Pic(self, "pic", "pic");
     {self.}Chart := new Chart(self, "c", "chart");
 end;

autoclass/docx/GraphicFrameLocks@DOCX.tsf

@@ -43,7 +43,7 @@ end;
 function GraphicFrameLocks.Init();override;
 begin
     {self.}XmlAttrNoChangeAspect := new OpenXmlAttribute(nil, "noChangeAspect", nil);
-    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main");
+    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", nil);
 end;
 
 function GraphicFrameLocks.InitAttributes();override;

autoclass/docx/PBdr@DOCX.tsf

@@ -13,7 +13,8 @@ public
     //  Attributes
 
     // Children
-    Top: PureVal;
+    Top: PBorder;
+    Bottom: PBorder;
 
 end;
 
@@ -34,7 +35,8 @@ end;
 
 function PBdr.Init();override;
 begin
-    {self.}Top := new PureVal(self, {self.}Prefix, "top");
+    {self.}Top := new PBorder(self, {self.}Prefix, "top");
+    {self.}Bottom := new PBorder(self, {self.}Prefix, "bottom");
 end;
 
 function PBdr.InitAttributes();override;
@@ -47,10 +49,12 @@ function PBdr.InitChildren();override;
 begin
     child_elements_ := array(
         0: {self.}Top,
+        1: {self.}Bottom,
     );
     sorted_child_ := array(
         "": -1,
         {self.}Top.ElementName: 0,
+        {self.}Bottom.ElementName: 1,
     );
 end;
 
@@ -95,4 +99,5 @@ end;
 function PBdr.Copy(_obj: PBdr);override;
 begin
     {self.}Top.Copy(_obj.Top);
+    {self.}Bottom.Copy(_obj.Bottom);
 end;

autoclass/docx/PBorder@DOCX.tsf

@@ -0,0 +1,171 @@
+type PBorder = class(OpenXmlElement)
+public
+    function Create();overload;
+    function Create(_node: XmlNode);overload;
+    function Create(_parent: tslobj; _prefix: string; _local_name: string);overload;
+    function Init();override;
+    function InitAttributes();override;
+    function InitChildren();override;
+    function InitNode(_node: XmlNode);override;
+    function Copy(_obj: PBorder);override;
+
+    property Val read ReadXmlAttrVal write WriteXmlAttrVal;
+    property Color read ReadXmlAttrColor write WriteXmlAttrColor;
+    property Space read ReadXmlAttrSpace write WriteXmlAttrSpace;
+    property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor;
+    property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint;
+    property Sz read ReadXmlAttrSz write WriteXmlAttrSz;
+    function ReadXmlAttrVal();
+    function WriteXmlAttrVal(_value);
+    function ReadXmlAttrColor();
+    function WriteXmlAttrColor(_value);
+    function ReadXmlAttrSpace();
+    function WriteXmlAttrSpace(_value);
+    function ReadXmlAttrThemeColor();
+    function WriteXmlAttrThemeColor(_value);
+    function ReadXmlAttrThemeTint();
+    function WriteXmlAttrThemeTint(_value);
+    function ReadXmlAttrSz();
+    function WriteXmlAttrSz(_value);
+
+public
+    //  Attributes
+    XmlAttrVal: OpenXmlAttribute;
+    XmlAttrColor: OpenXmlAttribute;
+    XmlAttrSpace: OpenXmlAttribute;
+    XmlAttrThemeColor: OpenXmlAttribute;
+    XmlAttrThemeTint: OpenXmlAttribute;
+    XmlAttrSz: OpenXmlAttribute;
+
+    // Children
+
+end;
+
+function PBorder.Create();overload;
+begin
+    {self.}Create(nil, "w", "");
+end;
+
+function PBorder.Create(_node: XmlNode);overload;
+begin
+    class(OpenXmlElement).Create(_node: XmlNode);
+end;
+
+function PBorder.Create(_parent: tslobj; _prefix: string; _local_name: string);overload;
+begin
+    class(OpenXmlElement).Create(_parent, _prefix, _local_name);
+end;
+
+function PBorder.Init();override;
+begin
+    {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil);
+    {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "color", nil);
+    {self.}XmlAttrSpace := new OpenXmlAttribute({self.}Prefix, "space", nil);
+    {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil);
+    {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil);
+    {self.}XmlAttrSz := new OpenXmlAttribute({self.}Prefix, "sz", nil);
+end;
+
+function PBorder.InitAttributes();override;
+begin
+    attributes_ := array(
+        {self.}XmlAttrVal,
+        {self.}XmlAttrColor,
+        {self.}XmlAttrSpace,
+        {self.}XmlAttrThemeColor,
+        {self.}XmlAttrThemeTint,
+        {self.}XmlAttrSz,
+    );
+end;
+
+function PBorder.InitChildren();override;
+begin
+    child_elements_ := array(
+    );
+    sorted_child_ := array(
+        "": -1,
+    );
+end;
+
+function PBorder.InitNode(_node: XmlNode);override;
+begin
+    if ifObj({self.}XmlNode) then
+        for k,v in child_elements_ do v.InitNode(nil);
+    {self.}XmlNode := ifObj(_node) ? _node : nil;
+end;
+
+function PBorder.Copy(_obj: PBorder);override;
+begin
+    if not ifnil(_obj.XmlAttrVal.Value) then
+        {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value;
+    if not ifnil(_obj.XmlAttrColor.Value) then
+        {self.}XmlAttrColor.Value := _obj.XmlAttrColor.Value;
+    if not ifnil(_obj.XmlAttrSpace.Value) then
+        {self.}XmlAttrSpace.Value := _obj.XmlAttrSpace.Value;
+    if not ifnil(_obj.XmlAttrThemeColor.Value) then
+        {self.}XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value;
+    if not ifnil(_obj.XmlAttrThemeTint.Value) then
+        {self.}XmlAttrThemeTint.Value := _obj.XmlAttrThemeTint.Value;
+    if not ifnil(_obj.XmlAttrSz.Value) then
+        {self.}XmlAttrSz.Value := _obj.XmlAttrSz.Value;
+end;
+
+function PBorder.ReadXmlAttrVal();
+begin
+    return {self.}XmlAttrVal.Value;
+end;
+
+function PBorder.WriteXmlAttrVal(_value);
+begin
+    {self.}XmlAttrVal.Value := _value;
+end;
+
+function PBorder.ReadXmlAttrColor();
+begin
+    return {self.}XmlAttrColor.Value;
+end;
+
+function PBorder.WriteXmlAttrColor(_value);
+begin
+    {self.}XmlAttrColor.Value := _value;
+end;
+
+function PBorder.ReadXmlAttrSpace();
+begin
+    return {self.}XmlAttrSpace.Value;
+end;
+
+function PBorder.WriteXmlAttrSpace(_value);
+begin
+    {self.}XmlAttrSpace.Value := _value;
+end;
+
+function PBorder.ReadXmlAttrThemeColor();
+begin
+    return {self.}XmlAttrThemeColor.Value;
+end;
+
+function PBorder.WriteXmlAttrThemeColor(_value);
+begin
+    {self.}XmlAttrThemeColor.Value := _value;
+end;
+
+function PBorder.ReadXmlAttrThemeTint();
+begin
+    return {self.}XmlAttrThemeTint.Value;
+end;
+
+function PBorder.WriteXmlAttrThemeTint(_value);
+begin
+    {self.}XmlAttrThemeTint.Value := _value;
+end;
+
+function PBorder.ReadXmlAttrSz();
+begin
+    return {self.}XmlAttrSz.Value;
+end;
+
+function PBorder.WriteXmlAttrSz(_value);
+begin
+    {self.}XmlAttrSz.Value := _value;
+end;

autoclass/docx/Pic@DOCX.tsf

@@ -41,7 +41,7 @@ end;
 
 function Pic.Init();override;
 begin
-    {self.}XmlAttrXmlnsPic := new OpenXmlAttribute("xmlns", "pic", "http://schemas.openxmlformats.org/drawingml/2006/picture");
+    {self.}XmlAttrXmlnsPic := new OpenXmlAttribute("xmlns", "pic", nil);
     {self.}NvPicPr := new NvPicPr(self, {self.}Prefix, "nvPicPr");
     {self.}BlipFill := new BlipFill(self, {self.}Prefix, "blipFill");
     {self.}SpPr := new SpPr(self, {self.}Prefix, "spPr");

autoclass/docx/Properties@DOCX.tsf

@@ -58,8 +58,8 @@ end;
 
 function Properties.Init();override;
 begin
-    {self.}XmlAttrXmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties");
-    {self.}XmlAttrXmlnsVt := new OpenXmlAttribute("xmlns", "vt", "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
+    {self.}XmlAttrXmlns := new OpenXmlAttribute(nil, "xmlns", nil);
+    {self.}XmlAttrXmlnsVt := new OpenXmlAttribute("xmlns", "vt", nil);
     {self.}Template := new OpenXmlPcdata(self, nil, "Template");
     {self.}TotalTime := new OpenXmlPcdata(self, nil, "TotalTime");
     {self.}Pages := new OpenXmlPcdata(self, nil, "Pages");

autoclass/docx/Relationships@DOCX.tsf

@@ -43,7 +43,7 @@ end;
 
 function Relationships.Init();override;
 begin
-    {self.}XmlAttrxmlns := new OpenXmlAttribute(nil, "xmlns", "http://schemas.openxmlformats.org/package/2006/relationships");
+    {self.}XmlAttrxmlns := new OpenXmlAttribute(nil, "xmlns", nil);
 end;
 
 function Relationships.InitAttributes();override;

autoclass/docx/SectPr@DOCX.tsf

@@ -119,7 +119,7 @@ begin
             obj := nil;
             case node_name of
                 pre + "headerReference": obj := {self.}AppendHeaderReference();
-                pre + "FooterReference": obj := {self.}AppendFooterReference();
+                pre + "footerReference": obj := {self.}AppendFooterReference();
             end;
             if ifObj(obj) then obj.InitNode(node);
         end
@@ -169,9 +169,9 @@ begin
     if len = 0 then i := -1;
     else begin
         for i:=len-1 downto 0 do
-            if child_elements_[i].LocalName = "FooterReference" then break;
+            if child_elements_[i].LocalName = "footerReference" then break;
     end
-    obj := new Reference(self, {self.}Prefix, "FooterReference");
+    obj := new Reference(self, {self.}Prefix, "footerReference");
     {self.}InsertChild(obj, i+1);
     return obj;
 end;
@@ -185,7 +185,7 @@ end;
 
 function SectPr.AppendFooterReference(): Reference;
 begin
-    obj := new Reference(self, {self.}Prefix, "FooterReference");
+    obj := new Reference(self, {self.}Prefix, "footerReference");
     child_elements_[length(child_elements_)] := obj;
     return obj;
 end;
@@ -212,7 +212,7 @@ begin
     arr := array();
     for k,v in child_elements_ do
     begin
-        if v.LocalName = "FooterReference" then
+        if v.LocalName = "footerReference" then
         begin
             arr[length(arr)] := v;
             ind--;

autoclass/docx/TblBorder@DOCX.tsf

@@ -11,7 +11,7 @@ public
 
     property Val read ReadXmlAttrVal write WriteXmlAttrVal;
     property Color read ReadXmlAttrColor write WriteXmlAttrColor;
-    property Spce read ReadXmlAttrSpce write WriteXmlAttrSpce;
+    property Space read ReadXmlAttrSpace write WriteXmlAttrSpace;
     property ThemeColor read ReadXmlAttrThemeColor write WriteXmlAttrThemeColor;
     property ThemeTint read ReadXmlAttrThemeTint write WriteXmlAttrThemeTint;
     property Sz read ReadXmlAttrSz write WriteXmlAttrSz;
@@ -19,8 +19,8 @@ public
     function WriteXmlAttrVal(_value);
     function ReadXmlAttrColor();
     function WriteXmlAttrColor(_value);
-    function ReadXmlAttrSpce();
-    function WriteXmlAttrSpce(_value);
+    function ReadXmlAttrSpace();
+    function WriteXmlAttrSpace(_value);
     function ReadXmlAttrThemeColor();
     function WriteXmlAttrThemeColor(_value);
     function ReadXmlAttrThemeTint();
@@ -32,7 +32,7 @@ public
     //  Attributes
     XmlAttrVal: OpenXmlAttribute;
     XmlAttrColor: OpenXmlAttribute;
-    XmlAttrSpce: OpenXmlAttribute;
+    XmlAttrSpace: OpenXmlAttribute;
     XmlAttrThemeColor: OpenXmlAttribute;
     XmlAttrThemeTint: OpenXmlAttribute;
     XmlAttrSz: OpenXmlAttribute;
@@ -60,7 +60,7 @@ function TblBorder.Init();override;
 begin
     {self.}XmlAttrVal := new OpenXmlAttribute({self.}Prefix, "val", nil);
     {self.}XmlAttrColor := new OpenXmlAttribute({self.}Prefix, "color", nil);
-    {self.}XmlAttrSpce := new OpenXmlAttribute({self.}Prefix, "space", nil);
+    {self.}XmlAttrSpace := new OpenXmlAttribute({self.}Prefix, "space", nil);
     {self.}XmlAttrThemeColor := new OpenXmlAttribute({self.}Prefix, "themeColor", nil);
     {self.}XmlAttrThemeTint := new OpenXmlAttribute({self.}Prefix, "themeTint", nil);
     {self.}XmlAttrSz := new OpenXmlAttribute({self.}Prefix, "sz", nil);
@@ -71,7 +71,7 @@ begin
     attributes_ := array(
         {self.}XmlAttrVal,
         {self.}XmlAttrColor,
-        {self.}XmlAttrSpce,
+        {self.}XmlAttrSpace,
         {self.}XmlAttrThemeColor,
         {self.}XmlAttrThemeTint,
         {self.}XmlAttrSz,
@@ -100,8 +100,8 @@ begin
         {self.}XmlAttrVal.Value := _obj.XmlAttrVal.Value;
     if not ifnil(_obj.XmlAttrColor.Value) then
         {self.}XmlAttrColor.Value := _obj.XmlAttrColor.Value;
-    if not ifnil(_obj.XmlAttrSpce.Value) then
-        {self.}XmlAttrSpce.Value := _obj.XmlAttrSpce.Value;
+    if not ifnil(_obj.XmlAttrSpace.Value) then
+        {self.}XmlAttrSpace.Value := _obj.XmlAttrSpace.Value;
     if not ifnil(_obj.XmlAttrThemeColor.Value) then
         {self.}XmlAttrThemeColor.Value := _obj.XmlAttrThemeColor.Value;
     if not ifnil(_obj.XmlAttrThemeTint.Value) then
@@ -130,14 +130,14 @@ begin
     {self.}XmlAttrColor.Value := _value;
 end;
 
-function TblBorder.ReadXmlAttrSpce();
+function TblBorder.ReadXmlAttrSpace();
 begin
-    return {self.}XmlAttrSpce.Value;
+    return {self.}XmlAttrSpace.Value;
 end;
 
-function TblBorder.WriteXmlAttrSpce(_value);
+function TblBorder.WriteXmlAttrSpace(_value);
 begin
-    {self.}XmlAttrSpce.Value := _value;
+    {self.}XmlAttrSpace.Value := _value;
 end;
 
 function TblBorder.ReadXmlAttrThemeColor();

autoclass/docx/Theme@DOCX.tsf

@@ -53,8 +53,8 @@ end;
 
 function Theme.Init();override;
 begin
-    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", "http://schemas.openxmlformats.org/drawingml/2006/main");
-    {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", "Office 主题");
+    {self.}XmlAttrXmlnsA := new OpenXmlAttribute("xmlns", "a", nil);
+    {self.}XmlAttrName := new OpenXmlAttribute(nil, "name", nil);
     {self.}ThemeElements := new ThemeElements(self, {self.}Prefix, "themeElements");
     {self.}XmlChildObjectDefaults := new OpenXmlEmpty(self, {self.}Prefix, "objectDefaults");
     {self.}XmlChildExtraClrSchemeLst := new OpenXmlEmpty(self, {self.}Prefix, "extraClrSchemeLst");