From 3aa008c8ce56cbd4cc981ba10a8b4c143208ad48 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期二, 27 八月 2024 22:49:57 +0800
Subject: [PATCH] 无
---
DevApp/Gs.DevApp/App.config | 41
WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v8.bin | 0
DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs | 4
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 63 +-
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 297 +---------
DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx | 3
DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs | 93 +--
WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v8.bin | 0
DevApp/Gs.DevApp/DevFrm/User/Organization.cs | 1
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 78 ++
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs | 57 +
WebApi/Gs.User/Modes/UserLogin.cs | 12
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 60 ++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 113 ++-
DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs | 40 +
WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v8.bin | 0
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 5
WebApi/Gs.User/Service/UserController.cs | 81 ++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 26
DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs | 15
WebApi/Gs.Demo/Gs.Demo.csproj | 2
DevApp/Gs.DevApp/DevFrm/FrmMain.resx | 416 --------------
WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 | 0
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs | 24
DevApp/Gs.DevApp/Models/ReturnModel.cs | 10
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 22
WebApi/Gs.User/Gs.User.csproj | 15
/dev/null | 0
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 50 +
WebApi/.vs/GsMesSolution/v17/.futdcache.v2 | 0
DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs | 80 +-
DevApp/Gs.DevApp/Properties/Resources.resx | 38 +
33 files changed, 667 insertions(+), 981 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index ae4c49f..05c103c 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -1,21 +1,26 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
- <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- </configSections>
- <applicationSettings>
- <DevExpress.LookAndFeel.Design.AppSettings>
- <setting name="DPIAwarenessMode" serializeAs="String">
- <value>System</value>
- </setting>
- <setting name="RegisterBonusSkins" serializeAs="String">
- <value>True</value>
- </setting>
- </DevExpress.LookAndFeel.Design.AppSettings>
- </applicationSettings>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
- </startup>
+ <configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+ <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ </configSections>
+ <applicationSettings>
+ <DevExpress.LookAndFeel.Design.AppSettings>
+ <setting name="DPIAwarenessMode" serializeAs="String">
+ <value>System</value>
+ </setting>
+ <setting name="RegisterBonusSkins" serializeAs="String">
+ <value>True</value>
+ </setting>
+ </DevExpress.LookAndFeel.Design.AppSettings>
+ </applicationSettings>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+ </startup>
+ <appSettings>
+ <add key="WebApiUrl" value="http://localhost:5263/"/>
+ <add key="LogPath" value="logs"/>
+ <add key="ProductName" value="骞挎繁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 855c6a1..a4bab7c 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -217,8 +217,11 @@
this.Controls.Add(this.lbVersion);
this.Controls.Add(this.panel1);
this.Controls.Add(this.lblLoadingInfo);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "FrmLogin";
- this.Text = "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 15876de..ae99c31 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,15 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
+using Gs.DevApp.Models;
+using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm
{
@@ -18,44 +12,56 @@
public FrmLogin()
{
InitializeComponent();
+ this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
}
private void BtnCancel_Click(object sender, EventArgs e)
{
- if (Msg.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
+ if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
{
- // frmMain1.IsClosing = true;
Application.Exit();
}
}
private void BtnLogin_Click(object sender, EventArgs e)
{
- //int i = 199;
- //ShowDialogForm sdf = new ShowDialogForm("鎻愮ず", "姝ｅ湪鐧诲綍......", "璇疯�愬績绛夊�欙紝姝ｅ湪楠岃瘉鎮ㄧ殑韬唤锛�", i);
- //for (int j = 1; j < i; j++)
- //{
- // sdf.SetCaption("鎵ц杩涘害锛�" + j.ToString() + "/" + i.ToString() + "锛�");
- //}
+ int i = 100;
+ Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝ｅ湪楠岃瘉鎮ㄧ殑韬唤锛�");
var _obj = new
{
accountPwd = txtUser.Text.Trim(),
accountNo = txtPwd.Text.Trim(),
orgGuid = Guid.NewGuid()
};
- string json = JsonConvert.SerializeObject(_obj);
+ sdf.SetCaption("鎵ц杩涘害锛�" + (i - 80) + "/" + i.ToString() + "锛�");
try
{
- Utility.HttpPost("", "User/UserLogin", json);
+
+ string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ JObject _login = _rtn.rtnData;
+ if (_rtn.rtnCode > 0)
+ {
+ LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
+ LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
+ LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ sdf.SetCaption("鎵ц杩涘害锛�" + (i - 10) + "/" + i.ToString() + "锛�");
}
catch (Exception ex)
{
- throw ex;
+ sdf.Close();
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ return;
}
- // sdf.Close();
-
+ sdf.Close();
+ this.DialogResult = DialogResult.OK;
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 8134231..910e9df 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -33,15 +33,10 @@
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.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
this.tab = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage11 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
- this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
this.barCheckItem1 = new DevExpress.XtraBars.BarCheckItem();
@@ -69,34 +64,16 @@
this.barToggleSwitchItem1 = new DevExpress.XtraBars.BarToggleSwitchItem();
this.barToolbarsListItem1 = new DevExpress.XtraBars.BarToolbarsListItem();
this.barMdiChildrenListItem2 = new DevExpress.XtraBars.BarMdiChildrenListItem();
- this.barListItem3 = new DevExpress.XtraBars.BarListItem();
+ this.barMsg = new DevExpress.XtraBars.BarListItem();
this.barHeaderItem2 = new DevExpress.XtraBars.BarHeaderItem();
this.barListItem4 = new DevExpress.XtraBars.BarListItem();
this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
- this.accordionControlElement10 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement15 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement16 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement9 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement11 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement12 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement13 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement14 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement1 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement3 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement2 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement4 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement5 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement7 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement6 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
- this.accordionControlElement8 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement17 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.accordionControlElement18 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
+ this.accordionControlElement1 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
this.fluentDesignFormContainer1.SuspendLayout();
this.statusStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
- this.tab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
@@ -116,28 +93,33 @@
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabel1,
- this.toolStripStatusLabel2});
+ this.toolStripStatusLabel3,
+ this.toolStripStatusLabel2,
+ 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
+ // toolStripStatusLabel3
//
-
- this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(254, 20);
- this.toolStripStatusLabel1.Text = "褰撳墠鐢ㄦ埛锛歛dmin锛堣秴绾х鐞嗗憳锛�";
-
+ this.toolStripStatusLabel3.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
+ this.toolStripStatusLabel3.Name = "toolStripStatusLabel3";
+ this.toolStripStatusLabel3.Size = new System.Drawing.Size(20, 20);
//
// toolStripStatusLabel2
//
-
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
- this.toolStripStatusLabel2.Size = new System.Drawing.Size(194, 20);
+ this.toolStripStatusLabel2.Size = new System.Drawing.Size(174, 20);
this.toolStripStatusLabel2.Text = "鎶�鏈敮鎸侊細瀹佹尝骞挎繁绉戞妧";
+ //
+ // toolTime
+ //
+ this.toolTime.Image = global::Gs.DevApp.Properties.Resources.time2_16x16;
+ this.toolTime.Name = "toolTime";
+ this.toolTime.Size = new System.Drawing.Size(89, 20);
+ this.toolTime.Text = "鐧诲綍鏃堕棿";
//
// tab
//
@@ -145,60 +127,8 @@
this.tab.Dock = System.Windows.Forms.DockStyle.Fill;
this.tab.Location = new System.Drawing.Point(0, 0);
this.tab.Name = "tab";
- this.tab.SelectedTabPage = this.xtraTabPage11;
this.tab.Size = new System.Drawing.Size(806, 727);
this.tab.TabIndex = 4;
- this.tab.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2,
- this.xtraTabPage3,
- this.xtraTabPage4,
- this.xtraTabPage5,
- this.xtraTabPage11});
- //
- // xtraTabPage11
- //
- this.xtraTabPage11.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage11.ImageOptions.Image")));
- this.xtraTabPage11.Name = "xtraTabPage11";
- this.xtraTabPage11.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage11.Text = "鍗曟嵁缂栧彿";
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage1.ImageOptions.Image")));
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.ShowCloseButton = DevExpress.Utils.DefaultBoolean.True;
- this.xtraTabPage1.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage1.Text = "缁勭粐鏋舵瀯";
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage2.ImageOptions.Image")));
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.ShowCloseButton = DevExpress.Utils.DefaultBoolean.True;
- this.xtraTabPage2.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage2.Text = "鐢ㄦ埛绠＄悊";
- //
- // xtraTabPage3
- //
- this.xtraTabPage3.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage3.ImageOptions.Image")));
- this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage3.Text = "瑙掕壊绠＄悊";
- //
- // xtraTabPage4
- //
- this.xtraTabPage4.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage4.ImageOptions.Image")));
- this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage4.Text = "鍔熻兘鑿滃崟";
- //
- // xtraTabPage5
- //
- this.xtraTabPage5.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("xtraTabPage5.ImageOptions.Image")));
- this.xtraTabPage5.Name = "xtraTabPage5";
- this.xtraTabPage5.Size = new System.Drawing.Size(804, 695);
- this.xtraTabPage5.Text = "鍏徃淇℃伅";
//
// fluentDesignFormControl1
//
@@ -230,7 +160,7 @@
this.barMdiChildrenListItem2,
this.barExit,
this.barPwd,
- this.barListItem3,
+ this.barMsg,
this.barHeaderItem2,
this.barListItem4,
this.barButtonItem5});
@@ -243,9 +173,7 @@
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barAbout);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMy);
this.fluentDesignFormControl1.TitleItemLinks.Add(this.barButtonItem5);
- this.fluentDesignFormControl1.TitleItemLinks.Add(this.barListItem3);
- this.fluentDesignFormControl1.TitleItemLinks.Add(this.barHeaderItem2);
- this.fluentDesignFormControl1.TitleItemLinks.Add(this.barListItem4);
+ this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsg);
//
// barButtonItem1
//
@@ -431,11 +359,11 @@
this.barMdiChildrenListItem2.Id = 24;
this.barMdiChildrenListItem2.Name = "barMdiChildrenListItem2";
//
- // barListItem3
+ // barMsg
//
- this.barListItem3.Caption = "娆㈣繋浣跨敤EMS绯荤粺锛屼綘褰撳墠鍏辨湁";
- this.barListItem3.Id = 28;
- this.barListItem3.Name = "barListItem3";
+ this.barMsg.Caption = "娆㈣繋浣跨敤EMS绯荤粺锛屼綘褰撳墠鍏辨湁";
+ this.barMsg.Id = 28;
+ this.barMsg.Name = "barMsg";
//
// barHeaderItem2
//
@@ -488,135 +416,17 @@
this.barMdiChildrenListItem2,
this.barExit,
this.barPwd,
- this.barListItem3,
+ this.barMsg,
this.barHeaderItem2,
this.barListItem4,
this.barButtonItem5});
this.fluentFormDefaultManager1.MaxItemId = 32;
//
- // accordionControlElement10
- //
- this.accordionControlElement10.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement15,
- this.accordionControlElement16});
- this.accordionControlElement10.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement10.ImageOptions.Image")));
- this.accordionControlElement10.Name = "accordionControlElement10";
- this.accordionControlElement10.Text = "浠撳簱绠＄悊";
- //
- // accordionControlElement15
- //
- this.accordionControlElement15.Name = "accordionControlElement15";
- this.accordionControlElement15.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement15.Text = "Element15";
- //
- // accordionControlElement16
- //
- this.accordionControlElement16.Name = "accordionControlElement16";
- this.accordionControlElement16.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement16.Text = "Element16";
- //
- // accordionControlElement9
- //
- this.accordionControlElement9.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement11,
- this.accordionControlElement12,
- this.accordionControlElement13,
- this.accordionControlElement14});
- this.accordionControlElement9.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement9.ImageOptions.Image")));
- this.accordionControlElement9.Name = "accordionControlElement9";
- this.accordionControlElement9.Text = "缁煎悎鎶ヨ〃";
- //
- // accordionControlElement11
- //
- this.accordionControlElement11.Name = "accordionControlElement11";
- this.accordionControlElement11.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement11.Text = "Element11";
- //
- // accordionControlElement12
- //
- this.accordionControlElement12.Name = "accordionControlElement12";
- this.accordionControlElement12.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement12.Text = "Element12";
- //
- // accordionControlElement13
- //
- this.accordionControlElement13.Name = "accordionControlElement13";
- this.accordionControlElement13.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement13.Text = "Element13";
- //
- // accordionControlElement14
- //
- this.accordionControlElement14.Name = "accordionControlElement14";
- this.accordionControlElement14.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement14.Text = "Element14";
- //
- // accordionControlElement1
- //
- this.accordionControlElement1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement3,
- this.accordionControlElement2,
- this.accordionControlElement4,
- this.accordionControlElement5,
- this.accordionControlElement7,
- this.accordionControlElement6});
- this.accordionControlElement1.Expanded = true;
- this.accordionControlElement1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement1.ImageOptions.Image")));
- this.accordionControlElement1.Name = "accordionControlElement1";
- this.accordionControlElement1.Text = "绯荤粺绠＄悊";
- //
- // accordionControlElement3
- //
- this.accordionControlElement3.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement3.ImageOptions.Image")));
- this.accordionControlElement3.Name = "accordionControlElement3";
- this.accordionControlElement3.Text = "缁勭粐鏋舵瀯";
- //
- // accordionControlElement2
- //
- this.accordionControlElement2.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F);
- this.accordionControlElement2.Appearance.Normal.Options.UseFont = true;
-
- this.accordionControlElement2.Name = "accordionControlElement2";
- this.accordionControlElement2.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement2.Text = "鐢ㄦ埛绠＄悊";
- //
- // accordionControlElement4
- //
- this.accordionControlElement4.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement4.ImageOptions.Image")));
- this.accordionControlElement4.Name = "accordionControlElement4";
- this.accordionControlElement4.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement4.Text = "瑙掕壊绠＄悊";
- //
- // accordionControlElement5
- //
-
- this.accordionControlElement5.Name = "accordionControlElement5";
- this.accordionControlElement5.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement5.Text = "鍔熻兘鑿滃崟";
- //
- // accordionControlElement7
- //
- this.accordionControlElement7.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement7.ImageOptions.Image")));
- this.accordionControlElement7.Name = "accordionControlElement7";
- this.accordionControlElement7.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement7.Text = "鍏徃淇℃伅";
- //
- // accordionControlElement6
- //
- this.accordionControlElement6.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement6.ImageOptions.Image")));
- this.accordionControlElement6.Name = "accordionControlElement6";
- this.accordionControlElement6.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- this.accordionControlElement6.Text = "鍗曟嵁缂栧彿";
- //
// acrd
//
this.acrd.Dock = System.Windows.Forms.DockStyle.Left;
this.acrd.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement1,
- this.accordionControlElement9,
- this.accordionControlElement10,
- this.accordionControlElement8,
- this.accordionControlElement17,
- this.accordionControlElement18});
+ this.accordionControlElement1});
this.acrd.Location = new System.Drawing.Point(0, 39);
this.acrd.Name = "acrd";
this.acrd.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Touch;
@@ -624,23 +434,10 @@
this.acrd.TabIndex = 1;
this.acrd.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
//
- // accordionControlElement8
+ // accordionControlElement1
//
- this.accordionControlElement8.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement8.ImageOptions.Image")));
- this.accordionControlElement8.Name = "accordionControlElement8";
- this.accordionControlElement8.Text = "鍩虹鏁版嵁绠＄悊";
- //
- // accordionControlElement17
- //
- this.accordionControlElement17.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement17.ImageOptions.Image")));
- this.accordionControlElement17.Name = "accordionControlElement17";
- this.accordionControlElement17.Text = "宸ュ崟绠＄悊";
- //
- // accordionControlElement18
- //
- this.accordionControlElement18.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("accordionControlElement18.ImageOptions.Image")));
- this.accordionControlElement18.Name = "accordionControlElement18";
- this.accordionControlElement18.Text = "濮斿绠＄悊";
+ this.accordionControlElement1.Name = "accordionControlElement1";
+ this.accordionControlElement1.Text = "Element1";
//
// FrmMain
//
@@ -654,13 +451,13 @@
this.FluentDesignFormControl = this.fluentDesignFormControl1;
this.Name = "FrmMain";
this.NavigationControl = this.acrd;
- this.Text = "骞挎繁绉戞妧-MES";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.fluentDesignFormContainer1.ResumeLayout(false);
this.fluentDesignFormContainer1.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).EndInit();
- this.tab.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
@@ -676,29 +473,9 @@
private DevExpress.XtraBars.BarCheckItem barCheckItem1;
private DevExpress.XtraBars.BarButtonItem barButtonItem2;
private DevExpress.XtraTab.XtraTabControl tab;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage11;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
private System.Windows.Forms.StatusStrip statusStrip1;
- private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
private DevExpress.XtraBars.Navigation.AccordionControl acrd;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement1;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement2;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement3;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement4;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement5;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement9;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement11;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement12;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement13;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement14;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement10;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement15;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement16;
private DevExpress.XtraBars.BarButtonItem barButtonItem3;
private DevExpress.XtraBars.BarSubItem barSubItem1;
private DevExpress.XtraBars.BarButtonItem barButtonItem4;
@@ -722,14 +499,12 @@
private DevExpress.XtraBars.BarMdiChildrenListItem barMdiChildrenListItem2;
private DevExpress.XtraBars.BarButtonItem barExit;
private DevExpress.XtraBars.BarButtonItem barPwd;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement7;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement8;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement17;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement18;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement6;
- private DevExpress.XtraBars.BarListItem barListItem3;
+ private DevExpress.XtraBars.BarListItem barMsg;
private DevExpress.XtraBars.BarHeaderItem barHeaderItem2;
private DevExpress.XtraBars.BarListItem barListItem4;
private DevExpress.XtraBars.BarButtonItem barButtonItem5;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3;
+ private System.Windows.Forms.ToolStripStatusLabel toolTime;
+ private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 057f359..8155287 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -1,65 +1,80 @@
-锘縰sing DevExpress.XtraBars;
-using DevExpress.XtraBars.Navigation;
+锘縰sing DevExpress.XtraBars.Navigation;
using DevExpress.XtraTab;
-using GsDxApp.Properties;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Reflection;
-using System.Resources;
-using System.Text;
using System.Windows.Forms;
using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Gs.DevApp.Models;
+using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm
{
public partial class FrmMain : DevExpress.XtraBars.FluentDesignSystem.FluentDesignForm
{
private static Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>();
- //private StatusStrip statusStrip;
- //private ToolStripStatusLabel statusLabel;
public FrmMain()
{
InitializeComponent();
- getInit();
+ this.Text = this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ getTree();
}
- private void getInit()
+ private void getTree()
{
- string filePath = @"D:\GsMes\GsDXApp\GsDxApp\bin\Debug\menu.txt";
- string _strJson = File.ReadAllText(filePath);
+ toolTime.Text = "鐧诲綍鏃堕棿"+ LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
- rtnCode = 1,
- rtnData = new { list = new[] { new { guid = "", name = "", pah= "", ico = "", list = new[] { new { guid = "", name = "", pah= "", ico = "" } } } } },
- rtnMsg = ""
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid,
};
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
- _obj = Newtonsoft.Json.JsonConvert.DeserializeAnonymousType(_strJson, _obj);
- foreach (dynamic _dy in _obj.rtnData.list)
+ string strJson = "";
+ try
{
- AccordionControlElement _grp = this.acrd.AddGroup();
- _grp.ImageOptions.Image = Utility.GetImgFromResource(_dy.ico);
- _grp.Name = Guid.NewGuid().ToString();
- _grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
- _grp.Text = _dy.name;
- _grp.Click += _grp_Click;
- foreach (dynamic _dy2 in _dy.list)
+ strJson = UtilityHelper.HttpPost("", "User/GetUserInfo", JsonConvert.SerializeObject(_obj));
+ JObject _job = JObject.Parse(strJson);
+ string rtnCode = _job["rtnCode"].ToString();
+ string rtnMsg = _job["rtnMsg"].ToString();
+ barMsg.Caption = rtnMsg;
+ JArray array = new JArray();
+ var d = _job["rtnData"]["list"];
+ foreach (var a in d)
{
- AccordionControlElement _itm = this.acrd.AddItem();
- _itm.Name = Guid.NewGuid().ToString();
- _itm.ImageOptions.Image =Utility.GetImgFromResource(_dy2.ico);
- _itm.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
- _itm.Text = _dy2.name;
- _itm.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
- _itm.Tag = _dy2.pah;
- _itm.Click += _grp_Click;
- _grp.Elements.Add(_itm);
- };
+ array.Add(a);
+ }
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ DataRow[] drGrp = dt.Select("upGuid is null");
+ foreach (DataRow _dy in drGrp)
+ {
+ AccordionControlElement _grp = this.acrd.AddGroup();
+ _grp.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy["icon"].ToString(),1);
+ _grp.Name = _dy["guid"].ToString();
+ _grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
+ _grp.Text = _dy["name"].ToString();
+ _grp.Tag = _dy["fromPath"].ToString();
+ _grp.Click += _grp_Click;
+ DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
+ foreach (DataRow _dy2 in drItem)
+ {
+ AccordionControlElement _itm = this.acrd.AddItem();
+ _itm.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy2["icon"].ToString(),2);
+ _itm.Name = _dy2["guid"].ToString();
+ _itm.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+ _itm.Text = _dy2["name"].ToString();
+ _itm.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
+ _itm.Tag = _dy2["fromPath"].ToString();
+ _itm.Click += _grp_Click;
+ _grp.Elements.Add(_itm);
+ };
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -69,9 +84,9 @@
if (_acd.Elements.Count > 0) return;
string tabPageName = _acd.Name + "_page";
string tabText = _acd.Text;
- //string newFormName = "GsDxApp.test.ToolbarForm1";
string newFormName = _acd.Tag.ToString();
- AddTabpage(tab, tabPageName, tabText, newFormName);
+ Image imgIcon= _acd.Image;
+ AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
}
/// <summary>
@@ -81,7 +96,7 @@
/// <param name="tabPageName">褰撴湡閫夐」鍗￠〉name鍚嶇О</param>
/// <param name="tabText">褰撳墠閫夐」鍗￠〉Text鏍囬</param>
/// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋</param>
- public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName)
+ public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName,Image imgIcon)
{
if (IsTabpageExsit(tabControl, tabPageName))
{
@@ -91,10 +106,13 @@
newPage.Name = tabPageName;
newPage.Text = tabText;
newPage.Tooltip = (tabText + ":" + tabPageName);
- newPage.Controls.Add(AddNewForm(newFormName));
- tabControl.TabPages.Add(newPage);
- TabPageDic.Add(tabPageName, newPage);
- tabControl.SelectedTabPage = newPage;
+ newPage.ImageOptions.Image = imgIcon;
+ if (AddNewForm(newFormName) != null) {
+ newPage.Controls.Add(AddNewForm(newFormName));
+ tabControl.TabPages.Add(newPage);
+ TabPageDic.Add(tabPageName, newPage);
+ tabControl.SelectedTabPage = newPage;
+ }
}
/// <summary>
@@ -145,6 +163,11 @@
private Form AddNewForm(string formName)
{
Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName);
+ if (newForm == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
+ return null;
+ }
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
//newForm.Parent = ((XtraTabControl)sender).SelectedTabPage;
@@ -153,7 +176,5 @@
newForm.Visible = true;
return newForm;
}
-
-
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
index 56f50f0..9fc6207 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
@@ -120,423 +120,7 @@
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>284, 17</value>
</metadata>
- <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>284, 17</value>
- </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="xtraTabPage11.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0
- bGUATWVldGluZztWaWV3TWVldGluZztNZWV0aW5nVmlldztpMs/hAAABF0lEQVQ4T2NoaWn5TyoGAgYY
- po4BMHDmzBkoC5WNDEDqfZt2MMAwigHYwNcfv//P2Hbtf3z//v/RPfvAbKBGXhQDYLbdLQxBwSBQNWc/
- SAM6XgDEmC6AaQIBGDugZSc2A74DMXEGhHfuwWbAayAmzgvls7B6YSUQExeId559RPEGlG2E1QBc0Xj4
- 6vP/cX37wfjQlecgA8Ca4QaAFKNjmMbECQf+P3/3DcwHgRfvv4EMeADEAXADYACmEQTuPv/0P7B1F9jZ
- +bOO/n/29uv/J2++/M+efgQsBsQ/gVgLpwEdq8/DFOLDC8EGoGMQiAGmOiwa0PEzeKZAxkAJEL6PpBAX
- vo3PABcgPgvEP4AYXSNI7LRv0w4rAC4a3uu4QD2IAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="xtraTabPage1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAERlcGFydG1lbnQ7lyqdwQAAA2ZJ
- REFUOE91km9Mk1cUh69zS+YnE/fHGQeIEdFhdZU6pFjbWjqBQoVSi7YzQLW2iC+MwguFqlQDCE4+KBZT
- QLBoJUGMUDZxMeIG0sqsNUBiGgRaB8uymGxOZ6Yj9rdrsxG2bCd5zqd7nnN+ySUAiNeRRO6cSxR9c0Zk
- +/qLhED3sbjApTKurSWfIzqVEx1683+EmvucRDTWWzY+PdKD509+xG8/3cKDnlxcrVg3fjxzpejfQ/MJ
- tdu2bc6xL0vh6cxH38lEdB2Ow9VDH+ESEwmjZFkfIWQ5ZRVlBeVdytuUBXOCO62Jv8/cz8YvAS3+eKzB
- y0dyzPQL8FXdWny+PWy2Ometq1Ef8+SkOurnIuny61kfv6OhgkWvJSGB58KnwvbSTbPui3r0VAlwkY2F
- 7QAPxrTIV302w7PJ4St49ngIv/qPw9PChzU3cka5ZnEGFSycy2KSRfWPDFzDdH8lHnYXoJmVoImNfT7S
- XYLhjjw4awToKNuAy6XRsOvCoI9dcoMK3iSfFdeT3YW1xCiLYZsqcuBymHG9bgdY+RoM2ra9mr5Ho/lz
- aTQ1Xgbk+OGWALcbYlDEf/8FFbxBHvqnSRZTrd7DHHu6V50Nk2pLsFQZH9yRnA5VZtKLtmJecMiuwxVL
- AtoKuWhleChPjpjNi39PSgWE7C6oNVQ1ODDmm0Q22wy3ZxT9Q8MQqI6iscUOQ/IGzI/mrEnDQVH4AB1d
- EBIcONQwSq+AbzKAzLzT+O7+GL513wUvrRxN5x0wandifrRazXrohStMcrmcpKSkEMJUnsH41Peoszmx
- z9SEXQWnkaqtwVZFCRSaPBQVMrAkRKFCxQ+alHFBdmM4dqmUT2Uymbqrq4uQvWw9fBMB6MqbUdXmgblx
- APsrO5BrKIbVaoXP50M1ZxU8Hg8GBwfBrvwQTqcTDMNAKpUaSLruyE1ZTjm2KA8jLr0CXBkLrmQfzGYz
- /H4/JiYmcCQ6Al6vFy6XCwVhS9Hb24vOzk5kZGSMzv2Dv6H1llAoTLdYLJiamoIzX4d20Wa0JsTCumkd
- TnCicCJJAofDAYVC8c/hvwQL+Xx+vMlkCm1vF8fDq9NgIEuOnu1b0bqZCyO9wm63IzU19T8Fr2uxVqt1
- U+hmHs5+wkE9ZzWOro5ASfgH0C9dArFYTBHf/BPybEZrsHkQGgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="xtraTabPage2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAJ+
- SURBVDhPdZJrSFNxGMb/c7nUTDMvNc2onG4aJBKSq22OYUtXCoolZFAiXanIpc7NSYMKI3W6WmalEnZF
- zCK7QpiyfVgSJMQktDAMCi8l1KfKfDrv8TCs1gPP//zP+/6e58s5DAAzq0J5WzIXs+PrRMy6KXLPNePW
- /m7bjvH2vRk9pWuDVjI/oix/2DeH8a5VS5hZGZb/8oYF4302jHXvg6veAKMyfDQtWlIgFomE6Jx8BeoV
- Et4bopj4ekXe27EeIy5kM5QnM5zMXYXmknQ0bAyEPDwgW8jy8hXMU/BtS+6vrqPrYcqMRd1uNd71OvDJ
- fQ7VGRGQBbEmgePlr4BZ1Etfd9lK8O2DG/h4Hz+GO/BzqBkdR7SIYcwhYLz8FigCWNFzZxU3HsZnjx2T
- rjOY7jOjoTh1JoixdAHj5beAdFif2vt95AFmvE58ddVg8GIhDLLQu8Lap/8WxASLda1l+XBdOoCeE1mo
- 0sURlBvIHQvmfQm/BYnS2KJyc/XQZaMeD205qC+Ix660aBSX7vfqZbJCAeP1T8GhNas7b27RY/DNCF64
- HqGxcjusO1VoddTimduDW3nbcJBjBPzPArVGU+512OHRqNFmtcIzMQ3raTtO1TkxMDmNFlMlPJkaEEPs
- 3wWSO4+fTAxcaUF/igL2pCRolUq8n5rCKGedSoUmhYLfEUMsZXwFUqk05wt3eXW1HZ2xy/E0IQFOsRgm
- rZY33WlGO2KIpYyvIMdgcHJP7r8/i3sRS+BOSUa/XI62kEW86U4z2hFDEjJzBXHx8drG887JmiwdKkIW
- zlqWRc+WRUXimGC604x2xBBLGV+BIO5PZXLOifNM7/5mxHJZsN86BZo6ADxq2AAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="xtraTabPage3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFVzZXI7l1sKAgAAAx1JREFUOE9V
- k3lIU3EAx9/23tvzWHmkuZybTidtTNOpU0k0zw5Ls8PMowxbupXkUZa6LI8OzYIIsiSoxKwQUTPpWhaW
- mIRLIomCggKDovpDEkuTvv3eyth+8Pnj+/ge8H78KAD/KQsQUUYFu14vYwfzpcz3HAn9JsOD3kpRlMDW
- Z4ud2O0nUh2MkPzoOpyNu6f16DiQjhw/57n1/g51K+XsQlvvPHaiyJc921qYjN76HJzJ1sEQ7AnTmmW/
- NwZwSFOIGm2989iJnTK2+1LxapTq/HC50ojxe+fx8EI5slXiL6m+bL+tdx47kevN1BYonH9Pfp7Ary/P
- MPmyBcOXDaiI9pxM8aHbbL3z2IlAJ6G8TCedmfr2CdPvruPj46N40roDpVq3SZlYsJz8zAUEMYEjCAn2
- BeS4NWXpRl8P9uLraAte9ZTiRkUiNvk7vyiI8G42JchHauKkP0rCPQYL1C5FxC+0BmtYvpBiCPKSmMDr
- PQ16DLcfQX/DWtSu8kOuetHbK4Uxc5Y2A6bGmjB0Lg/1qcrZDVJOzwf5w8kFwmAjzQ2f9JLAlBSGM1mh
- aExTI1/ji6pIH/DhuTdn0Ve3Dl1VSTCfSMGaxYyZDzNqoVBb7ST+ejN1NSx7jdi3Ih5Prx1GZ20uWV+K
- mlipdfnXeBO6KhPRURqNb7cykeAqnOYLXLYzbHt7VBQsewrxKDkOLSEaFIdpYQgJRrnCG/vCF2HifgVm
- LSb8HNqN6YFc9FWFImoBNcAX+JQwovfmrM14kpGKuyEq9GuU6FTLcE7hibKlbnjQvBkzlmp86M4jy1tI
- WAt9mMtskBNl5AuUVSz3c8SwEwOxkbijVaNHrcB5pQTlKneYT2WS5WrcP56CjCUsEl2F0Imp5xpHqphk
- RdaCSsbBWnAvPAi3Q1XoUClwQOMBc3MmZsZMMB9LwTYvBo1eLDIowSzJRBD4WxPwBR4baPZiNcPhIM1h
- P2GXgIExyJUsH7Iup7vSyCIPkieSElwlGclUbzylcuTjf5s8CRpC+D8S8pXOyJRxiHWnB2kBlUy+RRNC
- CRICy4dVjhT1B3hg45dPadMbAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="xtraTabPage4.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
- bGUATGlzdDtMZXZlbDtNdWx0aTtOdW1iZXJW2eikAAACRUlEQVQ4T42TyU9aURSHzx8giggyCIIiMyKK
- EpqaCq01osbSwWUXTbrssv9EbcW4q0PnNnaITZetiQFhT5p2x7JJ05UKMgv09Jwr8qBxIcnH4d33ft89
- 794LICKzRsQa9WzsQvDX2p+9vdSXARP9xFi9/jdaq9XiTLVabcLXfA/+/3Dos8mIO0ajENRq9fjNuw/R
- O7lE3EHP5G30XL6F9rFZZIltbAasozNg8V5vCkT7O/39QkCzPOIZK5WTNniM71k8V2GIGQ41BaKLTwa9
- EHzU6+ED09cnGL4UAXfgBpg9ITAPB8HsDsKgawoGnFfaBGeL2EpkW6sDV2ARXP5FcPoXwDkxT8yBwzcH
- dt+sJHiv03GN/t7dTW1rtfgzGk3X6/V4uVzZLxRLbZRK5X1ai1WDNSAJKCQEhJj9rVqD/N7hpQfomJhH
- x3gYHb4w0qyot/iRxX3mcUnwTq3hGvuxspJ+o1Ijwx3wbPl8IdFKkbqgDpa1plFJQAEheE1Brq+UKlEb
- rNlo22y0bdaRadCavKAxEv0jkuClslcIvj9+kn6hUCHD188VSlGnI/cpfA0sHuZ0C3sNbklAAa4RfriV
- X1+/pfjwcOuZ7LHgKJNNMrlcPkFnY1UInsmVRI9gq6sHNrsUoqPNTgXyyocW7uGQO4h0BnDQPYVm1xQq
- dXYsFIr7QrBFAQ5RADZk3bDR2S0EGzK5OL7Z41zi8DCTPOPg4CjJ3ZycVJeFQISIdZkc1jtOYcHTDjkV
- 8TriufM4d7DBBf7iCP8Ak8pcwM8CzykAAAAASUVORK5CYII=
-</value>
- </data>
- <data name="xtraTabPage5.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAADx0RVh0VGl0
- bGUASW4gTGluZTtMaW5lO0FsaWduO1RleHQ7SW1hZ2U7TGF5b3V0O1NoYXBlO0NlbnRlcjtXcmFwz9xE
- 2QAAAmtJREFUOE9dkulPE0EYxjeamHgAlhKNf5zxg1hJSDAYOVogBCJylJYiCCaEIKDIR46IEQ1QQIMB
- OYwfDB5RgwoFere0220fn3e2LuIkv51Ndt7fM/vOaAC0/vGtuYfj7yHw3eTpFvrGNhUPhCfCBnofb8A3
- tLKoadoZqVWCPi7+f+QEPnJ8HM85ZEn38DtWame5xBT00Cqjh6L7whhhYjfxCfzeJYxswDBy8AyuiuC8
- JRCjJAZCCQSCSZPDBPbI7oEQx29FArqRRcfAykmB59Gq2qYkeEfX4Rkhw2RoHZ1Da3DnaRtcQzqTxb3+
- NyK4YAk6Bt4qQfwog3jSJJY0FNG4gUgig7BCR0rPorlnSQQFlqCVRmlQLKkjxkVRCgLDV/C99zK2W0oQ
- iusIklBMx1E6iwavXwSFlqC5d1l1N8LCv2nfvJfwsdGOzUobDmNpHEbT2I+kuUsDTvecCIosQaPPrwSh
- eEalSNqHejtWy21YvlaI/bBZHAinuMsMqtpfnhS4aDSyOQRZLEkqjUUBRQp7QiiFXRLhL1a2zIrgoiWo
- an2lBA2+ZdR3LaGOs+Diu9O7iFri9HD2+FU/Kpqei8BmCW7ffYEML8jXXxF8+Ul2worPOxESxqcfYWzn
- CUZ1lDc8E0GxJbjVNIMMz7eGKTVuP6o7iXsBVR2kfQF32udN2uZxwF6UuaZFYLcE5Y0z0CmQeyBHGOUp
- yL9KU4M8gSB7csDkffZC+uKonTy5A4drYrasfho366bhqJuCwzWF0top3HBOmtRM4joprZ5QXK0YfU3B
- 8U3kOEXOkSJiy1Ocx/4PJfm5gJwGoP0BoGnqG2WwFi0AAAAASUVORK5CYII=
-</value>
- </data>
- <data name="accordionControlElement3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAERlcGFydG1lbnQ7lyqdwQAAA2ZJ
- REFUOE91km9Mk1cUh69zS+YnE/fHGQeIEdFhdZU6pFjbWjqBQoVSi7YzQLW2iC+MwguFqlQDCE4+KBZT
- QLBoJUGMUDZxMeIG0sqsNUBiGgRaB8uymGxOZ6Yj9rdrsxG2bCd5zqd7nnN+ySUAiNeRRO6cSxR9c0Zk
- +/qLhED3sbjApTKurSWfIzqVEx1683+EmvucRDTWWzY+PdKD509+xG8/3cKDnlxcrVg3fjxzpejfQ/MJ
- tdu2bc6xL0vh6cxH38lEdB2Ow9VDH+ESEwmjZFkfIWQ5ZRVlBeVdytuUBXOCO62Jv8/cz8YvAS3+eKzB
- y0dyzPQL8FXdWny+PWy2Ometq1Ef8+SkOurnIuny61kfv6OhgkWvJSGB58KnwvbSTbPui3r0VAlwkY2F
- 7QAPxrTIV302w7PJ4St49ngIv/qPw9PChzU3cka5ZnEGFSycy2KSRfWPDFzDdH8lHnYXoJmVoImNfT7S
- XYLhjjw4awToKNuAy6XRsOvCoI9dcoMK3iSfFdeT3YW1xCiLYZsqcuBymHG9bgdY+RoM2ra9mr5Ho/lz
- aTQ1Xgbk+OGWALcbYlDEf/8FFbxBHvqnSRZTrd7DHHu6V50Nk2pLsFQZH9yRnA5VZtKLtmJecMiuwxVL
- AtoKuWhleChPjpjNi39PSgWE7C6oNVQ1ODDmm0Q22wy3ZxT9Q8MQqI6iscUOQ/IGzI/mrEnDQVH4AB1d
- EBIcONQwSq+AbzKAzLzT+O7+GL513wUvrRxN5x0wandifrRazXrohStMcrmcpKSkEMJUnsH41Peoszmx
- z9SEXQWnkaqtwVZFCRSaPBQVMrAkRKFCxQ+alHFBdmM4dqmUT2Uymbqrq4uQvWw9fBMB6MqbUdXmgblx
- APsrO5BrKIbVaoXP50M1ZxU8Hg8GBwfBrvwQTqcTDMNAKpUaSLruyE1ZTjm2KA8jLr0CXBkLrmQfzGYz
- /H4/JiYmcCQ6Al6vFy6XCwVhS9Hb24vOzk5kZGSMzv2Dv6H1llAoTLdYLJiamoIzX4d20Wa0JsTCumkd
- TnCicCJJAofDAYVC8c/hvwQL+Xx+vMlkCm1vF8fDq9NgIEuOnu1b0bqZCyO9wm63IzU19T8Fr2uxVqt1
- U+hmHs5+wkE9ZzWOro5ASfgH0C9dArFYTBHf/BPybEZrsHkQGgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="accordionControlElement4.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFVzZXI7l1sKAgAAAx1JREFUOE9V
- k3lIU3EAx9/23tvzWHmkuZybTidtTNOpU0k0zw5Ls8PMowxbupXkUZa6LI8OzYIIsiSoxKwQUTPpWhaW
- mIRLIomCggKDovpDEkuTvv3eyth+8Pnj+/ge8H78KAD/KQsQUUYFu14vYwfzpcz3HAn9JsOD3kpRlMDW
- Z4ud2O0nUh2MkPzoOpyNu6f16DiQjhw/57n1/g51K+XsQlvvPHaiyJc921qYjN76HJzJ1sEQ7AnTmmW/
- NwZwSFOIGm2989iJnTK2+1LxapTq/HC50ojxe+fx8EI5slXiL6m+bL+tdx47kevN1BYonH9Pfp7Ary/P
- MPmyBcOXDaiI9pxM8aHbbL3z2IlAJ6G8TCedmfr2CdPvruPj46N40roDpVq3SZlYsJz8zAUEMYEjCAn2
- BeS4NWXpRl8P9uLraAte9ZTiRkUiNvk7vyiI8G42JchHauKkP0rCPQYL1C5FxC+0BmtYvpBiCPKSmMDr
- PQ16DLcfQX/DWtSu8kOuetHbK4Uxc5Y2A6bGmjB0Lg/1qcrZDVJOzwf5w8kFwmAjzQ2f9JLAlBSGM1mh
- aExTI1/ji6pIH/DhuTdn0Ve3Dl1VSTCfSMGaxYyZDzNqoVBb7ST+ejN1NSx7jdi3Ih5Prx1GZ20uWV+K
- mlipdfnXeBO6KhPRURqNb7cykeAqnOYLXLYzbHt7VBQsewrxKDkOLSEaFIdpYQgJRrnCG/vCF2HifgVm
- LSb8HNqN6YFc9FWFImoBNcAX+JQwovfmrM14kpGKuyEq9GuU6FTLcE7hibKlbnjQvBkzlmp86M4jy1tI
- WAt9mMtskBNl5AuUVSz3c8SwEwOxkbijVaNHrcB5pQTlKneYT2WS5WrcP56CjCUsEl2F0Imp5xpHqphk
- RdaCSsbBWnAvPAi3Q1XoUClwQOMBc3MmZsZMMB9LwTYvBo1eLDIowSzJRBD4WxPwBR4baPZiNcPhIM1h
- P2GXgIExyJUsH7Iup7vSyCIPkieSElwlGclUbzylcuTjf5s8CRpC+D8S8pXOyJRxiHWnB2kBlUy+RRNC
- CRICy4dVjhT1B3hg45dPadMbAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="accordionControlElement7.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAENvbnRhY3Q7EcdpAQAAAoFJREFU
- OE+lk1tIk2EYx4dUdi7NDlcS0vnkRRd1EV2WZGGSpBZEi7Lm8rDmygamyCipqemyEelSZrPQorRlHoaH
- kC6KsCDwKujCDrPp1Lnv27fpv+d5t6QLL4oGP/bxwf/3PM/7vJ8KwH8x58t/4fcviphHLCCiiUXEEmIp
- sZxYScQQq4jVxJrIO86ooozWrl6j1YXCmm4Y7nRCX9WB/Mp25JlfQnvzBTRlrcgyPcPZ0qdQlzzBqaJm
- pOXff0/ZWBbM53BoekYQZEIzCASnISshSIEQpuQQfFIQk/4gxqcUjPkCyCxs4v7jWbCw8G63CA9/HoK9
- KAPXDsejzaKj8DT8f4b9Crw+EkwqSDc4WJDAgsUGS6eo6nJUw6I9gFun96LkaAL8keqW5jeoaBpAmb0f
- pXU98EzISNM3smADC5YV0Mws6Gu5h0r1bvRWZaDLqofPHxDVJ7g6V6bWPRMB/CRBqs7Ogk0sWKGraJ+d
- +8ugCx1V2fg00A6fzK0ruF7fh+JaF4zWThRUOzEyLiMlr4EFW1gQm2t2QqFwz+sPsD104e3HYdgaXejq
- HRSHFp47XHnEK8M9JuFITj0LtrEgjlclk+B8Tjn2H9TDVN0v/s9dNIvw1ZpXuHTbidzyNrhJ8J0EydoH
- LNjBgrWaG62QaGVZJEjcc2YWFvCJi7mpbbdXorCMb6MSDmXXsWAXC9ZlmZ6LlU3RzOFDU8L7pvBo5NC4
- 9R9UmcNfPRKSNEKwkwUxJwy179TF4Rt20vgYmVce4fhlB47RqlLz7UjJbRAzJ2ttVNmGpAt12JduGqKs
- uEh8n+OI9QTvdSOxmeAT3kpsJ3hWrsYtJ0aeORw95xf290D1Cy/MeLbWSgQFAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="accordionControlElement6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFRhYmxlO0Zvcm1hdDtDbGVhcjsa
- l9UaAAAC70lEQVQ4T32Ta0hTYRjHj5aZN0rpQ/ohCikiCcJIMutL4SWpvqwvQpJaauI1SwxMIec93aZr
- LhXdvJe2mJfZJurcJs47ZmZe+lBhTI3NuWZLv/x736OJkPTC75znPc/z/OA857wMWfsIDv/hwC7ofj/B
- DgBDYWIEak1smRaxpVrECLSI5mtwn9ePe8VqRBEin/eBW9oNrkCJbL4SWcUdGiraEdBi1fwqlPMmllLF
- /Ha89YzXOQeLdROW9S2eFnWSLubgjuBuQS9bWD+xjPrxJaRUj5F4iY0pyVWjMJltMJp/s6L0XDkVOO0I
- wrgqFMtnkVQxisTKESRWjCDh5TASxMOI36aqSY+OnmnMfl6Bsn+GCpx3BJxMBbrmTKgdN6B2bAlxIj0b
- 15G4dsyAGOEg1qwb6Ncv4JusBTPxEWi75l9IJOwwmVvp7eiaNUJKiqkgumyQbaR7SlHrB1h/bWBQKMZi
- eQFsQ+/wkZuOZn/fPCJwYEJTZXj2agpR/IFd6BDJ0yG/ZQrSVh0WGuvwRZANq+o1fnZKsa5qxnhuJoQ+
- pwuY2LQGmC0b+GGyYYUgkurY+6plk7y7GroSPhbyM7Aml2CtRQwzYX1Cg/ccDmQB/mCiHtaS4g0sbwuE
- Ei1MZG9dt6GvtQufMh/B2CiCUcKDsaYElqEejAaFQHEpAIXe3jwm7IFIG55Yg/CEGtxJqEaOQAGZYgJZ
- 4l5kv5mGvr0by8IcrLzIgVnbheGrwZD5XkCGp5eQzMCFwF7cCR7bHA9NllY/aZhE5aABogED1E1ymFRy
- 6K8EocnnHOLdPcpJnSvBnv2WuyHLKTj1Lfia7yhRL7I0ThqQlFQNycmziHBxrSA1brQ5zMGR2UvgeOxy
- moCT2Ya87q+QjCzCN7IZZ25X4LyXbxXJH6LNAxeDmBt25BzuIbAnuHn6pQh9OGKculmKE4HFOOr3mDYf
- pvnrdvZMMPmHAgn/CNx94v5KnAh0NkcIdDbOBPsQkqKNW9gxfwBLDEo6BCio3AAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="accordionControlElement1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
-</value>
- </data>
- <data name="accordionControlElement9.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
- AABJRU5ErkJggg==
-</value>
- </data>
- <data name="accordionControlElement10.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlADNEQ29sdW1uO94CG5sAAAgXSURB
- VFhHvZd5TFzXFcZRFVlRFEWRFSWK3DZKF1VV1fbvKm5ix1ip0iRdHSf1oihKWmyzmMWAbRYbjI0NuHgh
- GGwWsxsY1sEQwJjdLF7aIMsxxmZYZ4aB2Ve2r+fcefNmxtBI7h9F+uncd96b83333Dv3DQHS33PEhmfg
- +f+RFyR4zHW+RwQ8V1Rzx1BSdw/fRTFTuw41HO+iiKn571xVeLgjyK8cMkgmAjbkV93G//svp2wApM3d
- CHg+r9JtYHFxBa7FZQnPmKMv7vtOn2d47KSx0yXdo/hdrK6uIrvkFht4URi4fG0Yq2TAV2A9hIiIbkT+
- qeIOwu5YhMXmhJXgaLE5RLTZnbA7F7FCBr7yNZBbPkSuIBXlmbhnI2Ax3+haku+xmIxzSUQWaxkcR1Lx
- 8Bo+ClPAYnUKA1lF/WzgJTbwQk7ZoNvAU8W9Y3eeo8MpCRJ2KbK4nfIWuwt1PY9wofEBelVm9BAcv9HY
- cK7uPj4IrYbR4sDKyiouXO3zGrhUOiAMcCGnNBN3YQkW47wMt3lJtNVkdcBothM26BaMiMjqg9G+BIN9
- WUQjxd0JzdgT34zfB1fBYLIJA+cKe7wGeD3YgJ1myLPyiHF04855sNEamyx2XL815tfixIJ+hF/sReGd
- eZzpVOPMTTV6J63YHd+C3XHN+N3+SiwYLFgmA5n53WzgZTbwYlZxv9iZsoAPIkezFWOKfG2mdazu+BaZ
- 1FbfVt+e1CPsfA/yhnRI7ZgVdKksZKAZu4j39lVg3mMgr8tr4GJRn9gYNhaQsNFu5WurnWfrgN5oFe65
- wKxGh1ASerrVnx6pR8i5buQMzCGlfUZw44kFu+KuC7b/oww6vRlLy6s4e7mTDWxkAy+dp/XgdeHWWlmU
- Io8tJL5gtKCxb9Sv1Qn5fQjJ7MLlQR1OtE0juXUSN8YM2Bldg33pbbjQPY2kFhUxgdZHJvzt6HWiCYFf
- lkK7YCIDK0jP9TFwLt9tgGfL4iISvGHKvx5BRvWIX6uHVfM4kNFJM9UKker6GozVJq2L8sGCEGfe/aIE
- Wp1RGEi71OE1kJnXLdaFZyxjW8Qcud2fcXNNqz85XEczvYnsfjUKr+TgfkUMVvQdMqvmOxhVJuPanl+g
- fmSOlqZJsOXzYmjIwOLSCk5n32ADr7CBl89e6ZINmEnYA7sNSuvwtvrrCbSPLmBHVBW+ONmMs+2P0Z38
- MVad035cj94uKN/1cyj+rcEnbOCwEu98VoRZrQEuMpCa1e41kEHrsUwbg0VNkjhHNT3899PtotXHm8dR
- VVvt1977lQm4eeyvsN1Lh6nnEBEF11QLiQei6VAgSj/9GSrvkQES30n89rNCzGj14rQ9dbGNDbzKBjam
- 59wUO9NkJWEfZunhL0+14aveGRTkZmOkNMqv1TZtP27E/wHWu2kkHglTdyRck0o0RZGBqG0o2flTlN9R
- Y2dso2Dz3kJMa9wGUs63eg2cymoT62KwLEJvdmJOb4V6zoTRx1PYe6wB6S0P1211TWQg2o58COvtVBIP
- F7gm6qGM3IamyHdRtOMnKBmexccxjUQD3tqdj8lZnThZj/2zhQ28JgykXGgVrvQmJzRzZoz2N/q1eqQi
- XrTacvcMTJ1hMHWFwUkzZQMtMe/DMnxSzjvGFVBGbIUyfCuu/uVHuDowLcR3RDfgN7vyMTU7T4fZMhIz
- rssGXjlB7WAD2nk6zRS5+FdRuF+rLZped6tvp8DYGUpioXCp6qEgA82H3oNl6Licdz6+RuJbBAV/fhN5
- /ZMkXk8voiokZ7ViljrLB1x8ujDwujCQlNlCr9sVsT7t8X9a0+rqCKnVwydg7AiBqSMYTpVC5JUR22EZ
- TJTz9rFSNB4kA0T+H99Abu8k3g+uRMqldkzM6Gh57cJAXHqTbODV42yAfgNM0gOth1mIZnojmDhAa9pA
- QttEq62DNFMp73xcJfINYVth6Y+T846HRWgMe0eQ99EPad1zkJzdhvFpHZ2C9MY0OuiQW8LR041eA4ln
- m8XGmKCHmqNpTYeSqNh+gVNVI4S41eZb8XLeMVYu8nUhW2Dui5Xz9m/z0BBKBkLfxpUPv4+RB0+os0YS
- t2PO4IDOQL+Q2ECqMLCJDbyWQBuCN8b41Bx9fWhNB47B0B5EBYPgfFKFqvBtotXmvqNy3v6wWORrD7wN
- c0+0nLfdzxHiFXt/BWVGLGY0JiHsCx94h081eA3EpTWJ1+yTSS0awwOppTRTLtgWBMejchTs+bVotbmX
- Zirl7Q8KRL5m32ba/ZFy3vZNFsr3/BKNGTGi7ZoFqxDVSuIc+aCLPSkM/IANvH40TSk2hoo+UE9C3LrL
- HzCbRKxMCRetXi+vCNq8Jt+QHoMnU1qoac21BruEW5zHfMrGpNT5GDitFK9h9byVPjiHUZUGjwgRJzRQ
- zcxjbEIr55kxyo/TpuX7nB9VqQV8PUnfplmauUbvgIYENSTMUcvX9C1gA4dOCANvCANHUhvEa9jTJv+W
- +btfO+ZIIlRYRrr2CPrmGAMd81HJtbKBTbwevDO9xaXCUhERPUU5SvfcBX1EfHJqaaym3e8Zi2vCYHUh
- KqnG24GYk/UwP/Uq5mtulS9GEV0UXfSycmOU4KIGixR94ZzAKdDTWE8x4rjXwMbQuDJjZFItIsmVGwU9
- oEA4PRR+vBrhx4jEahxMrEIYk0DEVyI0oRIhFJnguGtujlbgwBGmHAdovJ+i4HA59jGxZYLPD14xkbZ4
- G/K/5vzTiL+TvCsZdvYsvPkM/Jjgz5B4wIb/ALor0I95aYBQAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="accordionControlElement8.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
- gbjDA968SgAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="accordionControlElement17.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
-</value>
- </data>
- <data name="accordionControlElement18.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
-</value>
- </data>
<data name="barButtonItem4.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
index 7d49ded..62d73a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
@@ -53,6 +53,7 @@
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.treeView1 = new System.Windows.Forms.TreeView();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.label1 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -96,6 +97,7 @@
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.panel1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Location = new System.Drawing.Point(210, 3);
@@ -205,10 +207,19 @@
this.tabPage2.Location = new System.Drawing.Point(4, 27);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(990, 436);
+ this.tabPage2.Size = new System.Drawing.Size(909, 533);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "鏁版嵁缂栬緫";
this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(93, 401);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(44, 18);
+ this.label1.TabIndex = 1;
+ this.label1.Text = "label1";
//
// Organization
//
@@ -222,6 +233,7 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
@@ -249,5 +261,6 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private System.Windows.Forms.TreeView treeView1;
private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
index 00f11c5..8eaa64b 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Organization.cs
@@ -20,6 +20,7 @@
imageList.Images.Add("icon1", Properties.Resources.usergroup_32x32);
imageList.Images.Add("icon2", Properties.Resources.user_16x16);
treeView1.ImageList = imageList;
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
index cc91b2a..10cec22 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -39,9 +40,12 @@
this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.tlcMenuType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -81,36 +85,14 @@
this.tlcParentMenuName,
this.tlcMenuCaption,
this.tlcActions,
- this.tlcMenuType});
+ this.tlcMenuType,
+ this.treeListColumn1});
this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
this.tlMenu.Location = new System.Drawing.Point(3, 3);
this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tlMenu.MinWidth = 23;
this.tlMenu.Name = "tlMenu";
- this.tlMenu.BeginUnboundLoad();
- this.tlMenu.AppendNode(new object[] {
- "5",
- "1",
- "5",
- "2",
- "5",
- "5"}, -1);
- this.tlMenu.AppendNode(new object[] {
- "5",
- "3",
- "5",
- "4",
- "5",
- "5"}, -1);
- this.tlMenu.AppendNode(new object[] {
- "5",
- "4",
- "5",
- "5",
- "5",
- "5"}, -1);
- this.tlMenu.EndUnboundLoad();
this.tlMenu.OptionsBehavior.Editable = false;
this.tlMenu.Size = new System.Drawing.Size(755, 295);
this.tlMenu.TabIndex = 2;
@@ -118,8 +100,8 @@
//
// tlcModuleID
//
- this.tlcModuleID.Caption = "妯″潡缂栧彿";
- this.tlcModuleID.FieldName = "ModuleID";
+ this.tlcModuleID.Caption = "guid";
+ this.tlcModuleID.FieldName = "guid";
this.tlcModuleID.MinWidth = 23;
this.tlcModuleID.Name = "tlcModuleID";
this.tlcModuleID.Visible = true;
@@ -129,7 +111,7 @@
// tlcMenuName
//
this.tlcMenuName.Caption = "鑿滃崟鍚嶇О";
- this.tlcMenuName.FieldName = "MenuName";
+ this.tlcMenuName.FieldName = "name";
this.tlcMenuName.MinWidth = 38;
this.tlcMenuName.Name = "tlcMenuName";
this.tlcMenuName.Visible = true;
@@ -138,8 +120,8 @@
//
// tlcParentMenuName
//
- this.tlcParentMenuName.Caption = "鐖剁骇";
- this.tlcParentMenuName.FieldName = "ParentMenuName";
+ this.tlcParentMenuName.Caption = "鐘舵��";
+ this.tlcParentMenuName.FieldName = "status";
this.tlcParentMenuName.MinWidth = 23;
this.tlcParentMenuName.Name = "tlcParentMenuName";
this.tlcParentMenuName.Visible = true;
@@ -148,8 +130,8 @@
//
// tlcMenuCaption
//
- this.tlcMenuCaption.Caption = "鑿滃崟鏍囬";
- this.tlcMenuCaption.FieldName = "MenuCaption";
+ this.tlcMenuCaption.Caption = "绐椾綋璺緞";
+ this.tlcMenuCaption.FieldName = "fromPath";
this.tlcMenuCaption.MinWidth = 23;
this.tlcMenuCaption.Name = "tlcMenuCaption";
this.tlcMenuCaption.Visible = true;
@@ -158,8 +140,8 @@
//
// tlcActions
//
- this.tlcActions.Caption = "鏉冮檺";
- this.tlcActions.FieldName = "Actions";
+ this.tlcActions.Caption = "绐椾綋绫诲瀷";
+ this.tlcActions.FieldName = "category";
this.tlcActions.MinWidth = 23;
this.tlcActions.Name = "tlcActions";
this.tlcActions.Visible = true;
@@ -168,13 +150,21 @@
//
// tlcMenuType
//
- this.tlcMenuType.Caption = "绫诲瀷";
- this.tlcMenuType.FieldName = "MenuType";
+ this.tlcMenuType.Caption = "搴忓彿";
+ this.tlcMenuType.FieldName = "idx";
this.tlcMenuType.MinWidth = 23;
this.tlcMenuType.Name = "tlcMenuType";
this.tlcMenuType.Visible = true;
this.tlcMenuType.VisibleIndex = 1;
this.tlcMenuType.Width = 95;
+ //
+ // treeListColumn1
+ //
+ this.treeListColumn1.Caption = "绐椾綋鍥炬爣";
+ this.treeListColumn1.FieldName = "icon";
+ this.treeListColumn1.Name = "treeListColumn1";
+ this.treeListColumn1.Visible = true;
+ this.treeListColumn1.VisibleIndex = 6;
//
// SysMenu
//
@@ -188,6 +178,7 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -204,5 +195,7 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuType;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index c8ed5ff..3327c76 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -1,4 +1,7 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Models;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -16,12 +19,83 @@
public SysMenu()
{
InitializeComponent();
+ getTree();
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
}
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- SysMenuAdd frm = new SysMenuAdd();
+ String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
+ return;
+ }
+ SysMenuAdd frm = new SysMenuAdd(rowGuid);
frm.ShowDialog();
}
+
+ private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
+ {
+ String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = rowGuid,//涓诲缓
+ };
+ string json = JsonConvert.SerializeObject(_obj);
+ string strReturn = "";
+ try
+ {
+ strReturn= UtilityHelper.HttpPost("", "MenuAction/DeleteModel", json);
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ SysMenuAdd frm = new SysMenuAdd("");
+ frm.ShowDialog();
+ }
+
+ private void getTree()
+ {
+ Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "idx", "desc", "", "");
+ string json = JsonConvert.SerializeObject(pgq);
+ string strReturn = "";
+ try
+ {
+ strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ DataTable dt = dd.rtnData.list;
+ this.tlMenu.DataSource = dt;
+ this.tlMenu.KeyFieldName = "guid";
+ this.tlMenu.ParentFieldName = "upGuid";
+ this.tlMenu.Tag = "name";
+ this.tlMenu.EndUpdate();
+ this.tlMenu.ExpandAll();
+ tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Radio;
+ // 璁剧疆涓嶅叧鑱旈�夋嫨
+ //tlMenu.OptionsSelection.MultiSelect = true;
+ //// tlMenu.OptionsSelection.MaintainState = false; // 鍏抽敭璁剧疆
+ //this.tlMenu.OptionsBehavior.AllowIndeterminateCheckState = true;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
index 1af7de1..b11c008 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
index c65e661..332aa7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
@@ -49,10 +49,11 @@
this.txtMenuName = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.tabControl1 = new System.Windows.Forms.TabControl();
this.txtParentMenuName = new DevExpress.XtraEditors.TreeListLookUpEdit();
this.treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.lbGuid = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtIdx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtFormNamespace.Properties)).BeginInit();
@@ -60,10 +61,10 @@
((System.ComponentModel.ISupportInitialize)(this.txtMenuIco.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtMenuName.Properties)).BeginInit();
this.panel1.SuspendLayout();
- this.tabPage1.SuspendLayout();
- this.tabControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txtParentMenuName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).BeginInit();
+ this.tabPage1.SuspendLayout();
+ this.tabControl1.SuspendLayout();
this.SuspendLayout();
//
// labelControl7
@@ -278,8 +279,27 @@
this.panel1.Size = new System.Drawing.Size(480, 425);
this.panel1.TabIndex = 0;
//
+ // txtParentMenuName
+ //
+ this.txtParentMenuName.Location = new System.Drawing.Point(114, 11);
+ this.txtParentMenuName.Name = "txtParentMenuName";
+ this.txtParentMenuName.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txtParentMenuName.Properties.TreeList = this.treeListLookUpEdit1TreeList;
+ this.txtParentMenuName.Size = new System.Drawing.Size(294, 24);
+ this.txtParentMenuName.TabIndex = 116;
+ //
+ // treeListLookUpEdit1TreeList
+ //
+ this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
+ this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
+ this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+ this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200);
+ this.treeListLookUpEdit1TreeList.TabIndex = 0;
+ //
// tabPage1
//
+ this.tabPage1.Controls.Add(this.lbGuid);
this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 27);
this.tabPage1.Name = "tabPage1";
@@ -299,23 +319,14 @@
this.tabControl1.Size = new System.Drawing.Size(715, 515);
this.tabControl1.TabIndex = 1;
//
- // txtParentMenuName
+ // lbGuid
//
- this.txtParentMenuName.Location = new System.Drawing.Point(114, 11);
- this.txtParentMenuName.Name = "txtParentMenuName";
- this.txtParentMenuName.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txtParentMenuName.Properties.TreeList = this.treeListLookUpEdit1TreeList;
- this.txtParentMenuName.Size = new System.Drawing.Size(294, 24);
- this.txtParentMenuName.TabIndex = 116;
- //
- // treeListLookUpEdit1TreeList
- //
- this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
- this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
- this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
- this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200);
- this.treeListLookUpEdit1TreeList.TabIndex = 0;
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(66, 438);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(39, 18);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "guid:";
//
// SysMenuAdd
//
@@ -333,10 +344,11 @@
((System.ComponentModel.ISupportInitialize)(this.txtMenuName.Properties)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- this.tabPage1.ResumeLayout(false);
- this.tabControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txtParentMenuName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ this.tabPage1.PerformLayout();
+ this.tabControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -367,5 +379,6 @@
private System.Windows.Forms.TabControl tabControl1;
private DevExpress.XtraEditors.TreeListLookUpEdit txtParentMenuName;
private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
+ private System.Windows.Forms.Label lbGuid;
}
}
\ 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 278b0ae..078d88f 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
@@ -16,12 +16,13 @@
{
public partial class SysMenuAdd : DevExpress.XtraEditors.XtraForm
{
- public SysMenuAdd()
+ public SysMenuAdd(string guid)
{
InitializeComponent();
btnSave.Click += BtnSave_Click;
btnEsc.Click += BtnEsc_Click;
getTree();
+ lbGuid.Text = guid;
}
private void BtnEsc_Click(object sender, EventArgs e)
@@ -52,7 +53,7 @@
string json = JsonConvert.SerializeObject(_obj);
try
{
- Utility.HttpPost("", "MenuAction/EditModel", json);
+ UtilityHelper.HttpPost("", "MenuAction/EditModel", json);
}
catch (Exception ex)
{
@@ -67,13 +68,11 @@
string strReturn = "";
try
{
-
- strReturn =Utility.HttpPost("", "MenuAction/GetListPage", json);
- ReturnModel<PageListModel> dd = Utility.GetTableByJson(strReturn);
+ 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.DataSource = dt;
txtParentMenuName.Properties.DisplayMember = "name";
txtParentMenuName.Properties.TreeList.KeyFieldName = "guid";
txtParentMenuName.Properties.TreeList.ParentFieldName = "upGuid";
@@ -84,5 +83,18 @@
}
}
+
+ private void getModel() {
+ //_AppDomain
+ //string json = JsonConvert.SerializeObject(_obj);
+ //try
+ //{
+ // Utility.HttpPost("", "MenuAction/GetModel", json);
+ //}
+ //catch (Exception ex)
+ //{
+ // throw ex;
+ //}
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index a712d43..4abd288 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -86,6 +86,7 @@
<Compile Include="DevFrm\User\SysMenuAdd.Designer.cs">
<DependentUpon>SysMenuAdd.cs</DependentUpon>
</Compile>
+ <Compile Include="Models\LoginInfoModel.cs" />
<Compile Include="Models\PageQueryModel.cs" />
<Compile Include="Models\ReturnModel.cs" />
<Compile Include="Program.cs" />
@@ -95,21 +96,15 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="TestForm\FluentDesignForm1.cs">
+ <Compile Include="TestForm\test.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="TestForm\FluentDesignForm1.Designer.cs">
- <DependentUpon>FluentDesignForm1.cs</DependentUpon>
- </Compile>
- <Compile Include="TestForm\ToolbarForm1.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\ToolbarForm1.Designer.cs">
- <DependentUpon>ToolbarForm1.cs</DependentUpon>
+ <Compile Include="TestForm\test.Designer.cs">
+ <DependentUpon>test.cs</DependentUpon>
</Compile>
<Compile Include="ToolBox\LogHelper.cs" />
- <Compile Include="ToolBox\Msg.cs" />
- <Compile Include="ToolBox\Utility.cs" />
+ <Compile Include="ToolBox\MsgHelper.cs" />
+ <Compile Include="ToolBox\UtilityHelper.cs" />
<Compile Include="UserControl\ShowDialogForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -140,6 +135,9 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ <EmbeddedResource Include="TestForm\test.resx">
+ <DependentUpon>test.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowDialogForm.resx">
<DependentUpon>ShowDialogForm.cs</DependentUpon>
@@ -180,6 +178,12 @@
<None Include="Resources\checkbox2_16x16.png" />
<None Include="Resources\forcetesting_32x32.png" />
<None Include="Resources\forcetesting_16x16.png" />
+ <None Include="Resources\fullstackedcolumn3d_32x32.png" />
+ <None Include="Resources\chartsshowlegend_32x32.png" />
+ <None Include="Resources\mapit_16x16.png" />
+ <None Include="Resources\time2_16x16.png" />
+ <None Include="Resources\knowledgebasearticle_16x16.png" />
+ <None Include="Resources\edit_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Models/ReturnModel.cs b/DevApp/Gs.DevApp/Models/ReturnModel.cs
index 68babb5..d4d674a 100644
--- a/DevApp/Gs.DevApp/Models/ReturnModel.cs
+++ b/DevApp/Gs.DevApp/Models/ReturnModel.cs
@@ -6,18 +6,24 @@
namespace Gs.DevApp.Models
{
+ /// <summary>
+ /// 杩斿洖鐨勫鍥寸粨鏋�
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
public class ReturnModel<T>
{
/// <summary>
/// Default = -100榛樿, Unauthorized = -101闈炴硶璋冪敤, Exception = -102绯荤粺浠ｇ爜寮傚父, Success = 1鎴愬姛
/// </summary>
- public string rtnCode { set; get; }
+ public int rtnCode { set; get; }
public T rtnData { set; get; }
public string rtnMsg { get; set; }
}
+ /// <summary>
+ /// 杩斿洖鐨勫垎椤佃妭鐐�
+ /// </summary>
public class PageListModel
{
-
/// <summary>
/// 鍒楄〃
/// </summary>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 1bce4da..1b6c72d 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -27,4 +27,6 @@
}
}
}
+
+
}
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 56fc616..fa40b5f 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -133,6 +133,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap chartsshowlegend_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("chartsshowlegend_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap checkbox_32x32 {
get {
object obj = ResourceManager.GetObject("checkbox_32x32", resourceCulture);
@@ -233,6 +243,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap edit_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("edit_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap editingfillleft_32x32 {
get {
object obj = ResourceManager.GetObject("editingfillleft_32x32", resourceCulture);
@@ -293,6 +313,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap fullstackedcolumn3d_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("fullstackedcolumn3d_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap knowledgebasearticle_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("knowledgebasearticle_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap legendnone2_32x32 {
get {
object obj = ResourceManager.GetObject("legendnone2_32x32", resourceCulture);
@@ -316,6 +356,16 @@
internal static System.Drawing.Bitmap listmultilevel_16x16 {
get {
object obj = ResourceManager.GetObject("listmultilevel_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap mapit_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("mapit_16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -393,6 +443,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap time2_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("time2_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap trackingchanges_allmarkup_16x16 {
get {
object obj = ResourceManager.GetObject("trackingchanges_allmarkup_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 9de4c57..8fad381 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,8 +124,8 @@
<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="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -175,14 +175,23 @@
<data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fullstackedcolumn3d_32x32.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="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -190,14 +199,17 @@
<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="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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>
</data>
<data name="linktoprevious_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\linktoprevious_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
@@ -217,6 +229,9 @@
<data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -229,10 +244,13 @@
<data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="forcetesting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_32x32.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/TestForm/FluentDesignForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/FluentDesignForm1.Designer.cs
deleted file mode 100644
index cb226f6..0000000
--- a/DevApp/Gs.DevApp/TestForm/FluentDesignForm1.Designer.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-锘�
-namespace Gs.DevApp.TestForm
-{
- partial class FluentDesignForm1
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- this.fluentDesignFormContainer1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormContainer();
- this.accordionControl1 = new DevExpress.XtraBars.Navigation.AccordionControl();
- this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
- this.accordionControlElement1 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
- this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
- ((System.ComponentModel.ISupportInitialize)(this.accordionControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).BeginInit();
- this.SuspendLayout();
- //
- // fluentDesignFormContainer1
- //
- this.fluentDesignFormContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.fluentDesignFormContainer1.Location = new System.Drawing.Point(260, 46);
- this.fluentDesignFormContainer1.Name = "fluentDesignFormContainer1";
- this.fluentDesignFormContainer1.Size = new System.Drawing.Size(431, 427);
- this.fluentDesignFormContainer1.TabIndex = 0;
- //
- // accordionControl1
- //
- this.accordionControl1.Dock = System.Windows.Forms.DockStyle.Left;
- this.accordionControl1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement1});
- this.accordionControl1.Location = new System.Drawing.Point(0, 46);
- this.accordionControl1.Name = "accordionControl1";
- this.accordionControl1.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Touch;
- this.accordionControl1.Size = new System.Drawing.Size(260, 427);
- this.accordionControl1.TabIndex = 1;
- this.accordionControl1.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
- //
- // fluentDesignFormControl1
- //
- this.fluentDesignFormControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.fluentDesignFormControl1.FluentDesignForm = this;
- this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0);
- this.fluentDesignFormControl1.Manager = this.fluentFormDefaultManager1;
- this.fluentDesignFormControl1.Name = "fluentDesignFormControl1";
- this.fluentDesignFormControl1.Size = new System.Drawing.Size(691, 46);
- this.fluentDesignFormControl1.TabIndex = 2;
- this.fluentDesignFormControl1.TabStop = false;
- //
- // accordionControlElement1
- //
- this.accordionControlElement1.Name = "accordionControlElement1";
- this.accordionControlElement1.Text = "Element1";
- //
- // Form1
- //
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(691, 473);
- this.ControlContainer = this.fluentDesignFormContainer1;
- this.Controls.Add(this.fluentDesignFormContainer1);
- this.Controls.Add(this.accordionControl1);
- this.Controls.Add(this.fluentDesignFormControl1);
- this.FluentDesignFormControl = this.fluentDesignFormControl1;
- this.Name = "FluentDesignForm1";
- this.NavigationControl = this.accordionControl1;
- this.Text = "FluentDesignForm1";
- ((System.ComponentModel.ISupportInitialize)(this.accordionControl1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
- private DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormContainer fluentDesignFormContainer1;
- private DevExpress.XtraBars.Navigation.AccordionControl accordionControl1;
- private DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl fluentDesignFormControl1;
- private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement1;
- private DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager fluentFormDefaultManager1;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/FluentDesignForm1.cs b/DevApp/Gs.DevApp/TestForm/FluentDesignForm1.cs
deleted file mode 100644
index 9957245..0000000
--- a/DevApp/Gs.DevApp/TestForm/FluentDesignForm1.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing DevExpress.XtraBars;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.TestForm
-{
- public partial class FluentDesignForm1 : DevExpress.XtraBars.FluentDesignSystem.FluentDesignForm
- {
- public FluentDesignForm1()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/DevApp/Gs.DevApp/TestForm/ToolbarForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/ToolbarForm1.Designer.cs
deleted file mode 100644
index 09e834f..0000000
--- a/DevApp/Gs.DevApp/TestForm/ToolbarForm1.Designer.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-锘�
-namespace Gs.DevApp.TestForm
-{
- partial class ToolbarForm1
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
- this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
- this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
- this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
- this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- this.bar1 = new DevExpress.XtraBars.Bar();
- this.bar2 = new DevExpress.XtraBars.Bar();
- this.bar3 = new DevExpress.XtraBars.Bar();
- ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
- this.SuspendLayout();
- //
- // barManager1
- //
- this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
- this.bar1,
- this.bar2,
- this.bar3});
- this.barManager1.DockControls.Add(this.barDockControlTop);
- this.barManager1.DockControls.Add(this.barDockControlBottom);
- this.barManager1.DockControls.Add(this.barDockControlLeft);
- this.barManager1.DockControls.Add(this.barDockControlRight);
- this.barManager1.Form = this;
- this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 0;
- this.barManager1.StatusBar = this.bar3;
- //
- // barDockControlTop
- //
- this.barDockControlTop.CausesValidation = false;
- this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
- this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
- this.barDockControlTop.Size = new System.Drawing.Size(632, 51);
- //
- // barDockControlBottom
- //
- this.barDockControlBottom.CausesValidation = false;
- this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 255);
- this.barDockControlBottom.Size = new System.Drawing.Size(632, 23);
- //
- // barDockControlLeft
- //
- this.barDockControlLeft.CausesValidation = false;
- this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 51);
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 204);
- //
- // barDockControlRight
- //
- this.barDockControlRight.CausesValidation = false;
- this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(632, 51);
- this.barDockControlRight.Size = new System.Drawing.Size(0, 204);
- //
- // bar1
- //
- this.bar1.BarName = "Tools";
- this.bar1.DockCol = 0;
- this.bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- this.bar1.Text = "Tools";
- //
- // bar2
- //
- this.bar2.BarName = "Main menu";
- this.bar2.DockCol = 0;
- this.bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- this.bar2.OptionsBar.MultiLine = true;
- this.bar2.OptionsBar.UseWholeRow = true;
- this.bar2.Text = "Main menu";
- //
- // bar3
- //
- this.bar3.BarName = "Status bar";
- this.bar3.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom;
- this.bar3.DockCol = 0;
- this.bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Bottom;
- this.bar3.OptionsBar.AllowQuickCustomization = false;
- this.bar3.OptionsBar.DrawDragBorder = false;
- this.bar3.OptionsBar.UseWholeRow = true;
- this.bar3.Text = "Status bar";
- //
- // Form1
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(632, 278);
- this.Controls.Add(this.barDockControlLeft);
- this.Controls.Add(this.barDockControlRight);
- this.Controls.Add(this.barDockControlBottom);
- this.Controls.Add(this.barDockControlTop);
- this.Text = "ToolbarForm1";
- ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraBars.BarManager barManager1;
- private DevExpress.XtraBars.Bar bar1;
- private DevExpress.XtraBars.Bar bar2;
- private DevExpress.XtraBars.Bar bar3;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/ToolbarForm1.cs b/DevApp/Gs.DevApp/TestForm/ToolbarForm1.cs
deleted file mode 100644
index 8ff9464..0000000
--- a/DevApp/Gs.DevApp/TestForm/ToolbarForm1.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing DevExpress.XtraBars;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.TestForm
-{
- public partial class ToolbarForm1 : DevExpress.XtraEditors.XtraForm
- {
- public ToolbarForm1()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/Msg.cs b/DevApp/Gs.DevApp/ToolBox/Msg.cs
deleted file mode 100644
index 9e8f0f7..0000000
--- a/DevApp/Gs.DevApp/ToolBox/Msg.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.ToolBox
-{
- /// <summary>
- /// 绯荤粺娑堟伅鎻愮ず绐椾綋
- /// </summary>
- public class Msg
- {
- /// <summary>
- /// 鎵撳紑瀵硅瘽妗�
- /// </summary>
- /// <param name="msg">鏈瀵硅瘽鍐呭</param>
- /// <returns></returns>
- public static bool AskQuestion(string msg)
- {
- DialogResult r;
- r = MessageBox.Show(msg, "纭",
- MessageBoxButtons.YesNo,
- MessageBoxIcon.Question,
- MessageBoxDefaultButton.Button2);
- return r == DialogResult.Yes;
- }
-
- /// <summary>
- /// 閿欒娑堟伅鎻愮ず妗�
- /// </summary>
- /// <param name="msg">閿欒娑堟伅鍐呭</param>
- public static void ShowError(string msg)
- {
- MessageBox.Show(msg, "璀﹀憡",
- MessageBoxButtons.OK,
- MessageBoxIcon.Hand,
- MessageBoxDefaultButton.Button1);
- }
-
- /// <summary>
- /// 鏄剧ず绯荤粺寮傚父
- /// </summary>
- /// <param name="e">绯荤粺寮傚父</param>
- public static void ShowException(Exception e)
- {
- var s = e.Message;
- var innerMsg = string.Empty;
-
- if (e.InnerException != null)
- {
- innerMsg = e.InnerException.Message;
- s += "\n" + innerMsg;
- }
-
- Warning(s);
- }
-
- public static void ShowException(Exception ex, string customMessage)
- {
- //if (ex is CustomException)
- //{
- // ShowException(ex);
- //}
- //else if (customMessage != "")
- //{
- // Warning(customMessage);
- //}
- //else
- //{
- // Warning(ex.Message);
- //}
- }
-
- /// <summary>
- /// 淇℃伅鎻愮ず妗�
- /// </summary>
- /// <param name="msg">鏈鏄剧ず鐨勬秷鎭�</param>
- public static void ShowInformation(string msg)
- {
- MessageBox.Show(msg, "淇℃伅",
- MessageBoxButtons.OK,
- MessageBoxIcon.Asterisk,
- MessageBoxDefaultButton.Button1);
- }
-
- /// <summary>
- /// 璀﹀憡鎻愮ず妗�
- /// </summary>
- /// <param name="msg">璀﹀憡鍐呭</param>
- public static void Warning(string msg)
- {
- MessageBox.Show(msg, "璀﹀憡",
- MessageBoxButtons.OK,
- MessageBoxIcon.Exclamation,
- MessageBoxDefaultButton.Button1);
- }
- }
-}
diff --git a/DevApp/Gs.DevApp/ToolBox/Utility.cs b/DevApp/Gs.DevApp/ToolBox/Utility.cs
deleted file mode 100644
index c55e1e3..0000000
--- a/DevApp/Gs.DevApp/ToolBox/Utility.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-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;
-using Gs.DevApp.Models;
-
-namespace Gs.DevApp.ToolBox
-{
- /// <summary>
- /// 閫氱敤绫�
- /// </summary>
- public class Utility
- {
- private static string WebApiUrl = System.Configuration.ConfigurationSettings.AppSettings.Get("WebApiUrl").ToString();
-
- /// <summary>
- /// httpPost璁块棶鏈嶅姟
- /// </summary>
- /// <param name="url">鏈嶅姟鍦板潃</param>
- /// <param name="meth">鏂规硶鍚嶇О</param>
- /// <param name="param">鍙傛暟</param>
- /// <returns></returns>
- public static string HttpPost(string url, string meth, string param)
- {
- if (string.IsNullOrEmpty(url))
- url = WebApiUrl;
- url += meth;
- HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
- request.Method = "POST";
- request.ContentType = "application/json";
- request.Headers.Add("token", GetBasicAuthTicket());
- request.Accept = "*/*";
- request.Timeout = 15000;
- request.AllowAutoRedirect = false;
- StreamWriter requestStream = null;
- WebResponse response = null;
- string responseStr = null;
- try
- {
- requestStream = new StreamWriter(request.GetRequestStream());
- requestStream.Write(param);
- requestStream.Close();
- response = request.GetResponse();
- if (response != null)
- {
- StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8);
- responseStr = reader.ReadToEnd();
- //File.WriteAllText(Server.MapPath("~/") + @"\test.txt", responseStr);
- reader.Close();
- }
- }
- catch (Exception ex)
- {
- throw ex;
- }
- finally
- {
- request = null;
- requestStream = null;
- response = null;
- }
- return responseStr;
- }
- /// <summary>
- /// 鏍规嵁鍥剧墖鍚嶈鍙栬祫婧愭枃浠�,涓嶅甫鍚庣紑鍚�
- /// </summary>
- /// <param name="imageName"></param>
- /// <returns></returns>
- public static Image GetImgFromResource(string imageName)
- {
- // 鑾峰彇褰撳墠绋嬪簭闆�
- Assembly assembly = Assembly.GetExecutingAssembly();
- // 鍒涘缓璧勬簮绠＄悊鍣ㄦ潵璁块棶璧勬簮
- ResourceManager resourceManager = new ResourceManager("GsDxApp.Properties.Resources", assembly);
- // 灏濊瘯鑾峰彇鍥剧墖璧勬簮
- Image image = resourceManager.GetObject(imageName) as Image;
- if (image != null)
- {
- return image;
- }
- else
- {
- return null;
- }
- }
- /// <summary>
- /// 璇诲彇token
- /// </summary>
- /// <returns></returns>
- public static string GetBasicAuthTicket()
- {
- string token = Guid.NewGuid().ToString();
- return token;
- }
- /// <summary>
- /// 鏍囧噯json涓茶繑鍥� table锛�
- /// </summary>
- /// <param name="strReturn"></param>
- /// <returns></returns>
- public static ReturnModel<PageListModel> GetTableByJson(string strReturn)
- {
- ReturnModel<PageListModel> rto = new ReturnModel<PageListModel>();
- JObject json = JObject.Parse(strReturn);
- rto.rtnCode = json["rtnCode"].ToString();
- rto.rtnMsg = json["rtnMsg"].ToString();
- rto.rtnData = new PageListModel();
- rto.rtnData.pages = int.Parse(json["rtnData"]["pages"].ToString());
- rto.rtnData.total = int.Parse(json["rtnData"]["total"].ToString());
- rto.rtnData.everyPageSize = int.Parse(json["rtnData"]["everyPageSize"].ToString());
- JArray array = new JArray();
- var d = json["rtnData"]["list"];
- foreach (var a in d)
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- rto.rtnData.list = dt;
- return rto;
- }
- }
-}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
index 6234de0..900ace8 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.cs
@@ -112,7 +112,7 @@
this.maxProcess = _maxProcess > this.MinProcess ? _maxProcess : MinProcess;
lblCaption.Text = this.Caption;
- lblMessage.Text = this.Message;
+ // lblMessage.Text = this.Message;
lblContent.Text = this.Content;
progressShow.Properties.Minimum = MinProcess;
progressShow.Properties.Maximum = MaxProcess;
@@ -145,7 +145,7 @@
public void SetMessage(string newMessage)
{
this.Message = newMessage;
- lblMessage.Text = this.Message;
+ // lblMessage.Text = this.Message;
progressShow.PerformStep();
this.Refresh();
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
index f163c4c..16d48c6 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowDialogForm.designer.cs
@@ -28,57 +28,20 @@
/// </summary>
private void InitializeComponent()
{
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.lblCaption = new DevExpress.XtraEditors.LabelControl();
- this.lblMessage = new DevExpress.XtraEditors.LabelControl();
- this.lblContent = new DevExpress.XtraEditors.LabelControl();
this.progressShow = new DevExpress.XtraEditors.ProgressBarControl();
+ this.lblContent = new DevExpress.XtraEditors.LabelControl();
+ this.lblCaption = new DevExpress.XtraEditors.LabelControl();
this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
this.SuspendLayout();
//
- // panelControl1
- //
- this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D;
- this.panelControl1.Controls.Add(this.lblCaption);
- this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelControl1.Location = new System.Drawing.Point(0, 0);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(436, 34);
- this.panelControl1.TabIndex = 0;
- //
- // lblCaption
- //
- this.lblCaption.Location = new System.Drawing.Point(5, 9);
- this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(41, 14);
- this.lblCaption.TabIndex = 0;
- this.lblCaption.Text = "Caption";
- //
- // lblMessage
- //
- this.lblMessage.Location = new System.Drawing.Point(24, 7);
- this.lblMessage.Name = "lblMessage";
- this.lblMessage.Size = new System.Drawing.Size(46, 14);
- this.lblMessage.TabIndex = 2;
- this.lblMessage.Text = "Message";
- //
- // lblContent
- //
- this.lblContent.Location = new System.Drawing.Point(24, 31);
- this.lblContent.Name = "lblContent";
- this.lblContent.Size = new System.Drawing.Size(45, 14);
- this.lblContent.TabIndex = 3;
- this.lblContent.Text = "Content";
- //
// progressShow
//
this.progressShow.EditValue = 1;
- this.progressShow.Location = new System.Drawing.Point(24, 59);
+ this.progressShow.Location = new System.Drawing.Point(24, 94);
+ this.progressShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.progressShow.Name = "progressShow";
this.progressShow.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
this.progressShow.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
@@ -90,39 +53,53 @@
this.progressShow.Properties.ShowTitle = true;
this.progressShow.Properties.StartColor = System.Drawing.Color.Empty;
this.progressShow.Properties.Step = 1;
- this.progressShow.Size = new System.Drawing.Size(400, 15);
+ this.progressShow.Size = new System.Drawing.Size(457, 19);
this.progressShow.TabIndex = 4;
+ //
+ // lblContent
+ //
+ this.lblContent.Location = new System.Drawing.Point(24, 58);
+ this.lblContent.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblContent.Name = "lblContent";
+ this.lblContent.Size = new System.Drawing.Size(51, 18);
+ this.lblContent.TabIndex = 3;
+ this.lblContent.Text = "Content";
+ //
+ // lblCaption
+ //
+ this.lblCaption.Location = new System.Drawing.Point(24, 27);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(48, 18);
+ this.lblCaption.TabIndex = 0;
+ this.lblCaption.Text = "Caption";
//
// panelControl2
//
- this.panelControl2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.panelControl2.Controls.Add(this.lblCaption);
this.panelControl2.Controls.Add(this.lblContent);
this.panelControl2.Controls.Add(this.progressShow);
- this.panelControl2.Controls.Add(this.lblMessage);
- this.panelControl2.Location = new System.Drawing.Point(0, 38);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(436, 83);
+ this.panelControl2.Size = new System.Drawing.Size(498, 151);
this.panelControl2.TabIndex = 5;
//
// ShowDialogForm
//
- 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(436, 124);
+ this.ClientSize = new System.Drawing.Size(498, 151);
this.Controls.Add(this.panelControl2);
- this.Controls.Add(this.panelControl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.IconOptions.ShowIcon = false;
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ShowDialogForm";
- this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShowDialogForm";
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
- this.panelControl1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
@@ -133,11 +110,9 @@
#endregion
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.LabelControl lblCaption;
- private DevExpress.XtraEditors.LabelControl lblMessage;
- private DevExpress.XtraEditors.LabelControl lblContent;
private DevExpress.XtraEditors.ProgressBarControl progressShow;
+ private DevExpress.XtraEditors.LabelControl lblContent;
+ private DevExpress.XtraEditors.LabelControl lblCaption;
private DevExpress.XtraEditors.PanelControl panelControl2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
index ecb27c2..d60081a 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
@@ -38,10 +38,10 @@
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
this.bar2 = new DevExpress.XtraBars.Bar();
this.btnAdd = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.barLargeButtonItem5 = 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();
this.barLargeButtonItem6 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem7 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem8 = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -100,10 +100,10 @@
this.barManager1.Form = this;
this.barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
this.btnAdd,
- this.barLargeButtonItem2,
- this.barLargeButtonItem3,
- this.barLargeButtonItem4,
- this.barLargeButtonItem5,
+ this.btnDel,
+ this.btnEdit,
+ this.btnSave,
+ this.btnView,
this.barButtonItem1,
this.barLargeButtonItem6,
this.barLargeButtonItem7,
@@ -122,10 +122,10 @@
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.barLargeButtonItem2, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.barLargeButtonItem3, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.barLargeButtonItem4, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.barLargeButtonItem5, 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),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem6),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem7),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem8),
@@ -143,37 +143,37 @@
this.btnAdd.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
this.btnAdd.Name = "btnAdd";
//
- // barLargeButtonItem2
+ // btnDel
//
- this.barLargeButtonItem2.Caption = "鍒犻櫎";
- this.barLargeButtonItem2.Id = 4;
- this.barLargeButtonItem2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- this.barLargeButtonItem2.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32;
- this.barLargeButtonItem2.Name = "barLargeButtonItem2";
+ 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.Name = "btnDel";
//
- // barLargeButtonItem3
+ // btnEdit
//
- this.barLargeButtonItem3.Caption = "淇敼";
- this.barLargeButtonItem3.Id = 5;
- this.barLargeButtonItem3.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
- this.barLargeButtonItem3.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
- this.barLargeButtonItem3.Name = "barLargeButtonItem3";
+ this.btnEdit.Caption = "淇敼";
+ this.btnEdit.Id = 5;
+ this.btnEdit.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
+ this.btnEdit.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
+ this.btnEdit.Name = "btnEdit";
//
- // barLargeButtonItem4
+ // btnSave
//
- this.barLargeButtonItem4.Caption = "淇濆瓨";
- this.barLargeButtonItem4.Id = 6;
- this.barLargeButtonItem4.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x16;
- this.barLargeButtonItem4.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.exportfile_32x32;
- this.barLargeButtonItem4.Name = "barLargeButtonItem4";
+ this.btnSave.Caption = "淇濆瓨";
+ this.btnSave.Id = 6;
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x16;
+ this.btnSave.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.exportfile_32x32;
+ this.btnSave.Name = "btnSave";
//
- // barLargeButtonItem5
+ // btnView
//
- this.barLargeButtonItem5.Caption = "鏌ョ湅";
- this.barLargeButtonItem5.Id = 7;
- this.barLargeButtonItem5.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
- this.barLargeButtonItem5.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.show_32x32;
- this.barLargeButtonItem5.Name = "barLargeButtonItem5";
+ this.btnView.Caption = "鏌ョ湅";
+ this.btnView.Id = 7;
+ this.btnView.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.show_16x16;
+ this.btnView.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.show_32x32;
+ this.btnView.Name = "btnView";
//
// barLargeButtonItem6
//
@@ -278,10 +278,10 @@
private DevExpress.XtraBars.BarManager barManager1;
private DevExpress.XtraBars.Bar bar2;
private DevExpress.XtraBars.BarLargeButtonItem btnAdd;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem5;
+ private DevExpress.XtraBars.BarLargeButtonItem btnDel;
+ private DevExpress.XtraBars.BarLargeButtonItem btnEdit;
+ private DevExpress.XtraBars.BarLargeButtonItem btnSave;
+ private DevExpress.XtraBars.BarLargeButtonItem btnView;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem6;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem7;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem8;
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
index e66ec0e..2b04aae 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
@@ -1,23 +1,47 @@
锘縰sing DevExpress.XtraEditors;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+
namespace Gs.DevApp.UserControl
{
public partial class ToolBarMenu : DevExpress.XtraEditors.XtraUserControl
{
+ /// <summary>
+ /// 鏂板
+ /// </summary>
public event EventHandler btnAddClick;
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ public event EventHandler btnDelClick;
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ public event EventHandler btnEdtClick;
+
public ToolBarMenu()
{
InitializeComponent();
this.btnAdd.ItemClick += BtnAdd_ItemClick;
+ this.btnDel.ItemClick += BtnDel_ItemClick;
+ this.btnEdit.ItemClick += BtnEdit_ItemClick;
+ }
+
+ private void BtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (btnEdtClick != null)
+ {
+ btnEdtClick(this, e);
+ }
+ }
+
+ private void BtnDel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (btnDelClick != null) {
+ btnDelClick(this, e);
+ }
}
private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
diff --git a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
index 9005824..280ff2e 100644
--- a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
+++ b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/FileContentIndex/a3306c0b-3453-46b3-bcf4-6e38ab6b139e.vsidx b/WebApi/.vs/GsMesSolution/FileContentIndex/a3306c0b-3453-46b3-bcf4-6e38ab6b139e.vsidx
deleted file mode 100644
index 9c00394..0000000
--- a/WebApi/.vs/GsMesSolution/FileContentIndex/a3306c0b-3453-46b3-bcf4-6e38ab6b139e.vsidx
+++ /dev/null
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/v17/.futdcache.v2 b/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
index 448ddb6..ae7a62d 100644
--- a/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
+++ b/WebApi/.vs/GsMesSolution/v17/.futdcache.v2
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index 27e8c9d..189dc5d 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -1,7 +1,12 @@
{
"Version": 1,
"WorkspaceRootPath": "D:\\GsMesV2\\WebApi\\",
- "Documents": [],
+ "Documents": [
+ {
+ "AbsoluteMoniker": "D:0:0:{C77F6A1D-0CEA-40DE-9B03-C59B581531E8}|Gs.User\\Gs.User.csproj|d:\\gsmesv2\\webapi\\gs.user\\service\\usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C77F6A1D-0CEA-40DE-9B03-C59B581531E8}|Gs.User\\Gs.User.csproj|solutionrelative:gs.user\\service\\usercontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ }
+ ],
"DocumentGroupContainers": [
{
"Orientation": 0,
@@ -9,7 +14,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": -1,
+ "SelectedChildIndex": 3,
"Children": [
{
"$type": "Bookmark",
@@ -22,6 +27,19 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "UserController.cs",
+ "DocumentMoniker": "D:\\GsMesV2\\WebApi\\Gs.User\\Service\\UserController.cs",
+ "RelativeDocumentMoniker": "Gs.User\\Service\\UserController.cs",
+ "ToolTip": "D:\\GsMesV2\\WebApi\\Gs.User\\Service\\UserController.cs",
+ "RelativeToolTip": "Gs.User\\Service\\UserController.cs",
+ "ViewState": "AQIAAGYAAAAAAAAAAAAywHIAAAAvAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-08-27T14:27:24.014Z",
+ "EditorCaption": ""
}
]
}
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v8.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v8.bin
index 6ecfca7..4795a59 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v8.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.metadata.v8.bin
Binary files differ
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v8.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v8.bin
index e36debd..fb015b9 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v8.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.projects.v8.bin
Binary files differ
diff --git a/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v8.bin b/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v8.bin
index 721572d..f42330b 100644
--- a/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v8.bin
+++ b/WebApi/.vs/ProjectEvaluation/gsmessolution.strings.v8.bin
Binary files differ
diff --git a/WebApi/Gs.Demo/Gs.Demo.csproj b/WebApi/Gs.Demo/Gs.Demo.csproj
index 91033c6..59f73cd 100644
--- a/WebApi/Gs.Demo/Gs.Demo.csproj
+++ b/WebApi/Gs.Demo/Gs.Demo.csproj
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
- <BaseOutputPath>D:\GsMes\Gs.HostIIS\bin</BaseOutputPath>
+ <BaseOutputPath>D:\GsMesV2\WebApi\Gs.HostIIS\bin</BaseOutputPath>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
diff --git a/WebApi/Gs.User/Gs.User.csproj b/WebApi/Gs.User/Gs.User.csproj
new file mode 100644
index 0000000..5e69710
--- /dev/null
+++ b/WebApi/Gs.User/Gs.User.csproj
@@ -0,0 +1,15 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ <BaseOutputPath>D:\GsMesV2\WebApi\Gs.HostIIS\bin</BaseOutputPath>
+ <GenerateDocumentationFile>True</GenerateDocumentationFile>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\Gs.Toolbox\Gs.Toolbox.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/WebApi/Gs.User/Modes/UserLogin.cs b/WebApi/Gs.User/Modes/UserLogin.cs
index 49c93ce..d6adb17 100644
--- a/WebApi/Gs.User/Modes/UserLogin.cs
+++ b/WebApi/Gs.User/Modes/UserLogin.cs
@@ -8,17 +8,19 @@
{
public class UserLogin
{
- /// <summary>
- /// 璐﹀彿
- /// </summary>
- public string accountNo { get; set; }
-
+ public Guid userGuid { get; set; }
+
/// <summary>
/// 缁勭粐鏈烘瀯guid
/// </summary>
public Guid orgGuid { get; set; }
/// <summary>
+ /// 璐﹀彿
+ /// </summary>
+ public string accountNo { get; set; }
+
+ /// <summary>
/// 瀵嗙爜
/// </summary>
public string accountPwd { get; set; }
diff --git a/WebApi/Gs.User/Service/UserController.cs b/WebApi/Gs.User/Service/UserController.cs
index 614295d..895fd7f 100644
--- a/WebApi/Gs.User/Service/UserController.cs
+++ b/WebApi/Gs.User/Service/UserController.cs
@@ -8,6 +8,7 @@
using System.Linq;
using System.Text;
using Gs.User.Modes;
+using System.Diagnostics;
namespace Gs.User.Service
{
@@ -55,17 +56,6 @@
System.Data.DataRow row = dset.Tables[0].Rows[0];
m.loginGuid = Guid.Parse(row["loginGuid"].ToString());
m.loginOrgGuid = row["loginOrgGuid"].ToString();
- System.Text.StringBuilder sbR = new StringBuilder();
- if (dset.Tables.Count > 1 && dset.Tables[1].Rows.Count > 1)
- {
- foreach (System.Data.DataRow r in dset.Tables[1].Rows)
- {
- if (sbR.Length > 0)
- sbR.Append(",");
- sbR.Append(r["rightGuid"].ToString());
- }
- }
- m.loginRightList = sbR.ToString();
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鐧诲綍鎴愬姛锛�");
}
}
@@ -81,5 +71,74 @@
}
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, "鐧诲綍澶辫触锛�");
}
+
+ /// <summary>
+ /// 璇诲彇鐢ㄦ埛鐧诲綍淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<System.Dynamic.ExpandoObject> GetUserInfo([FromBody] UserLogin model)
+ {
+ Guid userGuid = model.userGuid;
+ DataSet dset = new DataSet();
+ dynamic m = new System.Dynamic.ExpandoObject();
+ using (SqlConnection conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (SqlCommand cmd = new SqlCommand("[prc_user_info]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters = new SqlParameter[] {
+ new SqlParameter("@userGuid",userGuid),
+ };
+ foreach (SqlParameter parameter in parameters)
+ {
+ cmd.Parameters.Add(parameter);
+ }
+ using (SqlDataAdapter dt = new SqlDataAdapter(cmd))
+ {
+ dt.Fill(dset, "0");
+ }
+ if (dset != null && dset.Tables.Count > 0 && dset.Tables[0].Rows.Count > 0)
+ {
+ System.Data.DataRow row = dset.Tables[0].Rows[0];
+ m.loginGuid = Guid.Parse(row["loginGuid"].ToString());
+ m.loginOrgGuid = row["loginOrgGuid"].ToString();
+ m.list = new List<MenuAction>();
+ if (dset.Tables.Count > 1 && dset.Tables[1].Rows.Count > 1)
+ {
+ foreach (DataRow dr in dset.Tables[1].Rows)
+ {
+ m.list.Add(
+ new MenuAction()
+ {
+ guid = Guid.Parse(dr["rightGuid"].ToString()),
+ upGuid = dr["upGuid"].ToString().Length > 0 ? Guid.Parse(dr["upGuid"].ToString()) : null,
+ name = dr["name"].ToString(),
+ icon = dr["icon"].ToString(),
+ fromPath = dr["fromPath"].ToString(),
+ category = int.Parse(dr["category"].ToString()),
+ }
+ );
+ }
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鐧诲綍鎴愬姛锛�");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(this.ToString(), "GetUserInfo error锛�" + ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, "鐧诲綍澶辫触锛�");
+ }
}
}
--
Gitblit v1.9.3