Commit faa6a7d2 authored by 段廷瑞's avatar 段廷瑞

1、Excel配置:增加明细自动行高可选配置

parent 5d4df8c6
...@@ -35,3 +35,4 @@ bin ...@@ -35,3 +35,4 @@ bin
/packages/CefSharp.Common.92.0.251 /packages/CefSharp.Common.92.0.251
/packages/CefSharp.WinForms.92.0.251/lib/net452 /packages/CefSharp.WinForms.92.0.251/lib/net452
/packages/CefSharp.WinForms.92.0.251 /packages/CefSharp.WinForms.92.0.251
/AppHome/project.json
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<appSettings> <appSettings>
<add key="LoginInfo" value="wwF/xpBzWek=" /> <add key="LoginInfo" value="wwF/xpBzWek=" />
<add key="LoginVerify" value="v86f5Q3Xa7U=" /> <add key="LoginVerify" value="v86f5Q3Xa7U=" />
<add key="UpdateTime" value="2021-11-20 16:38:06.273" /> <add key="UpdateTime" value="2021-11-20 17:58:10.043" />
</appSettings> </appSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
......
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
this.tsbHelp = new System.Windows.Forms.ToolStripButton(); this.tsbHelp = new System.Windows.Forms.ToolStripButton();
this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column14 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column15 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
...@@ -254,6 +256,8 @@ ...@@ -254,6 +256,8 @@
this.dgvTemplates.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvTemplates.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column11, this.Column11,
this.Column7, this.Column7,
this.Column14,
this.Column15,
this.Column8, this.Column8,
this.Column12, this.Column12,
this.Column13}); this.Column13});
...@@ -324,7 +328,7 @@ ...@@ -324,7 +328,7 @@
this.tslDbLink.Font = new System.Drawing.Font("Microsoft YaHei UI", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tslDbLink.Font = new System.Drawing.Font("Microsoft YaHei UI", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tslDbLink.ForeColor = System.Drawing.Color.Green; this.tslDbLink.ForeColor = System.Drawing.Color.Green;
this.tslDbLink.Name = "tslDbLink"; this.tslDbLink.Name = "tslDbLink";
this.tslDbLink.Size = new System.Drawing.Size(114, 22); this.tslDbLink.Size = new System.Drawing.Size(113, 22);
this.tslDbLink.Text = "--请先选择数据库链接--"; this.tslDbLink.Text = "--请先选择数据库链接--";
// //
// toolStripSeparator2 // toolStripSeparator2
...@@ -356,6 +360,18 @@ ...@@ -356,6 +360,18 @@
this.Column7.Name = "Column7"; this.Column7.Name = "Column7";
this.Column7.Width = 150; this.Column7.Width = 150;
// //
// Column14
//
this.Column14.DataPropertyName = "IsStop";
this.Column14.HeaderText = "停用";
this.Column14.Name = "Column14";
//
// Column15
//
this.Column15.DataPropertyName = "IsDetailAutoRowHeight";
this.Column15.HeaderText = "明细自动行高";
this.Column15.Name = "Column15";
//
// Column8 // Column8
// //
this.Column8.DataPropertyName = "GrpTableName"; this.Column8.DataPropertyName = "GrpTableName";
...@@ -436,6 +452,8 @@ ...@@ -436,6 +452,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column9; private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
private System.Windows.Forms.DataGridViewTextBoxColumn Column11; private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
private System.Windows.Forms.DataGridViewTextBoxColumn Column7; private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
private System.Windows.Forms.DataGridViewCheckBoxColumn Column14;
private System.Windows.Forms.DataGridViewCheckBoxColumn Column15;
private System.Windows.Forms.DataGridViewTextBoxColumn Column8; private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
private System.Windows.Forms.DataGridViewTextBoxColumn Column12; private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
private System.Windows.Forms.DataGridViewTextBoxColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
......
...@@ -38,7 +38,10 @@ namespace Tools.UI ...@@ -38,7 +38,10 @@ namespace Tools.UI
Prefix VARCHAR(50) NULL, Prefix VARCHAR(50) NULL,
TpName VARCHAR(50) NULL, TpName VARCHAR(50) NULL,
GrpTableName VARCHAR(50) NULL, GrpTableName VARCHAR(50) NULL,
GrpColumnName VARCHAR(50) NULL GrpColumnName VARCHAR(50) NULL,
ExportNameSOL VARCHAR(MAX) NULL,
IsStop BIT NULL,
IsDetailAutoRowHeight BIT NULL
) )
CREATE TABLE ModuleTemplateTable CREATE TABLE ModuleTemplateTable
......
...@@ -153,6 +153,12 @@ ...@@ -153,6 +153,12 @@
<metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment