Changeset 66 for trunk/Components/CoolWeb/Common/UHtmlClasses.pas

Timestamp:

Dec 20, 2011, 9:37:35 AM (13 years ago)

Author:

chronos

Message:

• Opraveno: Generování výstupu u TQueryForm a THtmlTable.
• Přidáno: Mimo přihlašovací formulář přidán také registrační.

File:

• trunk/Components/CoolWeb/Common/UHtmlClasses.pas (modified) (16 diffs)

trunk/Components/CoolWeb/Common/UHtmlClasses.pas

@@ -70 +70 @@
   end;
 
+  { THtmlElement }
+
   THtmlElement = class
-  private
+  protected
     function GetAsXmlElement: TXmlElement; virtual;
   public
@@ -78 +80 @@
     ClassId: string;
     Style: string;
+    procedure Assign(Source: THtmlElement); virtual;
     property AsXmlElement: TXmlElement read GetAsXmlElement;
   end;
@@ -83 +86 @@
   TBlockType = (btNoTag, btBlockLevel, btInline);
 
+  { THtmlString }
+
   THtmlString = class(THtmlElement)
   private
@@ -88 +93 @@
   public
     Text: string;
+    procedure Assign(Source: THtmlElement); override;
   end;
 
@@ -100 +106 @@
 
   THtmlBlock = class(THtmlElement)
-  private
+  protected
     function GetAsXmlElement: TXmlElement; override;
   public
@@ -149 +155 @@
     InputType: THtmlInputType;
     Value: Variant;
+    procedure Assign(Source: THtmlElement); override;
     constructor Create;
     destructor Destroy; override;
@@ -156 +163 @@
 
   THtmlForm = class(THtmlBlock)
-  private
+  protected
+    function GetAsXmlElement: TXmlElement; override;
   public
     Method: string;
     Action: TURL;
-    function GetAsXmlElement: TXmlElement; override;
     constructor Create;
     destructor Destroy; override;
@@ -183 +190 @@
 
   THtmlCell = class(THtmlElement)
+  private
+    function GetAsXmlElement: TXmlElement; override;
+  public
     RowSpan: Integer;
     ColSpan: Integer;
     Value: THtmlElement;
     constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -192 +203 @@
 
   THtmlRow = class(THtmlElement)
+  private
+    function GetAsXmlElement: TXmlElement; override;
+  public
     Cells: TListObject; // TListObject<THtmlCell>
     constructor Create;
@@ -199 +213 @@
   { THtmlTable }
 
-  THtmlTable = class
-  private
-    function GetAsXmlDocument: TXmlDocument;
+  THtmlTable = class(THtmlElement)
+  protected
+    function GetAsXmlElement: TXmlElement; override;
   public
     Rows: TListObject; // TListObject<THtmlRow>
-    property AsXmlDocument: TXmlDocument read GetAsXmlDocument;
     constructor Create;
     destructor Destroy; override;
@@ -280 +293 @@
 { THtmlCell }
 
+function THtmlCell.GetAsXmlElement: TXmlElement;
+begin
+  Result := inherited GetAsXmlElement;
+  TXmlTag(Result).Name := 'td';
+  with TXmlTag(Result).Attributes do begin
+    if ColSpan > 1 then Add('colspan', IntToStr(ColSpan));
+    if RowSpan > 1 then Add('rowspan', IntToStr(RowSpan));
+  end;
+  TXmlTag(Result).SubElements.Add(Value.AsXmlElement);
+end;
+
 constructor THtmlCell.Create;
 begin
@@ -286 +310 @@
 end;
 
+destructor THtmlCell.Destroy;
+begin
+  Value.Free;
+  inherited Destroy;
+end;
+
 { THtmlRow }
+
+function THtmlRow.GetAsXmlElement: TXmlElement;
+var
+  Column: Integer;
+begin
+  Result := inherited GetAsXmlElement;
+  TXmlTag(Result).Name := 'tr';
+  for Column := 0 to Cells.Count - 1 do
+    TXmlTag(Result).SubElements.AddNew(THtmlCell(Cells[Column]).AsXmlElement);
+end;
 
 constructor THtmlRow.Create;
@@ -301 +341 @@
 { THtmlTable }
 
-function THtmlTable.GetAsXmlDocument: TXmlDocument;
+function THtmlTable.GetAsXmlElement: TXmlElement;
 var
   Row, Column: Integer;
 begin
+  Result := inherited;
   with TXmlTag(Result) do begin
     Name := 'table';
     for Row := 0 to Rows.Count - 1 do
-    with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-      Name := 'tr';
-      for Column := 0 to THtmlRow(Rows[Row]).Cells.Count - 1 do
-      with TXmlTag(SubElements.AddNew(TXmlTag.Create)) do begin
-        Name := 'td';
-        SubElements.Add(THtmlCell(THtmlRow(Rows[Row]).Cells[Column]).Value);
-      end;
-    end;
+      SubElements.AddNew(THtmlRow(Rows[Row]).AsXmlElement);
   end;
 end;
@@ -363 +397 @@
     Attributes.Add('type', InputTypeString);
     Attributes.Add('value', Value);
-    Attributes.Add('name', Name);
-  end;
+    if Self.Name <> '' then
+      Attributes.Add('name', Self.Name);
+  end;
+end;
+
+procedure THtmlInput.Assign(Source: THtmlElement);
+begin
+  inherited Assign(Source);
+  InputType := THtmlInput(Source).InputType;
+  Value := THtmlInput(Source).Value;
 end;
 
@@ -523 +565 @@
 end;
 
+procedure THtmlElement.Assign(Source: THtmlElement);
+begin
+  Id := Source.Id;
+  Name := Source.Name;
+  ClassId := Source.ClassId;
+  Style := Source.Style;
+end;
+
 { TIpAddress }
 
@@ -707 +757 @@
 end;
 
+procedure THtmlString.Assign(Source: THtmlElement);
+begin
+  inherited Assign(Source);
+  Text := THtmlString(Source).Text;
+end;
+
 { THostAddress }