SVN r869
SVN-Revision: r869
This commit is contained in:
wyf
+6
-42
@@ -31,7 +31,6 @@ namespace Lskj.Main.Control
|
||||
{
|
||||
this.topTipsPanel = new System.Windows.Forms.Panel();
|
||||
this.tipsLab = new System.Windows.Forms.Label();
|
||||
this.splitLab = new System.Windows.Forms.Label();
|
||||
this.whiteLab = new System.Windows.Forms.Label();
|
||||
this.menuMainPanel = new System.Windows.Forms.Panel();
|
||||
this.topTipsPanel.SuspendLayout();
|
||||
@@ -41,7 +40,6 @@ namespace Lskj.Main.Control
|
||||
//
|
||||
this.topTipsPanel.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.topTipsPanel.Controls.Add(this.tipsLab);
|
||||
this.topTipsPanel.Controls.Add(this.splitLab);
|
||||
this.topTipsPanel.Controls.Add(this.whiteLab);
|
||||
this.topTipsPanel.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.topTipsPanel.Location = new System.Drawing.Point(0, 0);
|
||||
@@ -51,29 +49,19 @@ namespace Lskj.Main.Control
|
||||
//
|
||||
// tipsLab
|
||||
//
|
||||
this.tipsLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.tipsLab.BackColor = System.Drawing.Color.White;
|
||||
this.tipsLab.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tipsLab.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.tipsLab.Location = new System.Drawing.Point(20, 0);
|
||||
this.tipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.tipsLab.Location = new System.Drawing.Point(10, 0);
|
||||
this.tipsLab.Name = "tipsLab";
|
||||
this.tipsLab.Size = new System.Drawing.Size(737, 26);
|
||||
this.tipsLab.Size = new System.Drawing.Size(747, 26);
|
||||
this.tipsLab.TabIndex = 3;
|
||||
this.tipsLab.Text = "默认分组";
|
||||
this.tipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// splitLab
|
||||
//
|
||||
this.splitLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.splitLab.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.splitLab.Image = global::Lskj.Main.Properties.Resources.workSplit;
|
||||
this.splitLab.Location = new System.Drawing.Point(10, 0);
|
||||
this.splitLab.Name = "splitLab";
|
||||
this.splitLab.Size = new System.Drawing.Size(10, 26);
|
||||
this.splitLab.TabIndex = 2;
|
||||
//
|
||||
// whiteLab
|
||||
//
|
||||
this.whiteLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.whiteLab.BackColor = System.Drawing.Color.White;
|
||||
this.whiteLab.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.whiteLab.Location = new System.Drawing.Point(0, 0);
|
||||
this.whiteLab.Name = "whiteLab";
|
||||
@@ -83,28 +71,4 @@ namespace Lskj.Main.Control
|
||||
// menuMainPanel
|
||||
//
|
||||
this.menuMainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.menuMainPanel.Location = new System.Drawing.Point(0, 26);
|
||||
this.menuMainPanel.Name = "menuMainPanel";
|
||||
this.menuMainPanel.Size = new System.Drawing.Size(757, 297);
|
||||
this.menuMainPanel.TabIndex = 4;
|
||||
//
|
||||
// GroupControl
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.Controls.Add(this.menuMainPanel);
|
||||
this.Controls.Add(this.topTipsPanel);
|
||||
this.Name = "GroupControl";
|
||||
this.Size = new System.Drawing.Size(757, 323);
|
||||
this.topTipsPanel.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
private System.Windows.Forms.Panel topTipsPanel;
|
||||
private System.Windows.Forms.Label splitLab;
|
||||
private System.Windows.Forms.Label whiteLab;
|
||||
private System.Windows.Forms.Label tipsLab;
|
||||
private System.Windows.Forms.Panel menuMainPanel;
|
||||
}
|
||||
}
|
||||
this.menuMainPanel.Location = new System
|
||||
Binary file not shown.
+200
@@ -0,0 +1,200 @@
|
||||
|
||||
namespace Lskj.Main.Control
|
||||
{
|
||||
partial class GroupPage
|
||||
{
|
||||
/// <summary>
|
||||
/// 必需的设计器变量。
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// 清理所有正在使用的资源。
|
||||
/// </summary>
|
||||
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region 组件设计器生成的代码
|
||||
|
||||
/// <summary>
|
||||
/// 设计器支持所需的方法 - 不要修改
|
||||
/// 使用代码编辑器修改此方法的内容。
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.allPanel = new System.Windows.Forms.Panel();
|
||||
this.allMenuPanel = new System.Windows.Forms.Panel();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.allTipsLab = new System.Windows.Forms.Label();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.panelSplit = new System.Windows.Forms.Panel();
|
||||
this.labelSplit = new System.Windows.Forms.Label();
|
||||
this.labelSplitTop = new System.Windows.Forms.Label();
|
||||
this.topTipsPanel = new System.Windows.Forms.Panel();
|
||||
this.whiteLab = new System.Windows.Forms.Label();
|
||||
this.collectTipsLab = new System.Windows.Forms.Label();
|
||||
this.collectMenuPanel = new System.Windows.Forms.Panel();
|
||||
this.collectPanel = new System.Windows.Forms.Panel();
|
||||
this.allPanel.SuspendLayout();
|
||||
this.panel2.SuspendLayout();
|
||||
this.panelSplit.SuspendLayout();
|
||||
this.topTipsPanel.SuspendLayout();
|
||||
this.collectPanel.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// allPanel
|
||||
//
|
||||
this.allPanel.Controls.Add(this.allMenuPanel);
|
||||
this.allPanel.Controls.Add(this.panel2);
|
||||
this.allPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allPanel.Location = new System.Drawing.Point(0, 227);
|
||||
this.allPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.allPanel.Name = "allPanel";
|
||||
this.allPanel.Size = new System.Drawing.Size(803, 349);
|
||||
this.allPanel.TabIndex = 6;
|
||||
//
|
||||
// allMenuPanel
|
||||
//
|
||||
this.allMenuPanel.BackColor = System.Drawing.Color.Transparent;
|
||||
this.allMenuPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allMenuPanel.Location = new System.Drawing.Point(0, 26);
|
||||
this.allMenuPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.allMenuPanel.Name = "allMenuPanel";
|
||||
this.allMenuPanel.Size = new System.Drawing.Size(803, 323);
|
||||
this.allMenuPanel.TabIndex = 6;
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.panel2.Controls.Add(this.allTipsLab);
|
||||
this.panel2.Controls.Add(this.label3);
|
||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panel2.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(803, 26);
|
||||
this.panel2.TabIndex = 5;
|
||||
//
|
||||
// allTipsLab
|
||||
//
|
||||
this.allTipsLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.allTipsLab.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.allTipsLab.Location = new System.Drawing.Point(8, 0);
|
||||
this.allTipsLab.Name = "allTipsLab";
|
||||
this.allTipsLab.Size = new System.Drawing.Size(795, 26);
|
||||
this.allTipsLab.TabIndex = 3;
|
||||
this.allTipsLab.Text = "全部应用";
|
||||
this.allTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.BackColor = System.Drawing.Color.Transparent;
|
||||
this.label3.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.label3.Location = new System.Drawing.Point(0, 0);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(8, 26);
|
||||
this.label3.TabIndex = 1;
|
||||
//
|
||||
// panelSplit
|
||||
//
|
||||
this.panelSplit.Controls.Add(this.labelSplit);
|
||||
this.panelSplit.Controls.Add(this.labelSplitTop);
|
||||
this.panelSplit.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panelSplit.Location = new System.Drawing.Point(0, 220);
|
||||
this.panelSplit.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelSplit.Name = "panelSplit";
|
||||
this.panelSplit.Padding = new System.Windows.Forms.Padding(13, 0, 13, 0);
|
||||
this.panelSplit.Size = new System.Drawing.Size(803, 7);
|
||||
this.panelSplit.TabIndex = 0;
|
||||
//
|
||||
// labelSplit
|
||||
//
|
||||
this.labelSplit.BackColor = System.Drawing.Color.Black;
|
||||
this.labelSplit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.labelSplit.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.labelSplit.ForeColor = System.Drawing.Color.Black;
|
||||
this.labelSplit.Location = new System.Drawing.Point(13, 3);
|
||||
this.labelSplit.Name = "labelSplit";
|
||||
this.labelSplit.Size = new System.Drawing.Size(777, 1);
|
||||
this.labelSplit.TabIndex = 0;
|
||||
//
|
||||
// labelSplitTop
|
||||
//
|
||||
this.labelSplitTop.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.labelSplitTop.Location = new System.Drawing.Point(13, 0);
|
||||
this.labelSplitTop.Name = "labelSplitTop";
|
||||
this.labelSplitTop.Size = new System.Drawing.Size(777, 3);
|
||||
this.labelSplitTop.TabIndex = 1;
|
||||
//
|
||||
// topTipsPanel
|
||||
//
|
||||
this.topTipsPanel.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.topTipsPanel.Controls.Add(this.collectTipsLab);
|
||||
this.topTipsPanel.Controls.Add(this.whiteLab);
|
||||
this.topTipsPanel.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.topTipsPanel.Location = new System.Drawing.Point(0, 0);
|
||||
this.topTipsPanel.Name = "topTipsPanel";
|
||||
this.topTipsPanel.Size = new System.Drawing.Size(803, 26);
|
||||
this.topTipsPanel.TabIndex = 5;
|
||||
//
|
||||
// whiteLab
|
||||
//
|
||||
this.whiteLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.whiteLab.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.whiteLab.Location = new System.Drawing.Point(0, 0);
|
||||
this.whiteLab.Name = "whiteLab";
|
||||
this.whiteLab.Size = new System.Drawing.Size(8, 26);
|
||||
this.whiteLab.TabIndex = 1;
|
||||
//
|
||||
// collectTipsLab
|
||||
//
|
||||
this.collectTipsLab.BackColor = System.Drawing.Color.Transparent;
|
||||
this.collectTipsLab.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.collectTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.collectTipsLab.Location = new System.Drawing.Point(8, 0);
|
||||
this.collectTipsLab.Name = "collectTipsLab";
|
||||
this.collectTipsLab.Size = new System.Drawing.Size(795, 26);
|
||||
this.collectTipsLab.TabIndex = 3;
|
||||
this.collectTipsLab.Text = "我的收藏";
|
||||
this.collectTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// collectMenuPanel
|
||||
//
|
||||
this.collectMenuPanel.BackColor = System.Drawing.Color.Transparent;
|
||||
this.collectMenuPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.collectMenuPanel.Location = new System.Drawing.Point(0, 26);
|
||||
this.collectMenuPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.collectMenuPanel.Name = "collectMenuPanel";
|
||||
this.collectMenuPanel.Size = new System.Drawing.Size(803, 194);
|
||||
this.collectMenuPanel.TabIndex = 6;
|
||||
//
|
||||
// collectPanel
|
||||
//
|
||||
this.collectPanel.Controls.Add(this.collectMenuPanel);
|
||||
this.collectPanel.Controls.Add(this.topTipsPanel);
|
||||
this.collectPanel.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.collectPanel.Location = new System.Drawing.Point(0, 0);
|
||||
this.collectPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.collectPanel.Name = "collectPanel";
|
||||
this.collectPanel.Size = new System.Drawing.Size(803, 220);
|
||||
this.collectPanel.TabIndex = 5;
|
||||
//
|
||||
// GroupPage
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.Color.Transparent;
|
||||
this.Controls.Add(this.allPanel);
|
||||
this.Controls.Add(this.panelSplit);
|
||||
this.Controls.Add(this.collectPanel);
|
||||
this.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.Name = "GroupPage";
|
||||
this.Size = new System.Drawing.Size(803, 576);
|
||||
this.allPanel.ResumeLayout(fals
|
||||
Binary file not shown.
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
+193
-15
@@ -28,6 +28,7 @@
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainPanelControlEx));
|
||||
this.tslCompany = new System.Windows.Forms.ToolStripLabel();
|
||||
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
|
||||
@@ -49,6 +50,20 @@
|
||||
this.pl_center_main = new System.Windows.Forms.Panel();
|
||||
this.splitMainControl = new System.Windows.Forms.SplitContainer();
|
||||
this.pl_center_main_middle = new System.Windows.Forms.Panel();
|
||||
this.allPanel = new System.Windows.Forms.Panel();
|
||||
this.allMenuPanel = new System.Windows.Forms.Panel();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.allTipsLab = new System.Windows.Forms.Label();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.panelSplit = new System.Windows.Forms.Panel();
|
||||
this.labelSplit = new System.Windows.Forms.Label();
|
||||
this.labelSplitTop = new System.Windows.Forms.Label();
|
||||
this.collectPanel = new System.Windows.Forms.Panel();
|
||||
this.collectMenuPanel = new System.Windows.Forms.Panel();
|
||||
this.topTipsPanel = new System.Windows.Forms.Panel();
|
||||
this.collectTipsLab = new System.Windows.Forms.Label();
|
||||
this.whiteLab = new System.Windows.Forms.Label();
|
||||
this.pl_center_main_middle_FlowLayout = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.panel5 = new System.Windows.Forms.Panel();
|
||||
this.pl_center_main_right_container = new System.Windows.Forms.Panel();
|
||||
this.plRightLine = new System.Windows.Forms.Panel();
|
||||
@@ -98,10 +113,9 @@
|
||||
this.btnClose = new System.Windows.Forms.Button();
|
||||
this.pl_top_left = new System.Windows.Forms.Panel();
|
||||
this.lblSubTitle = new System.Windows.Forms.Label();
|
||||
this.mark_timer = new System.Windows.Forms.Timer();
|
||||
this.mark_timer = new System.Windows.Forms.Timer(this.components);
|
||||
this.autoGridLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
|
||||
this.awaitScreenControl = new Lskj.Main.Control.AwaitScreenControl();
|
||||
this.pl_center_main_middle_FlowLayout = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.toolStrip1.SuspendLayout();
|
||||
this.pl_center.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit();
|
||||
@@ -113,6 +127,12 @@
|
||||
this.splitMainControl.Panel1.SuspendLayout();
|
||||
this.splitMainControl.Panel2.SuspendLayout();
|
||||
this.splitMainControl.SuspendLayout();
|
||||
this.pl_center_main_middle.SuspendLayout();
|
||||
this.allPanel.SuspendLayout();
|
||||
this.panel2.SuspendLayout();
|
||||
this.panelSplit.SuspendLayout();
|
||||
this.collectPanel.SuspendLayout();
|
||||
this.topTipsPanel.SuspendLayout();
|
||||
this.panel5.SuspendLayout();
|
||||
this.pl_center_main_right_container.SuspendLayout();
|
||||
this.pl_center_main_right.SuspendLayout();
|
||||
@@ -311,8 +331,8 @@
|
||||
//
|
||||
// splitMainControl.Panel1
|
||||
//
|
||||
this.splitMainControl.Panel1.Controls.Add(this.pl_center_main_middle_FlowLayout);
|
||||
this.splitMainControl.Panel1.Controls.Add(this.pl_center_main_middle);
|
||||
this.splitMainControl.Panel1.Controls.Add(this.pl_center_main_middle_FlowLayout);
|
||||
//
|
||||
// splitMainControl.Panel2
|
||||
//
|
||||
@@ -325,12 +345,164 @@
|
||||
//
|
||||
this.pl_center_main_middle.AutoScroll = true;
|
||||
this.pl_center_main_middle.BackColor = System.Drawing.Color.White;
|
||||
this.pl_center_main_middle.Controls.Add(this.allPanel);
|
||||
this.pl_center_main_middle.Controls.Add(this.panelSplit);
|
||||
this.pl_center_main_middle.Controls.Add(this.collectPanel);
|
||||
this.pl_center_main_middle.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.pl_center_main_middle.Location = new System.Drawing.Point(0, 0);
|
||||
this.pl_center_main_middle.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.pl_center_main_middle.Name = "pl_center_main_middle";
|
||||
this.pl_center_main_middle.Size = new System.Drawing.Size(896, 584);
|
||||
this.pl_center_main_middle.TabIndex = 1;
|
||||
//
|
||||
// allPanel
|
||||
//
|
||||
this.allPanel.Controls.Add(this.allMenuPanel);
|
||||
this.allPanel.Controls.Add(this.panel2);
|
||||
this.allPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allPanel.Location = new System.Drawing.Point(0, 227);
|
||||
this.allPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.allPanel.Name = "allPanel";
|
||||
this.allPanel.Size = new System.Drawing.Size(896, 357);
|
||||
this.allPanel.TabIndex = 9;
|
||||
//
|
||||
// allMenuPanel
|
||||
//
|
||||
this.allMenuPanel.BackColor = System.Drawing.Color.Transparent;
|
||||
this.allMenuPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allMenuPanel.Location = new System.Drawing.Point(0, 26);
|
||||
this.allMenuPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.allMenuPanel.Name = "allMenuPanel";
|
||||
this.allMenuPanel.Size = new System.Drawing.Size(896, 331);
|
||||
this.allMenuPanel.TabIndex = 6;
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.panel2.Controls.Add(this.allTipsLab);
|
||||
this.panel2.Controls.Add(this.label4);
|
||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panel2.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(896, 26);
|
||||
this.panel2.TabIndex = 5;
|
||||
//
|
||||
// allTipsLab
|
||||
//
|
||||
this.allTipsLab.BackColor = System.Drawing.Color.White;
|
||||
this.allTipsLab.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.allTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.allTipsLab.Location = new System.Drawing.Point(8, 0);
|
||||
this.allTipsLab.Name = "allTipsLab";
|
||||
this.allTipsLab.Size = new System.Drawing.Size(888, 26);
|
||||
this.allTipsLab.TabIndex = 3;
|
||||
this.allTipsLab.Text = "全部应用";
|
||||
this.allTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
this.label4.BackColor = System.Drawing.Color.White;
|
||||
this.label4.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.label4.Location = new System.Drawing.Point(0, 0);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(8, 26);
|
||||
this.label4.TabIndex = 1;
|
||||
//
|
||||
// panelSplit
|
||||
//
|
||||
this.panelSplit.Controls.Add(this.labelSplit);
|
||||
this.panelSplit.Controls.Add(this.labelSplitTop);
|
||||
this.panelSplit.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.panelSplit.Location = new System.Drawing.Point(0, 220);
|
||||
this.panelSplit.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelSplit.Name = "panelSplit";
|
||||
this.panelSplit.Padding = new System.Windows.Forms.Padding(13, 0, 13, 0);
|
||||
this.panelSplit.Size = new System.Drawing.Size(896, 7);
|
||||
this.panelSplit.TabIndex = 7;
|
||||
//
|
||||
// labelSplit
|
||||
//
|
||||
this.labelSplit.BackColor = System.Drawing.Color.Black;
|
||||
this.labelSplit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.labelSplit.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.labelSplit.ForeColor = System.Drawing.Color.Black;
|
||||
this.labelSplit.Location = new System.Drawing.Point(13, 3);
|
||||
this.labelSplit.Name = "labelSplit";
|
||||
this.labelSplit.Size = new System.Drawing.Size(870, 1);
|
||||
this.labelSplit.TabIndex = 0;
|
||||
//
|
||||
// labelSplitTop
|
||||
//
|
||||
this.labelSplitTop.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.labelSplitTop.Location = new System.Drawing.Point(13, 0);
|
||||
this.labelSplitTop.Name = "labelSplitTop";
|
||||
this.labelSplitTop.Size = new System.Drawing.Size(870, 3);
|
||||
this.labelSplitTop.TabIndex = 1;
|
||||
//
|
||||
// collectPanel
|
||||
//
|
||||
this.collectPanel.Controls.Add(this.collectMenuPanel);
|
||||
this.collectPanel.Controls.Add(this.topTipsPanel);
|
||||
this.collectPanel.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.collectPanel.Location = new System.Drawing.Point(0, 0);
|
||||
this.collectPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.collectPanel.Name = "collectPanel";
|
||||
this.collectPanel.Size = new System.Drawing.Size(896, 220);
|
||||
this.collectPanel.TabIndex = 8;
|
||||
//
|
||||
// collectMenuPanel
|
||||
//
|
||||
this.collectMenuPanel.BackColor = System.Drawing.Color.Transparent;
|
||||
this.collectMenuPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.collectMenuPanel.Location = new System.Drawing.Point(0, 26);
|
||||
this.collectMenuPanel.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.collectMenuPanel.Name = "collectMenuPanel";
|
||||
this.collectMenuPanel.Size = new System.Drawing.Size(896, 194);
|
||||
this.collectMenuPanel.TabIndex = 6;
|
||||
//
|
||||
// topTipsPanel
|
||||
//
|
||||
this.topTipsPanel.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.topTipsPanel.Controls.Add(this.collectTipsLab);
|
||||
this.topTipsPanel.Controls.Add(this.whiteLab);
|
||||
this.topTipsPanel.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.topTipsPanel.Location = new System.Drawing.Point(0, 0);
|
||||
this.topTipsPanel.Name = "topTipsPanel";
|
||||
this.topTipsPanel.Size = new System.Drawing.Size(896, 26);
|
||||
this.topTipsPanel.TabIndex = 5;
|
||||
//
|
||||
// collectTipsLab
|
||||
//
|
||||
this.collectTipsLab.BackColor = System.Drawing.Color.White;
|
||||
this.collectTipsLab.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.collectTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.collectTipsLab.Location = new System.Drawing.Point(8, 0);
|
||||
this.collectTipsLab.Name = "collectTipsLab";
|
||||
this.collectTipsLab.Size = new System.Drawing.Size(888, 26);
|
||||
this.collectTipsLab.TabIndex = 3;
|
||||
this.collectTipsLab.Text = "我的收藏";
|
||||
this.collectTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// whiteLab
|
||||
//
|
||||
this.whiteLab.BackColor = System.Drawing.Color.White;
|
||||
this.whiteLab.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.whiteLab.Location = new System.Drawing.Point(0, 0);
|
||||
this.whiteLab.Name = "whiteLab";
|
||||
this.whiteLab.Size = new System.Drawing.Size(8, 26);
|
||||
this.whiteLab.TabIndex = 1;
|
||||
//
|
||||
// pl_center_main_middle_FlowLayout
|
||||
//
|
||||
this.pl_center_main_middle_FlowLayout.AutoScroll = true;
|
||||
this.pl_center_main_middle_FlowLayout.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.pl_center_main_middle_FlowLayout.Location = new System.Drawing.Point(0, 0);
|
||||
this.pl_center_main_middle_FlowLayout.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.pl_center_main_middle_FlowLayout.Name = "pl_center_main_middle_FlowLayout";
|
||||
this.pl_center_main_middle_FlowLayout.Size = new System.Drawing.Size(896, 584);
|
||||
this.pl_center_main_middle_FlowLayout.TabIndex = 2;
|
||||
this.pl_center_main_middle_FlowLayout.Visible = false;
|
||||
//
|
||||
// panel5
|
||||
//
|
||||
this.panel5.Controls.Add(this.pl_center_main_right_container);
|
||||
@@ -980,17 +1152,6 @@
|
||||
this.awaitScreenControl.TabIndex = 0;
|
||||
this.awaitScreenControl.Visible = false;
|
||||
//
|
||||
// pl_center_main_middle_FlowLayout
|
||||
//
|
||||
this.pl_center_main_middle_FlowLayout.AutoScroll = true;
|
||||
this.pl_center_main_middle_FlowLayout.BackColor = System.Drawing.Color.Transparent;
|
||||
this.pl_center_main_middle_FlowLayout.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.pl_center_main_middle_FlowLayout.Location = new System.Drawing.Point(0, 0);
|
||||
this.pl_center_main_middle_FlowLayout.Name = "pl_center_main_middle_FlowLayout";
|
||||
this.pl_center_main_middle_FlowLayout.Size = new System.Drawing.Size(896, 584);
|
||||
this.pl_center_main_middle_FlowLayout.TabIndex = 2;
|
||||
this.pl_center_main_middle_FlowLayout.Visible = false;
|
||||
//
|
||||
// MainPanelControlEx
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1010,6 +1171,12 @@
|
||||
this.splitMainControl.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitMainControl)).EndInit();
|
||||
this.splitMainControl.ResumeLayout(false);
|
||||
this.pl_center_main_middle.ResumeLayout(false);
|
||||
this.allPanel.ResumeLayout(false);
|
||||
this.panel2.ResumeLayout(false);
|
||||
this.panelSplit.ResumeLayout(false);
|
||||
this.collectPanel.ResumeLayout(false);
|
||||
this.topTipsPanel.ResumeLayout(false);
|
||||
this.panel5.ResumeLayout(false);
|
||||
this.pl_center_main_right_container.ResumeLayout(false);
|
||||
this.pl_center_main_right.ResumeLayout(false);
|
||||
@@ -1098,4 +1265,15 @@
|
||||
private System.Windows.Forms.Panel pl_center_main;
|
||||
private System.Windows.Forms.SplitContainer splitMainControl;
|
||||
private System.Windows.Forms.Panel pl_center_main_middle;
|
||||
privat
|
||||
private System.Windows.Forms.Panel panel5;
|
||||
private System.Windows.Forms.Panel pl_center_main_right_container;
|
||||
private System.Windows.Forms.Panel plRightLine;
|
||||
private System.Windows.Forms.Panel pl_center_main_right;
|
||||
private System.Windows.Forms.Panel pl_center_main_bottom_right;
|
||||
private System.Windows.Forms.Panel pl_center_main_bottom_left_main;
|
||||
private System.Windows.Forms.Label lblReportcutset;
|
||||
private System.Windows.Forms.Panel pl_center_main_bottom_left;
|
||||
private System.Windows.Forms.Panel pl_center_main_bottom_right_main;
|
||||
private System.Windows.Forms.Panel panel6;
|
||||
private System.Windows.Forms.Label lblShortcutset;
|
||||
private System.Wi
|
||||
@@ -509,7 +509,7 @@ namespace Lskj.Main.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
if (SystemInfo.Instance.AccountSwitchingRestrictions>0&& SystemInfo.Instance.AccountSwitchingRestrictions<int.Parse(ERPInfo.Instance.UserId))
|
||||
if (SystemInfo.Instance.AccountSwitchingRestrictions > 0 && SystemInfo.Instance.AccountSwitchingRestrictions < int.Parse(ERPInfo.Instance.UserId))
|
||||
{
|
||||
this.button4.Visible = false;
|
||||
this.label1.Visible = false;
|
||||
@@ -647,6 +647,9 @@ namespace Lskj.Main.Control
|
||||
/// </summary>
|
||||
private void SetMenus()
|
||||
{
|
||||
DataTable gallerys = MainImpl.GetGallerysByUserId();
|
||||
var baseTable = gallerys.Select("grouptagid=1");
|
||||
var reportTable = gallerys.Select("grouptagid=2");
|
||||
DataRow[] subrows = MainImpl.GetSubSystems().Select(string.Format("SubSysId={0}", ERPInfo.Instance.SubSysId));
|
||||
if (subrows.Length > 0 && "False".Equals(subrows[0]["UseEd"] + ""))
|
||||
{
|
||||
@@ -671,8 +674,94 @@ namespace Lskj.Main.Control
|
||||
{
|
||||
pl_center_left.Width = SystemInfo.Instance.MenuBarWidth;
|
||||
}
|
||||
|
||||
|
||||
if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
|
||||
{
|
||||
//添加我的收藏快捷菜单
|
||||
GroupControl baseGroupControl = new GroupControl();
|
||||
GroupControl reportGroupControl = new GroupControl();
|
||||
if (baseTable.Count() > 0)
|
||||
{
|
||||
baseGroupControl.Dock = DockStyle.Top;
|
||||
FlowLayoutPanel flowLayoutPanel = new FlowLayoutPanel();
|
||||
flowLayoutPanel.Dock = DockStyle.Fill;
|
||||
flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
|
||||
baseGroupControl.MenuPanel.Controls.Add(flowLayoutPanel);
|
||||
foreach (DataRow dataRow in baseTable)
|
||||
{
|
||||
string groupMenuId = dataRow["LMenuId"] + "";
|
||||
string defaultImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOutImg"] + "";
|
||||
string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
|
||||
string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
|
||||
Menu_ItemNew menu = new Menu_ItemNew();
|
||||
menu.Size = new Size(menuWidth, menuHeight);
|
||||
menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
|
||||
menu.SetRoundRadius = 20;
|
||||
menu.GetButton().Tag = menuTag;
|
||||
menu.GetButton().Click += OnMenuItemClick;
|
||||
menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
|
||||
menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
|
||||
flowLayoutPanel.Controls.Add(menu);
|
||||
this._menuItemList.Add(menu);
|
||||
//DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
|
||||
//string countSql = modelRow != null && modelRow.Table.Columns.Contains("countSql") ? modelRow["countSql"] + "" : "";
|
||||
string countSql = dataRow.Table.Columns.Contains("countSql") ? dataRow["countSql"] + "" : "";
|
||||
if (!string.IsNullOrWhiteSpace(countSql) && !"0".Equals(countSql.TrimEnd()) && !countSqls.ContainsKey(groupMenuId))
|
||||
{
|
||||
countSqls.Add(groupMenuId, countSql);
|
||||
}
|
||||
}
|
||||
collectMenuPanel.Controls.Add(baseGroupControl);
|
||||
baseGroupControl.TipsText = $"快捷操作通道（{baseTable.Count()}）";
|
||||
flowLayoutPanel.SizeChanged += (s, e) =>
|
||||
{
|
||||
FlowLayoutPanel panel = s as FlowLayoutPanel;
|
||||
baseGroupControl.Height = panel.Controls[panel.Controls.Count - 1].Location.Y + menuHeight + 28;
|
||||
collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
|
||||
};
|
||||
}
|
||||
if (reportTable.Count() > 0)
|
||||
{
|
||||
reportGroupControl.Dock = DockStyle.Top;
|
||||
FlowLayoutPanel flowLayoutPanel = new FlowLayoutPanel();
|
||||
flowLayoutPanel.Dock = DockStyle.Fill;
|
||||
flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
|
||||
flowLayoutPanel.AutoSize = true;
|
||||
flowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
|
||||
reportGroupControl.MenuPanel.Controls.Add(flowLayoutPanel);
|
||||
foreach (DataRow dataRow in reportTable)
|
||||
{
|
||||
string groupMenuId = dataRow["LMenuId"] + "";
|
||||
string defaultImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOutImg"] + "";
|
||||
string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
|
||||
string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
|
||||
Menu_ItemNew menu = new Menu_ItemNew();
|
||||
menu.Size = new Size(menuWidth, menuHeight);
|
||||
menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
|
||||
menu.SetRoundRadius = 20;
|
||||
menu.GetButton().Tag = menuTag;
|
||||
menu.GetButton().Click += OnMenuItemClick;
|
||||
menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
|
||||
menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
|
||||
flowLayoutPanel.Controls.Add(menu);
|
||||
this._menuItemList.Add(menu);
|
||||
//DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
|
||||
//string countSql = modelRow != null && modelRow.Table.Columns.Contains("countSql") ? modelRow["countSql"] + "" : "";
|
||||
string countSql = dataRow.Table.Columns.Contains("countSql") ? dataRow["countSql"] + "" : "";
|
||||
if (!string.IsNullOrWhiteSpace(countSql) && !"0".Equals(countSql.TrimEnd()) && !countSqls.ContainsKey(groupMenuId))
|
||||
{
|
||||
countSqls.Add(groupMenuId, countSql);
|
||||
}
|
||||
}
|
||||
collectMenuPanel.Controls.Add(reportGroupControl);
|
||||
reportGroupControl.TipsText = $"快捷报表通道（{baseTable.Count()}）";
|
||||
flowLayoutPanel.SizeChanged += (s, e) =>
|
||||
{
|
||||
FlowLayoutPanel panel = s as FlowLayoutPanel;
|
||||
reportGroupControl.Height = panel.Controls[panel.Controls.Count - 1].Location.Y + menuHeight + 28;
|
||||
collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
|
||||
};
|
||||
}
|
||||
}
|
||||
foreach (DataRow item in rows)
|
||||
{
|
||||
string menuStruct = item["menustruct"] + "";
|
||||
@@ -703,7 +792,6 @@ namespace Lskj.Main.Control
|
||||
button.GetButton().Width = SystemInfo.Instance.MenuBarWidth - 10;
|
||||
}
|
||||
|
||||
|
||||
if (_firstMenuBar == null)
|
||||
{
|
||||
_firstMenuBar = button;
|
||||
@@ -821,6 +909,7 @@ namespace Lskj.Main.Control
|
||||
#region 添加分组菜单控件
|
||||
if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
|
||||
{
|
||||
//添加全部应用菜单
|
||||
List<DataRow> groupDataRows = new List<DataRow>();
|
||||
if (this._allMenus.Columns.Contains("menuposition"))
|
||||
{
|
||||
@@ -867,6 +956,7 @@ namespace Lskj.Main.Control
|
||||
{
|
||||
groupOrderDataRow = groupByDataRow.OrderBy(n => Convert.ToInt32(n["menuRow"] + "")).ToList();
|
||||
}
|
||||
int count = 0;
|
||||
foreach (DataRow dataRow in groupOrderDataRow)
|
||||
{
|
||||
string groupMenuId = dataRow["menuid"] + "";
|
||||
@@ -899,7 +989,7 @@ namespace Lskj.Main.Control
|
||||
menu.Size = new Size(menuWidth, menuHeight);
|
||||
menu.menuNode = (dataRow["menustruct"] + "").Substring(0, 2);
|
||||
menu.SetMenuCaption(dataRow["menucaption"] + "");
|
||||
menu.SetSubCaption(dataRow["SubSysName"] +"-"+ item["menucaption"]);
|
||||
menu.SetSubCaption(dataRow["SubSysName"] + "-" + item["menucaption"]);
|
||||
menu.SetRoundRadius = 20;
|
||||
menu.Tag = menuTag;
|
||||
menu.Click += OnMenuItemClick;
|
||||
@@ -961,10 +1051,11 @@ namespace Lskj.Main.Control
|
||||
//{
|
||||
// countSqls.Add(groupMenuId, countSqlBill);
|
||||
//}
|
||||
|
||||
count += 1;
|
||||
}
|
||||
}
|
||||
groupControl.Height = (int)(menuGroupTop + menuHeight + 26 + 5);
|
||||
groupControl.TipsText = $"{groupControl.TipsText}({count})";
|
||||
groupControl.Height = (int)(menuGroupTop + menuHeight + 28);
|
||||
}
|
||||
if (groupPanel.Controls.Count == 1)
|
||||
{
|
||||
@@ -977,8 +1068,8 @@ namespace Lskj.Main.Control
|
||||
// 默认显示
|
||||
if (defaultParentMenu == menuStruct)
|
||||
{
|
||||
this.pl_center_main_middle.Controls.Clear();
|
||||
this.pl_center_main_middle.Controls.Add(groupPanel);
|
||||
this.allMenuPanel.Controls.Clear();
|
||||
this.allMenuPanel.Controls.Add(groupPanel);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -1862,7 +1953,7 @@ namespace Lskj.Main.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
pl_center_main_middle.Controls.Clear();
|
||||
allMenuPanel.Controls.Clear();
|
||||
}
|
||||
this._menus.Clear();
|
||||
this._menuItemList.Clear();
|
||||
@@ -1909,7 +2000,7 @@ namespace Lskj.Main.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
pl_center_main_middle.Controls.Clear();
|
||||
allMenuPanel.Controls.Clear();
|
||||
}
|
||||
this._menus.Clear();
|
||||
this._menuItemList.Clear();
|
||||
@@ -2142,7 +2233,7 @@ namespace Lskj.Main.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pl_center_main_middle.Hide();
|
||||
//this.pl_center_main_middle.Hide();
|
||||
}
|
||||
if (before.Parent != null && before.Parent is MenuBar)
|
||||
{
|
||||
@@ -2153,7 +2244,7 @@ namespace Lskj.Main.Control
|
||||
{
|
||||
if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
|
||||
{
|
||||
this.pl_center_main_middle.Controls.Clear();
|
||||
allMenuPanel.Controls.Clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2178,7 +2269,7 @@ namespace Lskj.Main.Control
|
||||
if (this._groupItems.ContainsKey(item_after["menustruct"] + ""))
|
||||
{
|
||||
Panel groupPanel = this._groupItems[item_after["menustruct"] + ""];
|
||||
this.pl_center_main_middle.Controls.Add(groupPanel);
|
||||
allMenuPanel.Controls.Add(groupPanel);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -2391,14 +2482,13 @@ namespace Lskj.Main.Control
|
||||
//pl_center_main.Controls.Clear();
|
||||
int centerWidth = pl_center_main_middle.Width; // 内容区域宽度
|
||||
|
||||
|
||||
if (isFlowLayout)
|
||||
{
|
||||
pl_center_main_middle_FlowLayout.Controls.Clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
pl_center_main_middle.Controls.Clear();
|
||||
allMenuPanel.Controls.Clear();
|
||||
}
|
||||
|
||||
if (dtChilds != null && dtChilds.Rows.Count > 0)
|
||||
|
||||
Reference in New Issue
Block a user