diff --git a/.vs/WinformGeneralDeveloperFrame/v17/.suo b/.vs/WinformGeneralDeveloperFrame/v17/.suo index 7ea98cd..ed38fd2 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v17/.suo and b/.vs/WinformGeneralDeveloperFrame/v17/.suo differ diff --git a/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin b/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin index 2150774..e51ec5d 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin and b/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin differ diff --git a/DataBase/Class1.cs b/DataBase/Class1.cs index 54e0b82..8d0a204 100644 --- a/DataBase/Class1.cs +++ b/DataBase/Class1.cs @@ -8,6 +8,7 @@ namespace DataBase { public class Class1 { - + string a="22"; + } } diff --git a/WinformGeneralDeveloperFrame/FrmBaseEdit.Designer.cs b/WinformGeneralDeveloperFrame/FrmBaseEdit.Designer.cs index b285bc0..21b4bee 100644 --- a/WinformGeneralDeveloperFrame/FrmBaseEdit.Designer.cs +++ b/WinformGeneralDeveloperFrame/FrmBaseEdit.Designer.cs @@ -36,9 +36,10 @@ namespace WinformGeneralDeveloperFrame // btnOK // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnOK.Location = new System.Drawing.Point(442, 353); + this.btnOK.Location = new System.Drawing.Point(511, 461); + this.btnOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.Size = new System.Drawing.Size(86, 30); this.btnOK.TabIndex = 0; this.btnOK.Text = "保存"; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); @@ -46,20 +47,22 @@ namespace WinformGeneralDeveloperFrame // btnCanel // this.btnCanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnCanel.Location = new System.Drawing.Point(539, 353); + this.btnCanel.Location = new System.Drawing.Point(622, 461); + this.btnCanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnCanel.Name = "btnCanel"; - this.btnCanel.Size = new System.Drawing.Size(75, 23); + this.btnCanel.Size = new System.Drawing.Size(86, 30); this.btnCanel.TabIndex = 1; this.btnCanel.Text = "取消"; this.btnCanel.Click += new System.EventHandler(this.btnCanel_Click); // // FrmBaseEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(638, 388); + this.ClientSize = new System.Drawing.Size(735, 506); this.Controls.Add(this.btnCanel); this.Controls.Add(this.btnOK); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FrmBaseEdit"; this.Text = "FrmBaseEdit"; this.ResumeLayout(false); diff --git a/WinformGeneralDeveloperFrame/FrmBaseForm.Designer.cs b/WinformGeneralDeveloperFrame/FrmBaseForm.Designer.cs index 8dd78b2..5938366 100644 --- a/WinformGeneralDeveloperFrame/FrmBaseForm.Designer.cs +++ b/WinformGeneralDeveloperFrame/FrmBaseForm.Designer.cs @@ -37,16 +37,18 @@ namespace WinformGeneralDeveloperFrame // this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top; this.panelControl1.Location = new System.Drawing.Point(0, 0); + this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panelControl1.Name = "panelControl1"; - this.panelControl1.Size = new System.Drawing.Size(1261, 34); + this.panelControl1.Size = new System.Drawing.Size(1447, 44); this.panelControl1.TabIndex = 0; // // FrmBaseForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1261, 718); + this.ClientSize = new System.Drawing.Size(1447, 930); this.Controls.Add(this.panelControl1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FrmBaseForm"; this.Text = "FrmBaseForm"; this.Load += new System.EventHandler(this.FrmBaseForm_Load); diff --git a/WinformGeneralDeveloperFrame/FrmBaseForm.cs b/WinformGeneralDeveloperFrame/FrmBaseForm.cs index 16157a5..f541b9e 100644 --- a/WinformGeneralDeveloperFrame/FrmBaseForm.cs +++ b/WinformGeneralDeveloperFrame/FrmBaseForm.cs @@ -24,7 +24,7 @@ namespace WinformGeneralDeveloperFrame { public partial class FrmBaseForm : XtraForm { - public string ID = string.Empty; // 主键 + public string Id = string.Empty; // 主键 private XtraTabControl xtraTab; private GridControl gridControl; private GridControl gridControlDetail; @@ -33,7 +33,7 @@ namespace WinformGeneralDeveloperFrame private GridView gridViewDetail; private LayoutControlGroup[] controlGroups; private object DataType; - public string menucode; + public string Menucode; /// /// 值自动生成控件name /// @@ -208,7 +208,7 @@ namespace WinformGeneralDeveloperFrame int width = 0; foreach (sysToolButtonInfo info in list) { - if (AppInfo.FunctionList.Contains(menucode+"-"+info.btnCode)) + if (AppInfo.FunctionList.Contains(Menucode+"-"+info.btnCode)) { SimpleButton button = new SimpleButton(); button.Name = "btn" + info.btnCode; @@ -566,7 +566,7 @@ namespace WinformGeneralDeveloperFrame } public void ClearScreen() { - this.ID = "";////需要设置为空，表示新增 + this.Id = "";////需要设置为空，表示新增 ClearControlValue(this); } public void ClearControlValue(System.Windows.Forms.Control ctrl) diff --git a/WinformGeneralDeveloperFrame/FrmShowForm.Designer.cs b/WinformGeneralDeveloperFrame/FrmShowForm.Designer.cs index 364af78..d59c51d 100644 --- a/WinformGeneralDeveloperFrame/FrmShowForm.Designer.cs +++ b/WinformGeneralDeveloperFrame/FrmShowForm.Designer.cs @@ -41,33 +41,37 @@ namespace WinformGeneralDeveloperFrame this.panelControl1.Controls.Add(this.labelControl1); this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top; this.panelControl1.Location = new System.Drawing.Point(0, 0); + this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panelControl1.Name = "panelControl1"; - this.panelControl1.Size = new System.Drawing.Size(954, 28); + this.panelControl1.Size = new System.Drawing.Size(1096, 36); this.panelControl1.TabIndex = 0; // // labelControl1 // this.labelControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.labelControl1.Location = new System.Drawing.Point(2, 2); + this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl1.Name = "labelControl1"; - this.labelControl1.Size = new System.Drawing.Size(0, 14); + this.labelControl1.Size = new System.Drawing.Size(0, 18); this.labelControl1.TabIndex = 0; // // flowLayoutPanel1 // this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 28); + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(954, 588); + this.flowLayoutPanel1.Size = new System.Drawing.Size(1096, 763); this.flowLayoutPanel1.TabIndex = 1; // // FrmShowForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(954, 616); + this.ClientSize = new System.Drawing.Size(1096, 799); this.Controls.Add(this.flowLayoutPanel1); this.Controls.Add(this.panelControl1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FrmShowForm"; this.Text = "ShowForm"; this.Load += new System.EventHandler(this.FrmShowForm_Load); diff --git a/WinformGeneralDeveloperFrame/MainForm.cs b/WinformGeneralDeveloperFrame/MainForm.cs index b78c670..22d8f4d 100644 --- a/WinformGeneralDeveloperFrame/MainForm.cs +++ b/WinformGeneralDeveloperFrame/MainForm.cs @@ -35,12 +35,12 @@ namespace WinformGeneralDeveloperFrame { using (var db=new MESDB()) { - AppInfo.FunctionList = db.Database.SqlQuery(string.Format(@"SELECT a.functionCode + AppInfo.FunctionList = db.Database.SqlQuery($@"SELECT a.functionCode FROM[winformdevfarme].[dbo].[sysFunction] a left join[winformdevfarme].[dbo].[sysRoleFunction] b on a.id = b.functionId left join[winformdevfarme].[dbo].[sysUserRole] c on b.roleId = c.roleId left join[winformdevfarme].[dbo].[sysUser] d on d.id = c.userId - where d.account = '{0}'",AppInfo.LoginUserInfo.account)).ToListAsync().Result; + where d.account = '{AppInfo.LoginUserInfo.account}'").ToListAsync().Result; } } @@ -112,7 +112,7 @@ namespace WinformGeneralDeveloperFrame private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { //使用QQ开放平台的发邮件界面 - string mailUrl = string.Format("http://mail.qq.com/cgi-bin/qm_share?t=qm_mailme&email=648428741@qq.com"); + string mailUrl = "http://mail.qq.com/cgi-bin/qm_share?t=qm_mailme&email=648428741@qq.com"; Process.Start(mailUrl); } diff --git a/WinformGeneralDeveloperFrame/Properties/licenses.licx b/WinformGeneralDeveloperFrame/Properties/licenses.licx index 5a691c8..7e121a5 100644 --- a/WinformGeneralDeveloperFrame/Properties/licenses.licx +++ b/WinformGeneralDeveloperFrame/Properties/licenses.licx @@ -1,17 +1,20 @@ -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit, DevExpress.XtraTreeList.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit, DevExpress.XtraTreeList.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/WinformGeneralDeveloperFrame/frmSelectDataBase.Designer.cs b/WinformGeneralDeveloperFrame/frmSelectDataBase.Designer.cs index e4eaba8..3663b05 100644 --- a/WinformGeneralDeveloperFrame/frmSelectDataBase.Designer.cs +++ b/WinformGeneralDeveloperFrame/frmSelectDataBase.Designer.cs @@ -108,8 +108,9 @@ namespace WinformGeneralDeveloperFrame // completionWizardPage1 // this.completionWizardPage1.Controls.Add(this.layoutControl1); + this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.completionWizardPage1.Name = "completionWizardPage1"; - this.completionWizardPage1.Size = new System.Drawing.Size(712, 383); + this.completionWizardPage1.Size = new System.Drawing.Size(814, 461); this.completionWizardPage1.Text = "明细设置"; // // layoutControl1 @@ -123,50 +124,56 @@ namespace WinformGeneralDeveloperFrame this.layoutControl1.Controls.Add(this.textEdit1); this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl1.Location = new System.Drawing.Point(0, 0); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(712, 383); + this.layoutControl1.Size = new System.Drawing.Size(814, 461); this.layoutControl1.TabIndex = 0; this.layoutControl1.Text = "layoutControl1"; // // isEntity // - this.isEntity.Location = new System.Drawing.Point(466, 12); + this.isEntity.Location = new System.Drawing.Point(527, 16); + this.isEntity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.isEntity.Name = "isEntity"; this.isEntity.Properties.Caption = "生成实体类"; - this.isEntity.Size = new System.Drawing.Size(82, 19); + this.isEntity.Size = new System.Drawing.Size(97, 22); this.isEntity.StyleController = this.layoutControl1; this.isEntity.TabIndex = 10; // // isDB // - this.isDB.Location = new System.Drawing.Point(626, 12); + this.isDB.Location = new System.Drawing.Point(714, 16); + this.isDB.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.isDB.Name = "isDB"; this.isDB.Properties.Caption = "生成EFDB"; - this.isDB.Size = new System.Drawing.Size(74, 19); + this.isDB.Size = new System.Drawing.Size(87, 22); this.isDB.StyleController = this.layoutControl1; this.isDB.TabIndex = 9; // // isWinform // - this.isWinform.Location = new System.Drawing.Point(552, 12); + this.isWinform.Location = new System.Drawing.Point(628, 16); + this.isWinform.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.isWinform.Name = "isWinform"; this.isWinform.Properties.Caption = "生成界面"; - this.isWinform.Size = new System.Drawing.Size(70, 19); + this.isWinform.Size = new System.Drawing.Size(82, 22); this.isWinform.StyleController = this.layoutControl1; this.isWinform.TabIndex = 9; // // gridControl1 // - this.gridControl1.Location = new System.Drawing.Point(12, 38); + this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.gridControl1.Location = new System.Drawing.Point(13, 49); this.gridControl1.MainView = this.gridView1; + this.gridControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.gridControl1.Name = "gridControl1"; this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1, this.repositoryItemCheckEdit2, this.repositoryItemComboBox1, this.repositoryItemComboBox2}); - this.gridControl1.Size = new System.Drawing.Size(688, 333); + this.gridControl1.Size = new System.Drawing.Size(788, 396); this.gridControl1.TabIndex = 7; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -187,6 +194,8 @@ namespace WinformGeneralDeveloperFrame this.isIdentity, this.gridColumn2, this.gridColumn3}); + this.gridView1.DetailHeight = 450; + this.gridView1.FixedLineWidth = 3; this.gridView1.GridControl = this.gridControl1; this.gridView1.GroupCount = 1; this.gridView1.Name = "gridView1"; @@ -197,34 +206,42 @@ namespace WinformGeneralDeveloperFrame // this.tableName.Caption = "表名"; this.tableName.FieldName = "tableName"; + this.tableName.MinWidth = 23; this.tableName.Name = "tableName"; this.tableName.Visible = true; this.tableName.VisibleIndex = 0; + this.tableName.Width = 86; // // dataBaseFieldName // this.dataBaseFieldName.Caption = "数据库字段名"; this.dataBaseFieldName.FieldName = "dataBaseFieldName"; + this.dataBaseFieldName.MinWidth = 23; this.dataBaseFieldName.Name = "dataBaseFieldName"; this.dataBaseFieldName.Visible = true; this.dataBaseFieldName.VisibleIndex = 0; + this.dataBaseFieldName.Width = 86; // // CSharpFieldName // this.CSharpFieldName.Caption = "C#字段名"; this.CSharpFieldName.FieldName = "CSharpFieldName"; + this.CSharpFieldName.MinWidth = 23; this.CSharpFieldName.Name = "CSharpFieldName"; this.CSharpFieldName.Visible = true; this.CSharpFieldName.VisibleIndex = 1; + this.CSharpFieldName.Width = 86; // // controlType // this.controlType.Caption = "控件类型"; this.controlType.ColumnEdit = this.repositoryItemComboBox1; this.controlType.FieldName = "controlType"; + this.controlType.MinWidth = 23; this.controlType.Name = "controlType"; this.controlType.Visible = true; this.controlType.VisibleIndex = 2; + this.controlType.Width = 86; // // repositoryItemComboBox1 // @@ -247,9 +264,11 @@ namespace WinformGeneralDeveloperFrame this.gridColumn4.Caption = "数据源"; this.gridColumn4.ColumnEdit = this.repositoryItemComboBox2; this.gridColumn4.FieldName = "DataTableName"; + this.gridColumn4.MinWidth = 23; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 3; + this.gridColumn4.Width = 86; // // repositoryItemComboBox2 // @@ -262,26 +281,32 @@ namespace WinformGeneralDeveloperFrame // this.controlName.Caption = "控件name"; this.controlName.FieldName = "controlName"; + this.controlName.MinWidth = 23; this.controlName.Name = "controlName"; this.controlName.Visible = true; this.controlName.VisibleIndex = 4; + this.controlName.Width = 86; // // gridColumn1 // this.gridColumn1.Caption = "label名称"; this.gridColumn1.FieldName = "controlLabelName"; + this.gridColumn1.MinWidth = 23; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 10; + this.gridColumn1.Width = 86; // // isVisible // this.isVisible.Caption = "是否可见"; this.isVisible.ColumnEdit = this.repositoryItemCheckEdit1; this.isVisible.FieldName = "isVisible"; + this.isVisible.MinWidth = 23; this.isVisible.Name = "isVisible"; this.isVisible.Visible = true; this.isVisible.VisibleIndex = 5; + this.isVisible.Width = 86; // // repositoryItemCheckEdit1 // @@ -293,9 +318,11 @@ namespace WinformGeneralDeveloperFrame this.isReadonly.Caption = "是否可编辑"; this.isReadonly.ColumnEdit = this.repositoryItemCheckEdit2; this.isReadonly.FieldName = "isEdit"; + this.isReadonly.MinWidth = 23; this.isReadonly.Name = "isReadonly"; this.isReadonly.Visible = true; this.isReadonly.VisibleIndex = 6; + this.isReadonly.Width = 86; // // repositoryItemCheckEdit2 // @@ -306,41 +333,50 @@ namespace WinformGeneralDeveloperFrame // this.isKey.Caption = "是否主键"; this.isKey.FieldName = "isKey"; + this.isKey.MinWidth = 23; this.isKey.Name = "isKey"; this.isKey.OptionsColumn.ReadOnly = true; this.isKey.Visible = true; this.isKey.VisibleIndex = 7; + this.isKey.Width = 86; // // isIdentity // this.isIdentity.Caption = "是否自增"; this.isIdentity.FieldName = "isIdentity"; + this.isIdentity.MinWidth = 23; this.isIdentity.Name = "isIdentity"; this.isIdentity.OptionsColumn.ReadOnly = true; this.isIdentity.Visible = true; this.isIdentity.VisibleIndex = 9; + this.isIdentity.Width = 86; // // gridColumn2 // this.gridColumn2.Caption = "是否搜索列"; this.gridColumn2.FieldName = "isSearch"; + this.gridColumn2.MinWidth = 23; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 11; + this.gridColumn2.Width = 86; // // gridColumn3 // this.gridColumn3.Caption = "是否为空检验"; this.gridColumn3.FieldName = "isCheck"; + this.gridColumn3.MinWidth = 23; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 8; + this.gridColumn3.Width = 86; // // simpleButton1 // - this.simpleButton1.Location = new System.Drawing.Point(388, 12); + this.simpleButton1.Location = new System.Drawing.Point(443, 16); + this.simpleButton1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.simpleButton1.Name = "simpleButton1"; - this.simpleButton1.Size = new System.Drawing.Size(74, 22); + this.simpleButton1.Size = new System.Drawing.Size(80, 27); this.simpleButton1.StyleController = this.layoutControl1; this.simpleButton1.TabIndex = 6; this.simpleButton1.Text = "浏览"; @@ -348,18 +384,20 @@ namespace WinformGeneralDeveloperFrame // // textEdit2 // - this.textEdit2.Location = new System.Drawing.Point(198, 12); + this.textEdit2.Location = new System.Drawing.Point(230, 16); + this.textEdit2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.textEdit2.Name = "textEdit2"; this.textEdit2.Properties.ReadOnly = true; - this.textEdit2.Size = new System.Drawing.Size(186, 20); + this.textEdit2.Size = new System.Drawing.Size(209, 24); this.textEdit2.StyleController = this.layoutControl1; this.textEdit2.TabIndex = 5; // // textEdit1 // - this.textEdit1.Location = new System.Drawing.Point(63, 12); + this.textEdit1.Location = new System.Drawing.Point(76, 16); + this.textEdit1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.textEdit1.Name = "textEdit1"; - this.textEdit1.Size = new System.Drawing.Size(80, 20); + this.textEdit1.Size = new System.Drawing.Size(87, 24); this.textEdit1.StyleController = this.layoutControl1; this.textEdit1.TabIndex = 4; // @@ -376,7 +414,7 @@ namespace WinformGeneralDeveloperFrame this.layoutControlItem3, this.layoutControlItem6}); this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(712, 383); + this.Root.Size = new System.Drawing.Size(814, 461); this.Root.TextVisible = false; // // layoutControlItem1 @@ -384,52 +422,52 @@ namespace WinformGeneralDeveloperFrame this.layoutControlItem1.Control = this.textEdit1; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(135, 26); + this.layoutControlItem1.Size = new System.Drawing.Size(154, 33); this.layoutControlItem1.Text = "命名空间"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.textEdit2; - this.layoutControlItem2.Location = new System.Drawing.Point(135, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(154, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(241, 26); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 33); this.layoutControlItem2.Text = "输出目录"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.gridControl1; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 26); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 33); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(692, 337); + this.layoutControlItem4.Size = new System.Drawing.Size(792, 402); this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem4.TextVisible = false; // // layoutControlItem5 // this.layoutControlItem5.Control = this.isWinform; - this.layoutControlItem5.Location = new System.Drawing.Point(540, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(615, 0); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(74, 26); + this.layoutControlItem5.Size = new System.Drawing.Size(86, 33); this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem5.TextVisible = false; // // layoutControlItem7 // this.layoutControlItem7.Control = this.isEntity; - this.layoutControlItem7.Location = new System.Drawing.Point(454, 0); + this.layoutControlItem7.Location = new System.Drawing.Point(514, 0); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(86, 26); + this.layoutControlItem7.Size = new System.Drawing.Size(101, 33); this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; // // layoutControlItem3 // this.layoutControlItem3.Control = this.simpleButton1; - this.layoutControlItem3.Location = new System.Drawing.Point(376, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(430, 0); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(78, 26); + this.layoutControlItem3.Size = new System.Drawing.Size(84, 33); this.layoutControlItem3.Text = "浏览"; this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem3.TextVisible = false; @@ -437,27 +475,29 @@ namespace WinformGeneralDeveloperFrame // layoutControlItem6 // this.layoutControlItem6.Control = this.isDB; - this.layoutControlItem6.Location = new System.Drawing.Point(614, 0); + this.layoutControlItem6.Location = new System.Drawing.Point(701, 0); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(78, 26); + this.layoutControlItem6.Size = new System.Drawing.Size(91, 33); this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; // // wizardPage1 // this.wizardPage1.Controls.Add(this.cmbtablelist); + this.wizardPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.wizardPage1.Name = "wizardPage1"; - this.wizardPage1.Size = new System.Drawing.Size(712, 383); + this.wizardPage1.Size = new System.Drawing.Size(814, 461); this.wizardPage1.Text = "选择要生成的数据库表"; // // cmbtablelist // this.cmbtablelist.EditValue = ""; - this.cmbtablelist.Location = new System.Drawing.Point(12, 19); + this.cmbtablelist.Location = new System.Drawing.Point(14, 24); + this.cmbtablelist.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbtablelist.Name = "cmbtablelist"; this.cmbtablelist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.cmbtablelist.Size = new System.Drawing.Size(533, 20); + this.cmbtablelist.Size = new System.Drawing.Size(609, 24); this.cmbtablelist.TabIndex = 0; // // welcomeWizardPage1 @@ -466,44 +506,48 @@ namespace WinformGeneralDeveloperFrame this.welcomeWizardPage1.Controls.Add(this.btnAdd); this.welcomeWizardPage1.Controls.Add(this.cmbDataBaseList); this.welcomeWizardPage1.Controls.Add(this.label1); + this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.welcomeWizardPage1.Name = "welcomeWizardPage1"; - this.welcomeWizardPage1.Size = new System.Drawing.Size(712, 383); + this.welcomeWizardPage1.Size = new System.Drawing.Size(814, 461); this.welcomeWizardPage1.Text = "选择您的数据连接"; // // txtConnurl // - this.txtConnurl.Location = new System.Drawing.Point(26, 108); + this.txtConnurl.Location = new System.Drawing.Point(30, 139); + this.txtConnurl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtConnurl.Name = "txtConnurl"; this.txtConnurl.Properties.ReadOnly = true; - this.txtConnurl.Size = new System.Drawing.Size(531, 96); + this.txtConnurl.Size = new System.Drawing.Size(607, 123); this.txtConnurl.TabIndex = 11; // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(434, 16); + this.btnAdd.Location = new System.Drawing.Point(496, 21); + this.btnAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(123, 23); + this.btnAdd.Size = new System.Drawing.Size(141, 30); this.btnAdd.TabIndex = 10; this.btnAdd.Text = "新建数据连接"; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // // cmbDataBaseList // - this.cmbDataBaseList.Location = new System.Drawing.Point(26, 17); + this.cmbDataBaseList.Location = new System.Drawing.Point(30, 22); + this.cmbDataBaseList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbDataBaseList.Name = "cmbDataBaseList"; this.cmbDataBaseList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cmbDataBaseList.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cmbDataBaseList.Size = new System.Drawing.Size(374, 20); + this.cmbDataBaseList.Size = new System.Drawing.Size(427, 24); this.cmbDataBaseList.TabIndex = 9; this.cmbDataBaseList.SelectedIndexChanged += new System.EventHandler(this.comboBoxEdit1_SelectedIndexChanged); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(23, 80); + this.label1.Location = new System.Drawing.Point(26, 103); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(71, 14); + this.label1.Size = new System.Drawing.Size(88, 18); this.label1.TabIndex = 2; this.label1.Text = "连接字符串:"; // @@ -516,8 +560,9 @@ namespace WinformGeneralDeveloperFrame this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.wizardControl1.FinishText = "完成"; this.wizardControl1.HelpText = "帮助"; - this.wizardControl1.ImageWidth = 216; - this.wizardControl1.MinimumSize = new System.Drawing.Size(117, 108); + this.wizardControl1.ImageWidth = 247; + this.wizardControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.wizardControl1.MinimumSize = new System.Drawing.Size(134, 139); this.wizardControl1.Name = "wizardControl1"; this.wizardControl1.NextText = "下一步"; this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] { @@ -525,7 +570,7 @@ namespace WinformGeneralDeveloperFrame this.wizardPage1, this.completionWizardPage1}); this.wizardControl1.PreviousText = "后退"; - this.wizardControl1.Size = new System.Drawing.Size(772, 551); + this.wizardControl1.Size = new System.Drawing.Size(888, 672); this.wizardControl1.Text = "后退"; this.wizardControl1.WizardStyle = DevExpress.XtraWizard.WizardStyle.WizardAero; this.wizardControl1.CancelClick += new System.ComponentModel.CancelEventHandler(this.wizardControl1_CancelClick); @@ -538,11 +583,12 @@ namespace WinformGeneralDeveloperFrame // // frmSelectDataBase // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(772, 551); + this.ClientSize = new System.Drawing.Size(888, 716); this.Controls.Add(this.wizardControl1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmSelectDataBase";