删除DevExpress

UAS-MES/CustomControl/AccordionMenu/NavagationBar.Designer.cs

@@ -1,58 +0,0 @@
-namespace UAS_MES.CustomControl.AccordionMenu
-{
-    partial class NavagationBar
-    {
-        /// <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 Component 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()
-        {
-            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // NavagationBar
-            // 
-            this.Appearance.Item.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Appearance.Item.Options.UseFont = true;
-            this.Appearance.ItemActive.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Appearance.ItemActive.Options.UseFont = true;
-            this.Appearance.ItemHotTracked.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Appearance.ItemHotTracked.Options.UseFont = true;
-            this.Appearance.ItemPressed.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Appearance.ItemPressed.Options.UseFont = true;
-            this.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LinkInterval = 2;
-            this.NavigationPaneGroupClientHeight = 300;
-            this.OptionsNavPane.ExpandedWidth = 140;
-            this.ShowGroupHint = false;
-            this.ShowLinkHint = false;
-            this.Text = " ";
-            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-    }
-}

UAS-MES/CustomControl/AccordionMenu/NavagationBar.cs

@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Linq;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using UAS_MES.DataOperate;
-using UAS_MES.Entity;
-using DevExpress.XtraNavBar;
-using System.Collections;
-using System.Reflection;
-using DevExpress.Utils;
-
-namespace UAS_MES.CustomControl.AccordionMenu
-{
-    public partial class NavagationBar : DevExpress.XtraNavBar.NavBarControl
-    {
-
-        StringBuilder sql = new StringBuilder();
-
-        public static int WinIndex = 0;
-        /// <summary>
-        /// 记录当前功能面板中的按钮
-        /// </summary>
-        private ArrayList ArrFunButton = new ArrayList();
-        /// <summary>
-        /// 记录当前功能面板中的listview
-        /// </summary>
-        private ArrayList ArrFunListView = new ArrayList();
-        /// <summary>
-        /// 已经打开的Form
-        /// </summary>
-        public static Dictionary<string, int> OpenedFormName = new Dictionary<string, int>();
-
-        public NavagationBar()
-        {
-            InitializeComponent();
-            DataHelper dh = SystemInf.dh;
-            if (dh == null)
-                return;
-            if (User.UserAccountType == "admin")
-            {
-                sql.Clear();
-                sql.Append("select distinct sn_id,sn_detno,sn_module,sn_modulecode,sn_classname,sn_displayname,sn_caller ugp_caller,1 ugp_ifdelete,1 ugp_ifread,1 ugp_ifspecial,1 ugp_ifall,");
-                sql.Append("1 ugp_ifwrite from CS$SYSNAVATION left join CS$USERGROUPPOWER on sn_caller=ugp_caller  where sn_using=1  order by sn_modulecode,sn_detno");
-            }
-            else
-            {
-                sql.Clear();
-                sql.Append("select  sn_id,sn_detno,sn_module,sn_displayname,sn_classname,ugp_caller,max(ugp_ifdelete)ugp_ifdelete,max(ugp_ifread)");
-                sql.Append("ugp_ifread,max(ugp_ifspecial)ugp_ifspecial,max(ugp_ifwrite)ugp_ifwrite,max(ugp_ifall)ugp_ifall from CS$USERGROUPPOWER ");
-                sql.Append("left join CS$SYSNAVATION on sn_caller=ugp_caller  where sn_using=1 and ugp_groupcode in ( select eg_groupcode from cs$empgroup ");
-                sql.Append("left join cs$userresource on ur_groupcode = eg_groupcode where eg_emcode = '" + User.UserCode + "') group by sn_id,sn_caller,");
-                sql.Append("sn_detno,sn_classname,sn_module,sn_displayname,ugp_caller order by sn_module,sn_detno");
-            }
-            DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-            if (dt.Rows.Count == 0 && User.UserAccountType != "admin")
-            {
-                return;
-            }
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                bool ContainGroup = false;
-                string module_name = dt.Rows[i]["sn_module"].ToString();
-                string caller = dt.Rows[i]["sn_displayname"].ToString();
-                NavBarItem nbi = new NavBarItem(caller);
-                nbi.Tag = dt.Rows[i]["sn_classname"].ToString();
-                nbi.LinkClicked += Nbi_LinkClicked;
-                nbi.Tag = dt.Rows[i]["sn_classname"].ToString();
-                nbi.Hint = dt.Rows[i]["ugp_caller"].ToString();
-                nbi.Name = dt.Rows[i]["sn_id"].ToString();
-                for (int j = 0; j < Groups.Count; j++)
-                {
-                    if (Groups[j].Caption == module_name)
-                    {
-                        ContainGroup = true;
-                        Groups[j].ItemLinks.Add(nbi);
-                    }
-                    else
-                    {
-                        ContainGroup = false;
-                    }
-                }
-                if (!ContainGroup)
-                {
-                    NavBarGroup nbg = new NavBarGroup(module_name);
-                    Groups.Add(nbg);
-                    nbg.ItemLinks.Add(nbi);
-                }
-            }
-            //查询出的用户可见的Caller
-            //将查询出的数据添加到队列中
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                //添加权限
-                Dictionary<string, bool> dic = new Dictionary<string, bool>();
-                dic.Add("IFDELETE", dt.Rows[i]["UGP_IFDELETE"].ToString() != "1" ? false : true);
-                dic.Add("IFREAD", dt.Rows[i]["UGP_IFREAD"].ToString() != "1" ? false : true);
-                dic.Add("IFWRITE", dt.Rows[i]["UGP_IFWRITE"].ToString() != "1" ? false : true);
-                dic.Add("IFSPECIAL", dt.Rows[i]["UGP_IFSPECIAL"].ToString() != "1" ? false : true);
-                dic.Add("IFALL", dt.Rows[i]["UGP_IFALL"].ToString() != "1" ? false : true);
-                //之后通过Call来获取页面操作的权限
-                if (SystemInf.Caller.ContainsKey(dt.Rows[i]["ugp_caller"].ToString()))
-                {
-                    SystemInf.Caller.Remove(dt.Rows[i]["ugp_caller"].ToString());
-                }
-                SystemInf.Caller.Add(dt.Rows[i]["ugp_caller"].ToString(), dic);
-            }
-        }
-
-        private void Nbi_LinkClicked(object sender, NavBarLinkEventArgs e)
-        {
-            NavBarItem nbi = (sender as NavBarItem);
-            Form OpenForm = (Form)Assembly.GetExecutingAssembly().CreateInstance("UAS_MES." + nbi.Tag);
-            OpenForm.Dock = DockStyle.Fill;
-            OpenForm.Text = nbi.Caption;
-            //用Tag保存Caller
-            OpenForm.Tag = nbi.Hint;
-            TabControl tc = (TabControl)this.Parent.Controls["MainTabControl"];
-            //如果窗体不存在进行打开,item.ToolTip是Caller
-            if (!OpenedFormName.ContainsKey(nbi.Hint))
-            {
-                TabPage tb = new TabPage { Name = nbi.Name, Tag = nbi.Hint, Text = OpenForm.Text };
-                OpenForm.TopLevel = false;
-                tc.TabPages.Add(tb);
-                //直接选中新打开的界面
-                tc.SelectedTab = tb;
-                tb.Controls.Add(OpenForm);
-                OpenedFormName.Add(nbi.Hint, WinIndex);
-                tc.TabIndex = WinIndex;
-                WinIndex++;
-                OpenForm.Show();
-            }
-            //如果窗体已存在展示该窗体
-            else
-                tc.SelectTab(nbi.Name);
-        }
-    }
-}

