From 84a67b8541e5d26d3eb79adde960488226adbd0e Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期六, 31 八月 2024 10:32:14 +0800
Subject: [PATCH] 优化，删除了用不到的命名空间
---
DevApp/Gs.DevApp/Resources/salesperiodlifetime_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 21 ++
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 4
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11 +
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/DevFrm/User/UserAdd.Designer.cs | 229 ++++++++++++++--------------
DevApp/Gs.DevApp/Models/LoginInfoModel.cs | 5
DevApp/Gs.DevApp/ToolBox/MsgHelper.cs | 4
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs | 9
DevApp/Gs.DevApp/Models/ReturnModel.cs | 3
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 5
DevApp/Gs.DevApp/Models/PageQueryModel.cs | 5
DevApp/Gs.DevApp/ToolBox/LogHelper.cs | 4
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 3
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 37 ++++
DevApp/Gs.DevApp/Properties/Resources1.Designer.cs | 20 ++
DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs | 48 +++--
DevApp/Gs.DevApp/Properties/Resources.resx | 24 +-
DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs | 1
DevApp/Gs.DevApp/Resources/salesperiodlifetime_16x16.png | 0
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs | 20 ++
DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs | 15 +
23 files changed, 287 insertions(+), 185 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 05c103c..876599f 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -21,6 +21,6 @@
<appSettings>
<add key="WebApiUrl" value="http://localhost:5263/"/>
<add key="LogPath" value="logs"/>
- <add key="ProductName" value="骞挎繁MES-V2.0"/>
+ <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0"/>
</appSettings>
</configuration>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index 3b3032d..d4fa2f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -57,9 +57,8 @@
this.lbVersion.ForeColor = System.Drawing.Color.White;
this.lbVersion.Location = new System.Drawing.Point(12, 9);
this.lbVersion.Name = "lbVersion";
- this.lbVersion.Size = new System.Drawing.Size(150, 24);
+ this.lbVersion.Size = new System.Drawing.Size(0, 24);
this.lbVersion.TabIndex = 244;
- this.lbVersion.Text = "骞挎繁MES-V2.0";
//
// panel1
//
@@ -232,7 +231,6 @@
this.MinimizeBox = false;
this.Name = "FrmLogin";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.TopMost = true;
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.chkSaveLoginInfo.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 5090152..142ff73 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -12,7 +12,7 @@
public FrmLogin()
{
InitializeComponent();
- this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ this.Text=lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
UtilityHelper.SetFont(panel1);
@@ -39,7 +39,6 @@
sdf.SetCaption("鎵ц杩涘害锛�" + (i - 80) + "/" + i.ToString() + "锛�");
try
{
-
string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
JObject _login = _rtn.rtnData;
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 207b9d8..3398ead 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -33,8 +33,12 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
this.fluentDesignFormContainer1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormContainer();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.tooLoading = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusLabel4 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusLabel5 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
this.tab = new DevExpress.XtraTab.XtraTabControl();
this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
@@ -92,14 +96,37 @@
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripStatusLabel1,
+ this.tooLoading,
+ this.toolStripStatusLabel4,
this.toolStripStatusLabel3,
this.toolStripStatusLabel2,
+ this.toolStripStatusLabel5,
this.toolTime});
this.statusStrip1.Location = new System.Drawing.Point(0, 701);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(806, 26);
this.statusStrip1.TabIndex = 5;
this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripStatusLabel1
+ //
+ this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(17, 20);
+ this.toolStripStatusLabel1.Text = " ";
+ //
+ // tooLoading
+ //
+ this.tooLoading.Image = global::Gs.DevApp.Properties.Resources.convert_16x16;
+ this.tooLoading.Name = "tooLoading";
+ this.tooLoading.Size = new System.Drawing.Size(119, 20);
+ this.tooLoading.Text = "閲嶆柊鍔犺浇绯荤粺";
+ //
+ // toolStripStatusLabel4
+ //
+ this.toolStripStatusLabel4.Name = "toolStripStatusLabel4";
+ this.toolStripStatusLabel4.Size = new System.Drawing.Size(17, 20);
+ this.toolStripStatusLabel4.Text = " ";
//
// toolStripStatusLabel3
//
@@ -112,6 +139,12 @@
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
this.toolStripStatusLabel2.Size = new System.Drawing.Size(174, 20);
this.toolStripStatusLabel2.Text = "鎶�鏈敮鎸侊細瀹佹尝骞挎繁绉戞妧";
+ //
+ // toolStripStatusLabel5
+ //
+ this.toolStripStatusLabel5.Name = "toolStripStatusLabel5";
+ this.toolStripStatusLabel5.Size = new System.Drawing.Size(17, 20);
+ this.toolStripStatusLabel5.Text = " ";
//
// toolTime
//
@@ -499,5 +532,9 @@
private DevExpress.XtraBars.BarButtonItem barButtonItem5;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3;
private System.Windows.Forms.ToolStripStatusLabel toolTime;
+ private System.Windows.Forms.ToolStripStatusLabel tooLoading;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel4;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 56d4fd0..270fdae 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -22,11 +22,22 @@
this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
tab.CloseButtonClick += Tab_CloseButtonClick;
getTree();
+ tooLoading.Click += TooLoading_Click;
+ }
+
+ private void TooLoading_Click(object sender, EventArgs e)
+ {
+ int i = 100;
+ Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝ｅ湪鎿嶄綔涓紒");
+ for (int j = 0; j < i; j++) {
+ sdf.SetCaption("鎵ц杩涘害锛�" + (j) + "/" +i.ToString() + "锛�");
+ }
+ sdf.Close();
}
private void Tab_CloseButtonClick(object sender, EventArgs e)
{
- RemoveTabPage(tab,e);
+ RemoveTabPage(tab, e);
}
private void getTree()
@@ -77,7 +88,8 @@
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
//
- if (idx == 0) {
+ if (idx == 0)
+ {
string tabPageName = _itm.Name + "_page";
string tabText = _itm.Text;//褰撳墠閫夐」鍗￠〉Text鏍囬
string newFormName = _itm.Tag.ToString();//瀛樿矾寰勶紝绫诲悕
@@ -143,6 +155,11 @@
/// <param name="e"></param>
public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
{
+ if (TabPageDic.Count <= 1)
+ {
+ ToolBox.MsgHelper.Warning("璇疯嚦灏戜繚鐣欎竴涓姛鑳斤紒");
+ return;
+ }
DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs args = (DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs)e;
string name = args.Page.Tooltip;
foreach (XtraTabPage item in tabControl.TabPages)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs
index eb973ee..75cd7d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleAdd.Designer.cs
@@ -105,7 +105,7 @@
//
// txtName
//
- this.txtName.Location = new System.Drawing.Point(109, 16);
+ this.txtName.Location = new System.Drawing.Point(115, 16);
this.txtName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(297, 24);
@@ -131,7 +131,7 @@
//
// labelControl7
//
- this.labelControl7.Location = new System.Drawing.Point(34, 67);
+ this.labelControl7.Location = new System.Drawing.Point(31, 67);
this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl7.Name = "labelControl7";
this.labelControl7.Size = new System.Drawing.Size(75, 18);
@@ -180,7 +180,7 @@
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(415, 98);
+ this.labelControl9.Location = new System.Drawing.Point(418, 98);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -189,7 +189,7 @@
//
// labelControl5
//
- this.labelControl5.Location = new System.Drawing.Point(37, 152);
+ this.labelControl5.Location = new System.Drawing.Point(31, 152);
this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(75, 18);
@@ -198,7 +198,7 @@
//
// txtStatus
//
- this.txtStatus.Location = new System.Drawing.Point(117, 148);
+ this.txtStatus.Location = new System.Drawing.Point(115, 148);
this.txtStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtStatus.Name = "txtStatus";
this.txtStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -217,8 +217,11 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(753, 473);
this.Controls.Add(this.tabControl1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "RoleAdd";
- this.Text = "RoleAdd";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "瑙掕壊淇℃伅";
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
index 32de717..405dc32 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
@@ -53,6 +53,7 @@
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txtParentMenuName = new DevExpress.XtraEditors.TreeListLookUpEdit();
this.treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+ this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabControl1 = new System.Windows.Forms.TabControl();
((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).BeginInit();
@@ -141,7 +142,7 @@
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(415, 89);
+ this.labelControl9.Location = new System.Drawing.Point(418, 89);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -177,7 +178,7 @@
//
// txtMenuType
//
- this.txtMenuType.Location = new System.Drawing.Point(114, 45);
+ this.txtMenuType.Location = new System.Drawing.Point(111, 45);
this.txtMenuType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtMenuType.Name = "txtMenuType";
this.txtMenuType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -293,7 +294,7 @@
//
this.labelControl8.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl8.Appearance.Options.UseForeColor = true;
- this.labelControl8.Location = new System.Drawing.Point(415, 234);
+ this.labelControl8.Location = new System.Drawing.Point(418, 234);
this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl8.Name = "labelControl8";
this.labelControl8.Size = new System.Drawing.Size(8, 18);
@@ -313,6 +314,8 @@
//
// treeListLookUpEdit1TreeList
//
+ this.treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
+ this.treeListColumn1});
this.treeListLookUpEdit1TreeList.KeyFieldName = "";
this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
@@ -320,6 +323,14 @@
this.treeListLookUpEdit1TreeList.ParentFieldName = "";
this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200);
this.treeListLookUpEdit1TreeList.TabIndex = 0;
+ //
+ // treeListColumn1
+ //
+ this.treeListColumn1.Caption = "鑿滃崟鍚�";
+ this.treeListColumn1.FieldName = "name";
+ this.treeListColumn1.Name = "treeListColumn1";
+ this.treeListColumn1.Visible = true;
+ this.treeListColumn1.VisibleIndex = 0;
//
// tabPage1
//
@@ -352,7 +363,7 @@
this.MinimizeBox = false;
this.Name = "SysMenuAdd";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "鑿滃崟鍔熻兘";
+ this.Text = "鑿滃崟淇℃伅";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtIdx)).EndInit();
@@ -398,5 +409,6 @@
private DevExpress.XtraEditors.LabelControl labelControl8;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
index 89e128c..21495ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
@@ -19,7 +19,6 @@
lbGuid.Text = guid;
getModel();
}
-
private void TxtMenuType_TextChanged(object sender, EventArgs e)
{
if (txtMenuType.SelectedIndex == 1)
@@ -94,7 +93,7 @@
private void getTree()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "desc", "", "");
+ Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "asc", "", " and category=1");
string json = JsonConvert.SerializeObject(pgq);
string strReturn = "";
try
@@ -102,11 +101,11 @@
strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
DataTable dt = dd.rtnData.list;
- txtParentMenuName.Properties.DataSource = dt;
- txtParentMenuName.Properties.DisplayMember = "name";
- txtParentMenuName.Properties.DisplayMember = "name";
txtParentMenuName.Properties.TreeList.KeyFieldName = "guid";
txtParentMenuName.Properties.TreeList.ParentFieldName = "upGuid";
+ //txtParentMenuName.Properties.ValueMember = "guid";
+ txtParentMenuName.Properties.DisplayMember = "name";
+ txtParentMenuName.Properties.DataSource = dt;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/UserAdd.Designer.cs
index 62e784d..40ff16f 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserAdd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserAdd.Designer.cs
@@ -30,6 +30,16 @@
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+ this.txtAccount = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.txtRemark = new DevExpress.XtraEditors.MemoEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.textAddress = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.textTel = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.textEmail = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
this.btnSave = new DevExpress.XtraEditors.SimpleButton();
@@ -44,27 +54,17 @@
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.textEmail = new DevExpress.XtraEditors.TextEdit();
- this.textTel = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.textAddress = new DevExpress.XtraEditors.TextEdit();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.txtRemark = new DevExpress.XtraEditors.MemoEdit();
- this.txtAccount = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtAccount.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textAddress.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textTel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEmail.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtLock.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtUserName.Properties)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEmail.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textTel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textAddress.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtAccount.Properties)).BeginInit();
this.SuspendLayout();
//
// panel1
@@ -95,6 +95,94 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(585, 507);
this.panel1.TabIndex = 0;
+ //
+ // labelControl10
+ //
+ this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl10.Appearance.Options.UseForeColor = true;
+ this.labelControl10.Location = new System.Drawing.Point(418, 29);
+ this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl10.Name = "labelControl10";
+ this.labelControl10.Size = new System.Drawing.Size(8, 18);
+ this.labelControl10.TabIndex = 129;
+ this.labelControl10.Text = "*";
+ //
+ // txtAccount
+ //
+ this.txtAccount.Location = new System.Drawing.Point(109, 16);
+ this.txtAccount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtAccount.Name = "txtAccount";
+ this.txtAccount.Size = new System.Drawing.Size(297, 24);
+ this.txtAccount.TabIndex = 128;
+ //
+ // labelControl8
+ //
+ this.labelControl8.Location = new System.Drawing.Point(31, 20);
+ this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(75, 18);
+ this.labelControl8.TabIndex = 127;
+ this.labelControl8.Text = "鐧诲綍璐﹀彿锛�";
+ //
+ // txtRemark
+ //
+ this.txtRemark.Location = new System.Drawing.Point(109, 272);
+ this.txtRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txtRemark.Name = "txtRemark";
+ this.txtRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.txtRemark.Size = new System.Drawing.Size(297, 68);
+ this.txtRemark.TabIndex = 126;
+ //
+ // labelControl7
+ //
+ this.labelControl7.Location = new System.Drawing.Point(61, 285);
+ this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(45, 18);
+ this.labelControl7.TabIndex = 125;
+ this.labelControl7.Text = "澶囨敞锛�";
+ //
+ // textAddress
+ //
+ this.textAddress.Location = new System.Drawing.Point(109, 240);
+ this.textAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.textAddress.Name = "textAddress";
+ this.textAddress.Size = new System.Drawing.Size(297, 24);
+ this.textAddress.TabIndex = 124;
+ //
+ // labelControl3
+ //
+ this.labelControl3.Location = new System.Drawing.Point(31, 244);
+ this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(75, 18);
+ this.labelControl3.TabIndex = 123;
+ this.labelControl3.Text = "浣忓鍦板潃锛�";
+ //
+ // textTel
+ //
+ this.textTel.Location = new System.Drawing.Point(109, 196);
+ this.textTel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.textTel.Name = "textTel";
+ this.textTel.Size = new System.Drawing.Size(297, 24);
+ this.textTel.TabIndex = 122;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Location = new System.Drawing.Point(61, 200);
+ this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(45, 18);
+ this.labelControl1.TabIndex = 121;
+ this.labelControl1.Text = "鐢佃瘽锛�";
+ //
+ // textEmail
+ //
+ this.textEmail.Location = new System.Drawing.Point(109, 152);
+ this.textEmail.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.textEmail.Name = "textEmail";
+ this.textEmail.Size = new System.Drawing.Size(297, 24);
+ this.textEmail.TabIndex = 120;
//
// lbGuid
//
@@ -127,7 +215,7 @@
//
this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(418, 55);
+ this.labelControl12.Location = new System.Drawing.Point(418, 56);
this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl12.Name = "labelControl12";
this.labelControl12.Size = new System.Drawing.Size(8, 18);
@@ -138,7 +226,7 @@
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(415, 98);
+ this.labelControl9.Location = new System.Drawing.Point(418, 96);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -165,7 +253,7 @@
//
// txtLock
//
- this.txtLock.Location = new System.Drawing.Point(111, 366);
+ this.txtLock.Location = new System.Drawing.Point(109, 366);
this.txtLock.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtLock.Name = "txtLock";
this.txtLock.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -197,7 +285,7 @@
//
// txtUserName
//
- this.txtUserName.Location = new System.Drawing.Point(111, 89);
+ this.txtUserName.Location = new System.Drawing.Point(109, 89);
this.txtUserName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtUserName.Name = "txtUserName";
this.txtUserName.Size = new System.Drawing.Size(297, 24);
@@ -233,114 +321,29 @@
this.tabPage1.Text = "鍩虹淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
//
- // textEmail
- //
- this.textEmail.Location = new System.Drawing.Point(109, 152);
- this.textEmail.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.textEmail.Name = "textEmail";
- this.textEmail.Size = new System.Drawing.Size(297, 24);
- this.textEmail.TabIndex = 120;
- //
- // textTel
- //
- this.textTel.Location = new System.Drawing.Point(109, 196);
- this.textTel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.textTel.Name = "textTel";
- this.textTel.Size = new System.Drawing.Size(297, 24);
- this.textTel.TabIndex = 122;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(61, 200);
- this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(45, 18);
- this.labelControl1.TabIndex = 121;
- this.labelControl1.Text = "鐢佃瘽锛�";
- //
- // textAddress
- //
- this.textAddress.Location = new System.Drawing.Point(109, 240);
- this.textAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.textAddress.Name = "textAddress";
- this.textAddress.Size = new System.Drawing.Size(297, 24);
- this.textAddress.TabIndex = 124;
- //
- // labelControl3
- //
- this.labelControl3.Location = new System.Drawing.Point(31, 244);
- this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(75, 18);
- this.labelControl3.TabIndex = 123;
- this.labelControl3.Text = "浣忓鍦板潃锛�";
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(61, 285);
- this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(45, 18);
- this.labelControl7.TabIndex = 125;
- this.labelControl7.Text = "澶囨敞锛�";
- //
- // txtRemark
- //
- this.txtRemark.Location = new System.Drawing.Point(109, 272);
- this.txtRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txtRemark.Name = "txtRemark";
- this.txtRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txtRemark.Size = new System.Drawing.Size(297, 68);
- this.txtRemark.TabIndex = 126;
- //
- // txtAccount
- //
- this.txtAccount.Location = new System.Drawing.Point(109, 16);
- this.txtAccount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txtAccount.Name = "txtAccount";
- this.txtAccount.Size = new System.Drawing.Size(297, 24);
- this.txtAccount.TabIndex = 128;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(31, 20);
- this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(75, 18);
- this.labelControl8.TabIndex = 127;
- this.labelControl8.Text = "鐧诲綍璐﹀彿锛�";
- //
- // labelControl10
- //
- this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl10.Appearance.Options.UseForeColor = true;
- this.labelControl10.Location = new System.Drawing.Point(418, 29);
- this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(8, 18);
- this.labelControl10.TabIndex = 129;
- this.labelControl10.Text = "*";
- //
// UserAdd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(853, 583);
this.Controls.Add(this.tabControl1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "UserAdd";
- this.Text = "UserAdd";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "鐢ㄦ埛淇℃伅";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtAccount.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textAddress.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textTel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEmail.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtLock.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtUserName.Properties)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.textEmail.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textTel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textAddress.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtRemark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtAccount.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index adaa0cf..4f0a4db 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -70,6 +70,12 @@
<Compile Include="DevFrm\FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\DocNoRule.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\DocNoRule.Designer.cs">
+ <DependentUpon>DocNoRule.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\User\Organization.cs">
<SubType>Form</SubType>
</Compile>
@@ -154,6 +160,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\FrmMain.resx">
<DependentUpon>FrmMain.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\DocNoRule.resx">
+ <DependentUpon>DocNoRule.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\Organization.resx">
<DependentUpon>Organization.cs</DependentUpon>
@@ -254,6 +263,8 @@
<None Include="Resources\bodepartment_32x32.png" />
<None Include="Resources\bodepartment_16x16.png" />
<None Include="Resources\bouser_16x16.png" />
+ <None Include="Resources\salesperiodlifetime_32x32.png" />
+ <None Include="Resources\salesperiodlifetime_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Models/LoginInfoModel.cs b/DevApp/Gs.DevApp/Models/LoginInfoModel.cs
index a65de36..5e42dfa 100644
--- a/DevApp/Gs.DevApp/Models/LoginInfoModel.cs
+++ b/DevApp/Gs.DevApp/Models/LoginInfoModel.cs
@@ -1,8 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
namespace Gs.DevApp.Models
{
diff --git a/DevApp/Gs.DevApp/Models/PageQueryModel.cs b/DevApp/Gs.DevApp/Models/PageQueryModel.cs
index 49b6240..90c17d4 100644
--- a/DevApp/Gs.DevApp/Models/PageQueryModel.cs
+++ b/DevApp/Gs.DevApp/Models/PageQueryModel.cs
@@ -1,8 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
namespace Gs.DevApp.Models
{
diff --git a/DevApp/Gs.DevApp/Models/ReturnModel.cs b/DevApp/Gs.DevApp/Models/ReturnModel.cs
index d4d674a..8e9762c 100644
--- a/DevApp/Gs.DevApp/Models/ReturnModel.cs
+++ b/DevApp/Gs.DevApp/Models/ReturnModel.cs
@@ -1,8 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Gs.DevApp.Models
{
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 31e997f..789fe92 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -18,7 +18,7 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- // Application.Run(new Gs.DevApp.TestForm.test());
+ // Application.Run(new Gs.DevApp.TestForm.FluentDesignForm1());
DevFrm.FrmLogin fmLogin = new DevFrm.FrmLogin();
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index a419197..135f829 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -136,6 +136,9 @@
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -148,14 +151,17 @@
<data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="salesperiodlifetime_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\salesperiodlifetime_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -226,17 +232,14 @@
<data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -295,6 +298,9 @@
<data name="login_bg1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\login_bg1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -319,7 +325,7 @@
<data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
index 400b9f4..9f5bc45 100644
--- a/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
@@ -623,6 +623,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap salesperiodlifetime_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("salesperiodlifetime_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap salesperiodlifetime_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("salesperiodlifetime_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap serieslines_32x32 {
get {
object obj = ResourceManager.GetObject("serieslines_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Resources/salesperiodlifetime_16x16.png b/DevApp/Gs.DevApp/Resources/salesperiodlifetime_16x16.png
new file mode 100644
index 0000000..db19b35
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/salesperiodlifetime_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/salesperiodlifetime_32x32.png b/DevApp/Gs.DevApp/Resources/salesperiodlifetime_32x32.png
new file mode 100644
index 0000000..8e7a1d9
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/salesperiodlifetime_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/ToolBox/LogHelper.cs b/DevApp/Gs.DevApp/ToolBox/LogHelper.cs
index 4378e51..4e79ca2 100644
--- a/DevApp/Gs.DevApp/ToolBox/LogHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/LogHelper.cs
@@ -1,9 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace Gs.DevApp.ToolBox
{
diff --git a/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs b/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
index e129883..844e921 100644
--- a/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
@@ -1,8 +1,4 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.ToolBox
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f0fb38a..3c91c68 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -7,8 +7,6 @@
using System.Net;
using System.Reflection;
using System.Text;
-using System.Threading.Tasks;
-using Gs.DevApp.ToolBox;
using System.Resources;
using System.Drawing;
using Newtonsoft.Json;
@@ -152,6 +150,9 @@
return rto;
}
+ /// <summary>
+ /// 璁剧疆绯荤粺瀛椾綋澶у皬锛岀洰鍓嶅苟涓嶉�氱敤
+ /// </summary>
public static float GetFontSize =10;
public static void SetFont(Control control) {
float size = GetFontSize;
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
index 16d48c6..d51aeb2 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
@@ -100,6 +100,7 @@
this.Name = "ShowDialogForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShowDialogForm";
+ this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
index 9de23ef..198e3c7 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
@@ -39,7 +39,6 @@
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
this.bar2 = new DevExpress.XtraBars.Bar();
this.btnAdd = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnEdit = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnSave = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnView = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -47,10 +46,12 @@
this.btnLoad = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem9 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem10 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem8 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
@@ -89,7 +90,7 @@
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 74);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 94);
this.barDockControlLeft.Manager = this.barManager1;
this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
@@ -117,9 +118,10 @@
this.barLargeButtonItem10,
this.barLargeButtonItem1,
this.barLargeButtonItem2,
- this.barLargeButtonItem3});
+ this.barLargeButtonItem3,
+ this.barLargeButtonItem4});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 18;
+ this.barManager1.MaxItemId = 19;
//
// bar2
//
@@ -129,7 +131,6 @@
this.bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
this.bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnAdd, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnDel, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnEdit, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnSave, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnView, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
@@ -137,10 +138,12 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnLoad),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem9),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem10),
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnDel, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem8),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
this.bar2.Text = "Main menu";
@@ -156,16 +159,6 @@
this.btnAdd.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
this.btnAdd.ItemInMenuAppearance.Normal.Options.UseFont = true;
this.btnAdd.Name = "btnAdd";
- //
- // btnDel
- //
- this.btnDel.Caption = "鍒犻櫎";
- this.btnDel.Id = 4;
- this.btnDel.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- this.btnDel.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32;
- this.btnDel.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
- this.btnDel.ItemAppearance.Normal.Options.UseFont = true;
- this.btnDel.Name = "btnDel";
//
// btnEdit
//
@@ -237,6 +230,16 @@
this.barLargeButtonItem10.ItemAppearance.Normal.Options.UseFont = true;
this.barLargeButtonItem10.Name = "barLargeButtonItem10";
//
+ // btnDel
+ //
+ this.btnDel.Caption = "鍒犻櫎";
+ this.btnDel.Id = 4;
+ this.btnDel.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ this.btnDel.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32;
+ this.btnDel.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.btnDel.ItemAppearance.Normal.Options.UseFont = true;
+ this.btnDel.Name = "btnDel";
+ //
// barLargeButtonItem1
//
this.barLargeButtonItem1.Caption = "鎵撳嵃";
@@ -278,13 +281,21 @@
this.barLargeButtonItem3.ItemAppearance.Normal.Options.UseFont = true;
this.barLargeButtonItem3.Name = "barLargeButtonItem3";
//
+ // barLargeButtonItem4
+ //
+ this.barLargeButtonItem4.Caption = "鏃ュ織";
+ this.barLargeButtonItem4.Id = 18;
+ this.barLargeButtonItem4.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
+ this.barLargeButtonItem4.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
+ this.barLargeButtonItem4.Name = "barLargeButtonItem4";
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(926, 74);
+ this.barDockControlTop.Size = new System.Drawing.Size(926, 94);
//
// barDockControlBottom
//
@@ -298,7 +309,7 @@
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(926, 74);
+ this.barDockControlRight.Location = new System.Drawing.Point(926, 94);
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
//
@@ -356,5 +367,6 @@
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
+ private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
}
}
--
Gitblit v1.9.3