Merge branch 'Release2.3' into lizhongdev

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.Designer.cs

@@ -52,7 +52,7 @@
             // richTextBox1
             // 
             this.richTextBox1.Location = new System.Drawing.Point(13, 53);
-            this.richTextBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.richTextBox1.Margin = new System.Windows.Forms.Padding(2);
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.Size = new System.Drawing.Size(455, 231);
             this.richTextBox1.TabIndex = 60;
@@ -61,7 +61,7 @@
             // progressBar1
             // 
             this.progressBar1.Location = new System.Drawing.Point(93, 293);
-            this.progressBar1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.progressBar1.Margin = new System.Windows.Forms.Padding(2);
             this.progressBar1.Name = "progressBar1";
             this.progressBar1.Size = new System.Drawing.Size(374, 15);
             this.progressBar1.TabIndex = 70;
@@ -89,7 +89,7 @@
             // btn_exit
             // 
             this.btn_exit.Location = new System.Drawing.Point(389, 319);
-            this.btn_exit.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_exit.Margin = new System.Windows.Forms.Padding(2);
             this.btn_exit.Name = "btn_exit";
             this.btn_exit.Size = new System.Drawing.Size(73, 27);
             this.btn_exit.TabIndex = 90;
@@ -111,7 +111,7 @@
             // tb_lj
             // 
             this.tb_lj.Location = new System.Drawing.Point(68, 30);
-            this.tb_lj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_lj.Margin = new System.Windows.Forms.Padding(2);
             this.tb_lj.Name = "tb_lj";
             this.tb_lj.ReadOnly = true;
             this.tb_lj.Size = new System.Drawing.Size(285, 21);
@@ -121,7 +121,7 @@
             // btn_selectPath
             // 
             this.btn_selectPath.Location = new System.Drawing.Point(356, 29);
-            this.btn_selectPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_selectPath.Margin = new System.Windows.Forms.Padding(2);
             this.btn_selectPath.Name = "btn_selectPath";
             this.btn_selectPath.Size = new System.Drawing.Size(47, 20);
             this.btn_selectPath.TabIndex = 40;
@@ -134,7 +134,7 @@
             // tb_mblj
             // 
             this.tb_mblj.Location = new System.Drawing.Point(68, 6);
-            this.tb_mblj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_mblj.Margin = new System.Windows.Forms.Padding(2);
             this.tb_mblj.Name = "tb_mblj";
             this.tb_mblj.ReadOnly = true;
             this.tb_mblj.Size = new System.Drawing.Size(285, 21);
@@ -143,7 +143,7 @@
             // btn_openfilepath
             // 
             this.btn_openfilepath.Location = new System.Drawing.Point(356, 4);
-            this.btn_openfilepath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_openfilepath.Margin = new System.Windows.Forms.Padding(2);
             this.btn_openfilepath.Name = "btn_openfilepath";
             this.btn_openfilepath.Size = new System.Drawing.Size(47, 20);
             this.btn_openfilepath.TabIndex = 10;
@@ -155,7 +155,7 @@
             // btn_TempDes
             // 
             this.btn_TempDes.Location = new System.Drawing.Point(407, 4);
-            this.btn_TempDes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_TempDes.Margin = new System.Windows.Forms.Padding(2);
             this.btn_TempDes.Name = "btn_TempDes";
             this.btn_TempDes.Size = new System.Drawing.Size(65, 20);
             this.btn_TempDes.TabIndex = 20;
@@ -179,7 +179,7 @@
             this.cbo_sjy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbo_sjy.FormattingEnabled = true;
             this.cbo_sjy.Location = new System.Drawing.Point(68, 31);
-            this.cbo_sjy.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cbo_sjy.Margin = new System.Windows.Forms.Padding(2);
             this.cbo_sjy.Name = "cbo_sjy";
             this.cbo_sjy.Size = new System.Drawing.Size(285, 20);
             this.cbo_sjy.TabIndex = 50;
@@ -187,7 +187,7 @@
             // panel_container
             // 
             this.panel_container.Location = new System.Drawing.Point(66, 188);
-            this.panel_container.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel_container.Margin = new System.Windows.Forms.Padding(2);
             this.panel_container.Name = "panel_container";
             this.panel_container.Size = new System.Drawing.Size(17, 21);
             this.panel_container.TabIndex = 5;
@@ -195,7 +195,7 @@
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(407, 29);
-            this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.button3.Margin = new System.Windows.Forms.Padding(2);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(65, 20);
             this.button3.TabIndex = 40;
@@ -208,7 +208,7 @@
             // btn_preview
             // 
             this.btn_preview.Location = new System.Drawing.Point(312, 319);
-            this.btn_preview.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_preview.Margin = new System.Windows.Forms.Padding(2);
             this.btn_preview.Name = "btn_preview";
             this.btn_preview.Size = new System.Drawing.Size(73, 27);
             this.btn_preview.TabIndex = 80;
@@ -230,6 +230,7 @@
             this.button7.TabIndex = 1008;
             this.button7.Text = "国标导出";
             this.button7.UseVisualStyleBackColor = true;
+            this.button7.Visible = false;
             this.button7.Click += new System.EventHandler(this.button7_Click);
             // 
             // OTSReport_Export
@@ -256,7 +257,7 @@
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.panel_container);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(491, 389);
             this.MinimizeBox = false;