UAS-MES/CustomControl/AccordionMenu/NavagationBar.resx

@@ -1,123 +0,0 @@
-<?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>
-  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-</root>

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.524</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.525</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>525</ApplicationRevision>
+    <ApplicationRevision>526</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -116,15 +116,6 @@
     <Reference Include="DevComponents.DotNetBar2">
       <HintPath>Tool\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Data.v15.2">
-      <HintPath>Tool\DevExpress.Data.v15.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Utils.v15.2">
-      <HintPath>Tool\DevExpress.Utils.v15.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraNavBar.v15.2">
-      <HintPath>Tool\DevExpress.XtraNavBar.v15.2.dll</HintPath>
-    </Reference>
     <Reference Include="ExcelHelper">
       <HintPath>Tool\ExcelHelper.dll</HintPath>
     </Reference>
@@ -174,12 +165,6 @@
     <Compile Include="CustomControl\AccordionMenu\AccordionMenu.Designer.cs">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </Compile>
-    <Compile Include="CustomControl\AccordionMenu\NavagationBar.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CustomControl\AccordionMenu\NavagationBar.Designer.cs">
-      <DependentUpon>NavagationBar.cs</DependentUpon>
-    </Compile>
     <Compile Include="CustomControl\BaseForm\BaseForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1049,9 +1034,6 @@
     <EmbeddedResource Include="CustomControl\AccordionMenu\AccordionMenu.resx">
       <DependentUpon>AccordionMenu.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomControl\AccordionMenu\NavagationBar.resx">
-      <DependentUpon>NavagationBar.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\BaseForm\BaseForm.resx">
       <DependentUpon>BaseForm.cs</DependentUpon>
     </EmbeddedResource>