bug
lu
4 天以前 c62c421dbbc5cbf9841a6a07f86a500c2b70b5e2
DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -1,6 +1,10 @@
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.TextEditController;
using DevExpress.XtraLayout;
using DevExpress.XtraRichEdit.Model;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using Gs.DevApp.DevFrm.User;
@@ -14,7 +18,9 @@
using System.Configuration;
using System.Data;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Text;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -95,6 +101,18 @@
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            };
            #region 加上底部提醒
            tab.SelectedPageChanged += (s, e) => {
                string _strForm = e.Page.Tag != null ? e.Page.Tag.ToString() : "未知";
                toolForm.Text = ("窗体:" + _strForm);
            };
            string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
            string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
            string _version = ConfigurationManager.AppSettings["Version"];
            toolVersion.Text = "当前版本:" + _version + ",服务Api:" + _webApiUrl;
            string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
            toolFont.Text = (",字体:" + _strFont);
            #endregion
        }
        /// <summary>
        /// 显示右键菜单
@@ -172,7 +190,7 @@
        /// </summary>
        private void getTree()
        {
            toolTime.Text = "登录时间" + LoginInfoModel.CurrentUser.LoginTime;
            toolTime.Text = "登录时间:" + LoginInfoModel.CurrentUser.LoginTime;
            var _obj = new
            {
                userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
@@ -213,6 +231,7 @@
                        _grp.Style = ElementStyle.Group;
                        _grp.Text = _dy["name"].ToString();
                        _grp.Tag = _dy["formPath"].ToString(); //存路径,类名
                        _grp.AccessibleDescription = _dy["layoutVersion"].ToString();//版面
                        _grp.Click += _grp_Click;
                        if (gdx == 0)
                            _grp.Expanded = true;
@@ -230,6 +249,7 @@
                            _itm.Text = _dy2["name"].ToString();
                            wdf.SetCaption("加载进度:" + _dy2["name"].ToString());
                            _itm.Tag = _dy2["formPath"].ToString(); //存路径,类名
                            _itm.AccessibleDescription = _dy2["layoutVersion"].ToString();//版面
                            _itm.Click += _grp_Click;
                            _grp.Elements.Add(_itm);
                            if (idx == 0 && tab.TabPages.Count <= 0)
@@ -238,8 +258,11 @@
                                var tabText = _itm.Text; //当前选项卡页Text标题
                                var newFormName = _itm.Tag.ToString(); //存路径,类名
                                var imgIcon = _itm.Image;
                                var layoutVersion = _itm.AccessibleDescription;
                                AddTabpage(tab, tabPageName, tabText,
                                    newFormName, imgIcon);
                                    newFormName, imgIcon,"", layoutVersion);
                                //第0个,不会触发事件,手动设置
                                toolForm.Text = ("窗体:" + newFormName+ ",版面:" + layoutVersion);
                            }
                            idx++;
                        }
@@ -256,7 +279,6 @@
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -274,7 +296,8 @@
            var tabText = _acd.Text;
            var newFormName = _acd.Tag.ToString();
            var imgIcon = _acd.Image;
            AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
            string _strLayout = _acd.AccessibleDescription;
            AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon, "", _strLayout);
        }
        /// <summary>
@@ -299,7 +322,7 @@
        /// <param name="imgIcon">当前选项卡中的新窗体路径,类名</param>
        /// <param name="InitializeVal">初始值,用于子窗体中调用父窗体的值</param>
        public void AddTabpage(XtraTabControl tabControl, string tabPageName,
            string tabText, string newFormName, Image imgIcon, string InitializeVal = "")
            string tabText, string newFormName, Image imgIcon, string InitializeVal = "", string strLayout = "")
        {
            if (IsTabpageExsit(tabControl, tabPageName)) return;
            var newPage = new XtraTabPage();
@@ -308,6 +331,7 @@
            newPage.Tooltip = newPage.Name;
            newPage.Appearance.Header.Font = tab.Appearance.Font;
            newPage.ImageOptions.Image = imgIcon;
            newPage.Tag = newFormName + ",版面:" + strLayout;
            var fm = AddNewForm(newFormName, InitializeVal);
            if (fm != null)
            {
@@ -485,9 +509,9 @@
        private void GetOrg()
        {
            string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
            System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
            System.Text.StringBuilder sbSql = new System.Text.StringBuilder();
            sbSql.Append(" and IS_STATUS=1");
            sbSql.Append("  and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where  userGuid='"+ LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='组织' ) ");
            sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where  userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='组织' ) ");
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try