From b0302c52519c650e24fb73e81ed93ff13c4516e2 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期三, 28 八月 2024 10:25:50 +0800
Subject: [PATCH] 暂无
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 ++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 4
DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs | 15 +
WebApi/Gs.User/Service/UserController.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 | 0
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs | 102 +++++++++---
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs | 21 +-
WebApi/.vs/GsMesSolution/v17/DocumentLayout.json | 18 +-
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 4
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 9 -
DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs | 20 +-
DevApp/Gs.DevApp/Properties/Resources.resx | 20 +
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs | 39 ++--
DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs | 144 ++++++++++-------
WebApi/Gs.User/Service/MenuActionController.cs | 40 +++-
16 files changed, 288 insertions(+), 172 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index ae99c31..eaefc28 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -50,14 +50,14 @@
}
else
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
sdf.SetCaption("鎵ц杩涘害锛�" + (i - 10) + "/" + i.ToString() + "锛�");
}
catch (Exception ex)
{
sdf.Close();
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
return;
}
sdf.Close();
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 910e9df..2c251eb 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -70,7 +70,6 @@
this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
- this.accordionControlElement1 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
this.fluentDesignFormContainer1.SuspendLayout();
this.statusStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
@@ -425,19 +424,12 @@
// acrd
//
this.acrd.Dock = System.Windows.Forms.DockStyle.Left;
- this.acrd.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
- this.accordionControlElement1});
this.acrd.Location = new System.Drawing.Point(0, 39);
this.acrd.Name = "acrd";
this.acrd.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Touch;
this.acrd.Size = new System.Drawing.Size(208, 727);
this.acrd.TabIndex = 1;
this.acrd.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
- //
- // accordionControlElement1
- //
- this.accordionControlElement1.Name = "accordionControlElement1";
- this.accordionControlElement1.Text = "Element1";
//
// FrmMain
//
@@ -505,6 +497,5 @@
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 8155287..0cd01bf 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -55,7 +55,7 @@
_grp.Name = _dy["guid"].ToString();
_grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
_grp.Text = _dy["name"].ToString();
- _grp.Tag = _dy["fromPath"].ToString();
+ _grp.Tag = _dy["formPath"].ToString();
_grp.Click += _grp_Click;
DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
foreach (DataRow _dy2 in drItem)
@@ -66,7 +66,7 @@
_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.Tag = _dy2["formPath"].ToString();
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
};
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
index 10cec22..a7e6121 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
@@ -106,7 +106,7 @@
this.tlcModuleID.Name = "tlcModuleID";
this.tlcModuleID.Visible = true;
this.tlcModuleID.VisibleIndex = 5;
- this.tlcModuleID.Width = 74;
+ this.tlcModuleID.Width = 103;
//
// tlcMenuName
//
@@ -116,47 +116,47 @@
this.tlcMenuName.Name = "tlcMenuName";
this.tlcMenuName.Visible = true;
this.tlcMenuName.VisibleIndex = 0;
- this.tlcMenuName.Width = 219;
+ this.tlcMenuName.Width = 215;
//
// tlcParentMenuName
//
this.tlcParentMenuName.Caption = "鐘舵��";
- this.tlcParentMenuName.FieldName = "status";
+ this.tlcParentMenuName.FieldName = "statusTxt";
this.tlcParentMenuName.MinWidth = 23;
this.tlcParentMenuName.Name = "tlcParentMenuName";
this.tlcParentMenuName.Visible = true;
this.tlcParentMenuName.VisibleIndex = 4;
- this.tlcParentMenuName.Width = 96;
+ this.tlcParentMenuName.Width = 64;
//
// tlcMenuCaption
//
this.tlcMenuCaption.Caption = "绐椾綋璺緞";
- this.tlcMenuCaption.FieldName = "fromPath";
+ this.tlcMenuCaption.FieldName = "formPath";
this.tlcMenuCaption.MinWidth = 23;
this.tlcMenuCaption.Name = "tlcMenuCaption";
this.tlcMenuCaption.Visible = true;
this.tlcMenuCaption.VisibleIndex = 2;
- this.tlcMenuCaption.Width = 96;
+ this.tlcMenuCaption.Width = 139;
//
// tlcActions
//
this.tlcActions.Caption = "绐椾綋绫诲瀷";
- this.tlcActions.FieldName = "category";
+ this.tlcActions.FieldName = "categoryTxt";
this.tlcActions.MinWidth = 23;
this.tlcActions.Name = "tlcActions";
this.tlcActions.Visible = true;
this.tlcActions.VisibleIndex = 3;
- this.tlcActions.Width = 96;
+ this.tlcActions.Width = 50;
//
// tlcMenuType
//
- this.tlcMenuType.Caption = "搴忓彿";
+ 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;
+ this.tlcMenuType.Width = 50;
//
// treeListColumn1
//
@@ -165,6 +165,7 @@
this.treeListColumn1.Name = "treeListColumn1";
this.treeListColumn1.Visible = true;
this.treeListColumn1.VisibleIndex = 6;
+ this.treeListColumn1.Width = 104;
//
// SysMenu
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
index 3327c76..389b11e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
@@ -1,16 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Models;
+锘縰sing Gs.DevApp.Models;
using 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;
+
namespace Gs.DevApp.DevFrm.User
{
@@ -23,6 +16,12 @@
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ }
+
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getTree();
}
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
@@ -45,20 +44,25 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
return;
}
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + tlMenu.FocusedNode.GetValue("name") + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ {
+ return;
+ }
var _obj = new
{
guid = rowGuid,//涓诲缓
};
- string json = JsonConvert.SerializeObject(_obj);
- string strReturn = "";
+ string strJson = "";
try
{
- strReturn= UtilityHelper.HttpPost("", "MenuAction/DeleteModel", json);
-
+ strJson = UtilityHelper.HttpPost("", "MenuAction/DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0) { getTree(); }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- throw ex;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -84,17 +88,16 @@
this.tlMenu.Tag = "name";
this.tlMenu.EndUpdate();
this.tlMenu.ExpandAll();
- tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Radio;
+ tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Default;
// 璁剧疆涓嶅叧鑱旈�夋嫨
//tlMenu.OptionsSelection.MultiSelect = true;
- //// tlMenu.OptionsSelection.MaintainState = false; // 鍏抽敭璁剧疆
+ //tlMenu.OptionsSelection.MaintainState = false; // 鍏抽敭璁剧疆
//this.tlMenu.OptionsBehavior.AllowIndeterminateCheckState = true;
}
catch (Exception ex)
{
- throw ex;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
index 332aa7e..32de717 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.Designer.cs
@@ -36,9 +36,7 @@
this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
this.txtFormNamespace = new DevExpress.XtraEditors.MemoEdit();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
@@ -49,11 +47,14 @@
this.txtMenuName = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
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();
@@ -69,7 +70,7 @@
//
// labelControl7
//
- this.labelControl7.Location = new System.Drawing.Point(33, 273);
+ this.labelControl7.Location = new System.Drawing.Point(33, 232);
this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl7.Name = "labelControl7";
this.labelControl7.Size = new System.Drawing.Size(75, 18);
@@ -78,7 +79,7 @@
//
// txtStatus
//
- this.txtStatus.Location = new System.Drawing.Point(111, 269);
+ this.txtStatus.Location = new System.Drawing.Point(111, 228);
this.txtStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtStatus.Name = "txtStatus";
this.txtStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -93,14 +94,14 @@
//
// txtIdx
//
- this.txtIdx.Location = new System.Drawing.Point(111, 236);
+ this.txtIdx.Location = new System.Drawing.Point(111, 267);
this.txtIdx.Name = "txtIdx";
this.txtIdx.Size = new System.Drawing.Size(120, 26);
this.txtIdx.TabIndex = 113;
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(30, 244);
+ this.labelControl1.Location = new System.Drawing.Point(30, 275);
this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(75, 18);
@@ -109,7 +110,8 @@
//
// btnEsc
//
- this.btnEsc.Location = new System.Drawing.Point(299, 342);
+ this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.reviewingpane_32x32;
+ this.btnEsc.Location = new System.Drawing.Point(242, 333);
this.btnEsc.Name = "btnEsc";
this.btnEsc.Size = new System.Drawing.Size(94, 29);
this.btnEsc.TabIndex = 111;
@@ -117,7 +119,8 @@
//
// btnSave
//
- this.btnSave.Location = new System.Drawing.Point(129, 343);
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x321;
+ this.btnSave.Location = new System.Drawing.Point(111, 333);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(94, 29);
this.btnSave.TabIndex = 110;
@@ -127,45 +130,23 @@
//
this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(415, 121);
+ this.labelControl12.Location = new System.Drawing.Point(418, 49);
this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl12.Name = "labelControl12";
this.labelControl12.Size = new System.Drawing.Size(8, 18);
this.labelControl12.TabIndex = 107;
this.labelControl12.Text = "*";
//
- // labelControl10
- //
- this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl10.Appearance.Options.UseForeColor = true;
- this.labelControl10.Location = new System.Drawing.Point(415, 92);
- this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(8, 18);
- this.labelControl10.TabIndex = 109;
- this.labelControl10.Text = "*";
- //
// labelControl9
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(415, 57);
+ this.labelControl9.Location = new System.Drawing.Point(415, 89);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
this.labelControl9.TabIndex = 108;
this.labelControl9.Text = "*";
- //
- // labelControl8
- //
- this.labelControl8.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl8.Appearance.Options.UseForeColor = true;
- this.labelControl8.Location = new System.Drawing.Point(415, 14);
- this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(8, 18);
- this.labelControl8.TabIndex = 106;
- this.labelControl8.Text = "*";
//
// labelControl6
//
@@ -187,16 +168,16 @@
//
// labelControl5
//
- this.labelControl5.Location = new System.Drawing.Point(33, 121);
+ this.labelControl5.Location = new System.Drawing.Point(36, 49);
this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(75, 18);
this.labelControl5.TabIndex = 101;
- this.labelControl5.Text = "绐椾綋绫诲瀷锛�";
+ this.labelControl5.Text = "鑿滃崟绫诲瀷锛�";
//
// txtMenuType
//
- this.txtMenuType.Location = new System.Drawing.Point(111, 117);
+ this.txtMenuType.Location = new System.Drawing.Point(114, 45);
this.txtMenuType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtMenuType.Name = "txtMenuType";
this.txtMenuType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -211,7 +192,7 @@
//
// txtMenuIco
//
- this.txtMenuIco.Location = new System.Drawing.Point(111, 83);
+ this.txtMenuIco.Location = new System.Drawing.Point(111, 115);
this.txtMenuIco.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtMenuIco.Name = "txtMenuIco";
this.txtMenuIco.Size = new System.Drawing.Size(297, 24);
@@ -219,7 +200,7 @@
//
// labelControl4
//
- this.labelControl4.Location = new System.Drawing.Point(33, 87);
+ this.labelControl4.Location = new System.Drawing.Point(33, 119);
this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(75, 18);
@@ -237,7 +218,7 @@
//
// txtMenuName
//
- this.txtMenuName.Location = new System.Drawing.Point(111, 48);
+ this.txtMenuName.Location = new System.Drawing.Point(111, 80);
this.txtMenuName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtMenuName.Name = "txtMenuName";
this.txtMenuName.Size = new System.Drawing.Size(297, 24);
@@ -245,7 +226,7 @@
//
// labelControl2
//
- this.labelControl2.Location = new System.Drawing.Point(33, 52);
+ this.labelControl2.Location = new System.Drawing.Point(33, 84);
this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(75, 18);
@@ -254,6 +235,10 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.labelControl8);
this.panel1.Controls.Add(this.txtParentMenuName);
this.panel1.Controls.Add(this.labelControl7);
this.panel1.Controls.Add(this.txtStatus);
@@ -262,9 +247,7 @@
this.panel1.Controls.Add(this.btnEsc);
this.panel1.Controls.Add(this.btnSave);
this.panel1.Controls.Add(this.labelControl12);
- this.panel1.Controls.Add(this.labelControl10);
this.panel1.Controls.Add(this.labelControl9);
- this.panel1.Controls.Add(this.labelControl8);
this.panel1.Controls.Add(this.labelControl6);
this.panel1.Controls.Add(this.txtFormNamespace);
this.panel1.Controls.Add(this.labelControl5);
@@ -276,37 +259,77 @@
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Location = new System.Drawing.Point(57, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(480, 425);
+ this.panel1.Size = new System.Drawing.Size(585, 402);
this.panel1.TabIndex = 0;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(66, 373);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(39, 18);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "guid:";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(412, 155);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(158, 36);
+ this.label2.TabIndex = 119;
+ this.label2.Text = "锛堢獥浣撶殑鍛藉悕绌洪棿鍏ㄧО\r\n 锛岀埗鑿滃崟鍙负绌猴級";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(412, 14);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(143, 18);
+ this.label1.TabIndex = 118;
+ this.label1.Text = "锛堢┖灏嗕负涓�绾ц彍鍗曪級";
+ //
+ // labelControl8
+ //
+ this.labelControl8.Appearance.ForeColor = System.Drawing.Color.Red;
+ this.labelControl8.Appearance.Options.UseForeColor = true;
+ this.labelControl8.Location = new System.Drawing.Point(415, 234);
+ this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(8, 18);
+ this.labelControl8.TabIndex = 117;
+ this.labelControl8.Text = "*";
//
// txtParentMenuName
//
- this.txtParentMenuName.Location = new System.Drawing.Point(114, 11);
+ this.txtParentMenuName.EditValue = "鏃犲彲濂堜綍鑺辫惤鍘�";
+ this.txtParentMenuName.Location = new System.Drawing.Point(111, 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.Size = new System.Drawing.Size(297, 24);
this.txtParentMenuName.TabIndex = 116;
//
// treeListLookUpEdit1TreeList
//
+ this.treeListLookUpEdit1TreeList.KeyFieldName = "";
this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+ this.treeListLookUpEdit1TreeList.ParentFieldName = "";
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";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(707, 484);
+ this.tabPage1.Size = new System.Drawing.Size(650, 450);
this.tabPage1.TabIndex = 0;
- this.tabPage1.Text = "tabPage1";
+ this.tabPage1.Text = "鍩虹淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabControl1
@@ -316,26 +339,21 @@
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(715, 515);
+ this.tabControl1.Size = new System.Drawing.Size(658, 481);
this.tabControl1.TabIndex = 1;
- //
- // lbGuid
- //
- 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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(715, 515);
+ this.ClientSize = new System.Drawing.Size(658, 481);
this.Controls.Add(this.tabControl1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "SysMenuAdd";
- this.Text = "SysMenuAdd";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "鑿滃崟鍔熻兘";
+ this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.txtStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtIdx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtFormNamespace.Properties)).EndInit();
@@ -347,7 +365,6 @@
((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);
@@ -362,9 +379,7 @@
private DevExpress.XtraEditors.SimpleButton btnEsc;
private DevExpress.XtraEditors.SimpleButton btnSave;
private DevExpress.XtraEditors.LabelControl labelControl12;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.LabelControl labelControl9;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.LabelControl labelControl6;
private DevExpress.XtraEditors.MemoEdit txtFormNamespace;
private DevExpress.XtraEditors.LabelControl labelControl5;
@@ -380,5 +395,8 @@
private DevExpress.XtraEditors.TreeListLookUpEdit txtParentMenuName;
private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.LabelControl labelControl8;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
}
}
\ 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 078d88f..89e128c 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/SysMenuAdd.cs
@@ -1,14 +1,7 @@
锘縰sing DevExpress.XtraEditors;
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.ToolBox;
using Gs.DevApp.Models;
using DevExpress.XtraTreeList.Nodes;
@@ -21,8 +14,26 @@
InitializeComponent();
btnSave.Click += BtnSave_Click;
btnEsc.Click += BtnEsc_Click;
+ txtMenuType.TextChanged += TxtMenuType_TextChanged;
getTree();
lbGuid.Text = guid;
+ getModel();
+ }
+
+ private void TxtMenuType_TextChanged(object sender, EventArgs e)
+ {
+ if (txtMenuType.SelectedIndex == 1)
+ {
+ this.txtFormNamespace.Enabled = true;
+ this.txtMenuIco.Enabled = true;
+ }
+ else
+ {
+ this.txtFormNamespace.Enabled = false;
+ this.txtMenuIco.Enabled = false;
+ this.txtFormNamespace.Text = "";
+ this.txtMenuIco.Text = "";
+ }
}
private void BtnEsc_Click(object sender, EventArgs e)
@@ -32,6 +43,24 @@
private void BtnSave_Click(object sender, EventArgs e)
{
+ if (string.IsNullOrEmpty(txtMenuName.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鑿滃崟鍚嶇О涓嶈兘涓虹┖锛�");
+ txtMenuName.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtMenuType.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鑿滃崟绫诲瀷涓嶈兘涓虹┖锛�");
+ txtMenuType.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtStatus.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鑿滃崟鐘舵�佷笉鑳戒负绌猴紒");
+ txtStatus.Focus();
+ return;
+ }
string _upGuid = "";
TreeListNode focusedNode = txtParentMenuName.Properties.TreeList.FocusedNode;
if (focusedNode != null)
@@ -40,24 +69,26 @@
}
var _obj = new
{
- guid = "",//涓诲缓
+ guid = lbGuid.Text.Trim(),//涓诲缓
upGuid = _upGuid,//涓婄骇鐨勪富寤�
name = txtMenuName.Text.Trim(),//鍚嶇О
- serialNumber = "",//缂栧彿
icon = txtMenuIco.Text,//鑿滃崟鍥炬爣
status = txtStatus.SelectedIndex,//鐘舵��
- fromPath = txtFormNamespace.Text.Trim(),//绐椾綋璺緞
+ formPath = txtFormNamespace.Text.Trim(),//绐椾綋璺緞
idx = int.Parse(txtIdx.Value.ToString()),//鎺掑簭
category = txtMenuType.SelectedIndex,//绫诲瀷
};
- string json = JsonConvert.SerializeObject(_obj);
+ string strJson = "";
try
{
- UtilityHelper.HttpPost("", "MenuAction/EditModel", json);
+ strJson = UtilityHelper.HttpPost("", "MenuAction/EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0) { getTree(); }
}
catch (Exception ex)
{
- throw ex;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -68,7 +99,7 @@
string strReturn = "";
try
{
- strReturn =UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
+ strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
DataTable dt = dd.rtnData.list;
txtParentMenuName.Properties.DataSource = dt;
@@ -79,22 +110,39 @@
}
catch (Exception ex)
{
- throw ex;
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
- private void getModel() {
- //_AppDomain
- //string json = JsonConvert.SerializeObject(_obj);
- //try
- //{
- // Utility.HttpPost("", "MenuAction/GetModel", json);
- //}
- //catch (Exception ex)
- //{
- // throw ex;
- //}
+ private void getModel()
+ {
+ if (lbGuid.Text.Length <= 0) return;
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//涓诲缓
+ };
+ string strJson = "";
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "MenuAction/GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ txtMenuName.Text = _rtn.rtnData.name;
+ txtMenuIco.Text = _rtn.rtnData.icon;
+ txtFormNamespace.Text = _rtn.rtnData.formPath;
+ txtStatus.SelectedIndex = _rtn.rtnData.status;
+ txtMenuType.SelectedIndex = _rtn.rtnData.category;
+ txtIdx.Value = _rtn.rtnData.idx;
+ // txtParentMenuName.Text = "";
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4abd288..e88da5f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -184,6 +184,8 @@
<None Include="Resources\time2_16x16.png" />
<None Include="Resources\knowledgebasearticle_16x16.png" />
<None Include="Resources\edit_32x32.png" />
+ <None Include="Resources\checkbox2_32x321.png" />
+ <None Include="Resources\reviewingpane_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index fa40b5f..d2507dc 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -173,6 +173,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap checkbox2_32x321 {
+ get {
+ object obj = ResourceManager.GetObject("checkbox2_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap convert_16x16 {
get {
object obj = ResourceManager.GetObject("convert_16x16", resourceCulture);
@@ -413,6 +423,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap reviewingpane_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("reviewingpane_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap show_16x16 {
get {
object obj = ResourceManager.GetObject("show_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 8fad381..07ef021 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,6 +124,9 @@
<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="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<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>
@@ -141,9 +144,6 @@
</data>
<data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -169,11 +169,17 @@
<data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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="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="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>
@@ -199,8 +205,8 @@
<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="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 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>
<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>
@@ -250,7 +256,7 @@
<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="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 name="reviewingpane_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reviewingpane_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/UserControl/ToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
index d60081a..2213bb1 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.Designer.cs
@@ -43,7 +43,7 @@
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.btnLoad = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem8 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem9 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem10 = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -106,7 +106,7 @@
this.btnView,
this.barButtonItem1,
this.barLargeButtonItem6,
- this.barLargeButtonItem7,
+ this.btnLoad,
this.barButtonItem2,
this.barLargeButtonItem8,
this.barLargeButtonItem9,
@@ -127,7 +127,7 @@
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.btnLoad),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem8),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem9),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem10)});
@@ -183,13 +183,13 @@
this.barLargeButtonItem6.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.renamedatasource_32x32;
this.barLargeButtonItem6.Name = "barLargeButtonItem6";
//
- // barLargeButtonItem7
+ // btnLoad
//
- this.barLargeButtonItem7.Caption = "鍒锋柊";
- this.barLargeButtonItem7.Id = 10;
- this.barLargeButtonItem7.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x16;
- this.barLargeButtonItem7.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.convert_32x32;
- this.barLargeButtonItem7.Name = "barLargeButtonItem7";
+ this.btnLoad.Caption = "鍒锋柊";
+ this.btnLoad.Id = 10;
+ this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x16;
+ this.btnLoad.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.convert_32x32;
+ this.btnLoad.Name = "btnLoad";
//
// barLargeButtonItem8
//
@@ -283,7 +283,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnSave;
private DevExpress.XtraBars.BarLargeButtonItem btnView;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem6;
- private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem7;
+ private DevExpress.XtraBars.BarLargeButtonItem btnLoad;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem8;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem9;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem10;
diff --git a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
index 2b04aae..110a51d 100644
--- a/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
@@ -21,12 +21,27 @@
/// </summary>
public event EventHandler btnEdtClick;
+ /// <summary>
+ /// 鍒锋柊
+ /// </summary>
+ public event EventHandler btnLoadClick;
+
+
public ToolBarMenu()
{
InitializeComponent();
this.btnAdd.ItemClick += BtnAdd_ItemClick;
this.btnDel.ItemClick += BtnDel_ItemClick;
this.btnEdit.ItemClick += BtnEdit_ItemClick;
+ this.btnLoad.ItemClick += BtnLoad_ItemClick;
+ }
+
+ private void BtnLoad_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if (btnLoadClick != null)
+ {
+ btnLoadClick(this, e);
+ }
}
private void BtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
diff --git a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2 b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
index 280ff2e..3b30e0e 100644
--- a/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
+++ b/WebApi/.vs/GsMesSolution/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
index 189dc5d..93e5d24 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.json
@@ -3,8 +3,8 @@
"WorkspaceRootPath": "D:\\GsMesV2\\WebApi\\",
"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}"
+ "AbsoluteMoniker": "D:0:0:{C77F6A1D-0CEA-40DE-9B03-C59B581531E8}|Gs.User\\Gs.User.csproj|d:\\gsmesv2\\webapi\\gs.user\\service\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C77F6A1D-0CEA-40DE-9B03-C59B581531E8}|Gs.User\\Gs.User.csproj|solutionrelative:gs.user\\service\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -31,14 +31,14 @@
{
"$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",
+ "Title": "OrganizationController.cs",
+ "DocumentMoniker": "D:\\GsMesV2\\WebApi\\Gs.User\\Service\\OrganizationController.cs",
+ "RelativeDocumentMoniker": "Gs.User\\Service\\OrganizationController.cs",
+ "ToolTip": "D:\\GsMesV2\\WebApi\\Gs.User\\Service\\OrganizationController.cs",
+ "RelativeToolTip": "Gs.User\\Service\\OrganizationController.cs",
+ "ViewState": "AQIAABcAAAAAAAAAAAAYwB0AAAArAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-27T14:27:24.014Z",
+ "WhenOpened": "2024-08-28T00:45:55.543Z",
"EditorCaption": ""
}
]
diff --git a/WebApi/Gs.User/Service/MenuActionController.cs b/WebApi/Gs.User/Service/MenuActionController.cs
index 42f57ab..111766a 100644
--- a/WebApi/Gs.User/Service/MenuActionController.cs
+++ b/WebApi/Gs.User/Service/MenuActionController.cs
@@ -66,12 +66,13 @@
guid = Guid.Parse(dr["guid"].ToString()),
upGuid = dr["upGuid"].ToString().Length > 0 ? Guid.Parse(dr["upGuid"].ToString()) : null,
name = dr["name"].ToString(),
- serialNumber = dr["serialNumber"].ToString(),
icon = dr["icon"].ToString(),
status = int.Parse(dr["status"].ToString()),
- fromPath = dr["fromPath"].ToString(),
+ formPath = dr["formPath"].ToString(),
idx = int.Parse(dr["idx"].ToString()),
category = int.Parse(dr["category"].ToString()),
+ statusTxt = (dr["status"].ToString() == "1" ? "姝ｅ父" : "绂佺敤"),
+ categoryTxt = (dr["category"].ToString() == "1" ? "绐椾綋绫诲瀷" : "鎸夐挳绫诲瀷"),
}
);
}
@@ -89,8 +90,22 @@
public ReturnDto<int?> DeleteModel([FromBody] MenuAction model)
{
int rtnInt = (int)ReturnCode.Default;
+ int cont = 0;
try
{
+ //鏄惁鍐呯疆
+ cont = int.Parse(DbHelperSQL.GetSingle("select count(1) from sys_MenuAction where guid='" + model.guid.ToString() + "' and [isSys]=1").ToString());
+ if (cont > 0)
+ {
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鍒犻櫎澶辫触锛岃鏉＄洰涓虹郴缁熷唴缃紝涓嶅彲鍒犻櫎锛�");
+ }
+ cont = 0;
+ //鏄惁鏈夊瓙鑿滃崟
+ cont = int.Parse(DbHelperSQL.GetSingle("select count(1) from sys_MenuAction where upguid='" + model.guid.ToString() + "'").ToString());
+ if (cont > 0)
+ {
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鍒犻櫎澶辫触锛岃鏉＄洰涓嬮潰鏈夊瓙鑿滃崟锛屼笉鍙垹闄わ紒");
+ }
rtnInt = DbHelperSQL.ExecuteSql("delete from dbo.sys_MenuAction where guid='" + model.guid.ToString() + "'");
}
catch (Exception ex)
@@ -112,14 +127,13 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<int?> EditModel([FromBody] MenuAction model)
{
- string dddd= model.guid.ToString();
+ string dddd = model.guid.ToString();
Guid? guid = model.guid;
Guid? upGuid = model.upGuid;
string name = model.name;
- string serialNumber = model.serialNumber;
string icon = model.icon;
int status = model.status;
- string fromPath = model.fromPath;
+ string formPath = model.formPath;
int category = model.category;
int idx = model.idx;
int? rtnInt = (int)ReturnCode.Default;
@@ -127,24 +141,23 @@
if (guid != null)
{
strSql.Append(" update dbo.sys_MenuAction");
- strSql.Append(" set upGuid=@upGuid,name=@name,serialNumber=@serialNumber,icon=@icon,status=@status,fromPath=@fromPath,category=@category,idx=@idx");
+ strSql.Append(" set upGuid=@upGuid,name=@name,icon=@icon,status=@status,formPath=@formPath,category=@category,idx=@idx");
strSql.Append(" where guid='" + guid + "'");
}
else
{
guid = Guid.NewGuid();
strSql.Append("insert into dbo.sys_MenuAction(");
- strSql.Append(" guid,upGuid,name,serialNumber,icon,status,fromPath,category,idx)");
+ strSql.Append(" guid,upGuid,name,icon,status,formPath,category,idx)");
strSql.Append(" values (");
- strSql.Append("'" + guid + "',@upGuid,@name,@serialNumber,@icon,@status,@fromPath,@category,@idx)");
+ strSql.Append("'" + guid + "',@upGuid,@name,@icon,@status,@formPath,@category,@idx)");
}
SqlParameter[] parameters = {
new SqlParameter("@upGuid", upGuid),
new SqlParameter("@name", name),
- new SqlParameter("@serialNumber",serialNumber),
new SqlParameter("@icon",icon),
new SqlParameter("@status",status),
- new SqlParameter("@fromPath",fromPath),
+ new SqlParameter("@formPath",formPath),
new SqlParameter("@category",category),
new SqlParameter("@idx",idx),
};
@@ -158,7 +171,7 @@
rtnInt = (int)ReturnCode.Exception;
}
if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, "澧炲姞鎴愬姛锛�");
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
else
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, "澧炲姞澶辫触锛岃閲嶈瘯锛�");
}
@@ -170,7 +183,7 @@
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
[AllowAnonymous]
- public ReturnDto<MenuAction> GetModel([FromBody] MenuAction model )
+ public ReturnDto<MenuAction> GetModel([FromBody] MenuAction model)
{
MenuAction m = new MenuAction();
System.Text.StringBuilder sbSql = new StringBuilder();
@@ -185,10 +198,9 @@
m.guid = Guid.Parse(dr["guid"].ToString());
m.upGuid = dr["upGuid"].ToString().Length > 0 ? Guid.Parse(dr["upGuid"].ToString()) : null;
m.name = dr["name"].ToString();
- m.serialNumber = dr["serialNumber"].ToString();
m.icon = dr["icon"].ToString();
m.status = int.Parse(dr["status"].ToString());
- m.fromPath = dr["fromPath"].ToString();
+ m.formPath = dr["formPath"].ToString();
m.idx = int.Parse(dr["idx"].ToString());
m.category = int.Parse(dr["category"].ToString());
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
diff --git a/WebApi/Gs.User/Service/UserController.cs b/WebApi/Gs.User/Service/UserController.cs
index 895fd7f..fb4117d 100644
--- a/WebApi/Gs.User/Service/UserController.cs
+++ b/WebApi/Gs.User/Service/UserController.cs
@@ -119,7 +119,7 @@
upGuid = dr["upGuid"].ToString().Length > 0 ? Guid.Parse(dr["upGuid"].ToString()) : null,
name = dr["name"].ToString(),
icon = dr["icon"].ToString(),
- fromPath = dr["fromPath"].ToString(),
+ formPath = dr["formPath"].ToString(),
category = int.Parse(dr["category"].ToString()),
}
);
--
Gitblit v1.9.3