From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index bd83b22..b368561 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -16,32 +16,31 @@
public FrmLogin()
{
InitializeComponent();
- if (ConfigurationManager.AppSettings["IsAutoUpdater"] == "1")
+ if (ConfigurationManager.AppSettings["IsAutoUpdater"].ToString() == "1")
_autoUpdate();
else
getTree();
- this.Text = lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ this.Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"].ToString();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
- _getRemember();
}
/// <summary>
/// 璇诲彇缁勭粐
/// </summary>
private void getTree()
{
- PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "and isStatus=1");
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", " and IS_STATUS=1");
string json = JsonConvert.SerializeObject(pgq);
- string strReturn = "";
try
{
- strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- ReturnModel<PageListModel> rtn = UtilityHelper.GetTableByJson(strReturn);
+ string strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ ReturnModel<PageListModel> rtn = UtilityHelper.ReturnToTablePage(strReturn);
DataTable dt = rtn.rtnData.list;
comOrg.DataSource = dt;
comOrg.DisplayMember = "name";
comOrg.ValueMember = "guid";
comOrg.SelectedIndex = 0;
+ _getRemember();
}
catch (Exception ex)
{
@@ -86,7 +85,7 @@
try
{
string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
JObject _login = _rtn.rtnData;
if (_rtn.rtnCode > 0)
{
@@ -118,23 +117,33 @@
/// </summary>
private void _getRemember()
{
- if (Properties.Settings.Default.remember)
+ try
{
- txtUser.Text = Properties.Settings.Default.userName;
- txtPwd.Text = Properties.Settings.Default.userPwd;
- comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
- ckRemember.Checked = true;
+ if (Properties.Settings.Default.remember)
+ {
+ txtUser.Text = Properties.Settings.Default.userName;
+ txtPwd.Text = Properties.Settings.Default.userPwd;
+ comOrg.SelectedValue = Properties.Settings.Default.orgGuid;
+ ckRemember.Checked = true;
+ }
}
+ catch (Exception ex)
+ {
+
+ MessageBox.Show(ex.Message);
+ }
+
}
private void _autoUpdate()
{
string _version = ConfigurationManager.AppSettings["Version"];
AutoUpdater.InstalledVersion = new Version(_version);
- AutoUpdater.Start(System.Configuration.ConfigurationSettings.AppSettings.Get("AutoUpdaterXml").ToString());
+ AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"].ToString());
AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
}
private void AutoUpdater_CheckForUpdateEvent(UpdateInfoEventArgs args)
{
+
if (args == null || string.IsNullOrEmpty(args.DownloadURL))
{
MsgHelper.ShowError("璇诲彇鑷姩鏇存柊澶辫触锛屾棤娉曠櫥褰曪紝璇疯仈绯荤鐞嗗憳锛�");
@@ -142,6 +151,7 @@
Application.Exit();
return;
}
+
if (!args.IsUpdateAvailable)
{
getTree();
--
Gitblit v1.9.3