20230831 WBS

This commit is contained in:
2023-08-31 16:37:09 +08:00
parent d9f8be1463
commit ba6774dbae
44 changed files with 1349 additions and 235 deletions
+6 -3
View File
@@ -296,7 +296,6 @@ namespace FineUIPro.Web
if (!string.IsNullOrEmpty(Request.Params["PHTUrl"]))
{
this.drpProject.SelectedValue = Request.Params["projectId"];
mainTabStrip.ShowTabHeader = true;
PageContext.RegisterStartupScript("parent.removeActiveTab();");
//btnPHTGL_Click(null, null);
@@ -349,10 +348,14 @@ namespace FineUIPro.Web
this.drpProject.SelectedValue = getproject.ProjectId;
}
}
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) && this.drpProject.Items.Select(x => x.Value == this.CurrUser.LoginProjectId) != null)
{
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
}
else
{
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
}
this.InitMenuStyleButton();
@@ -578,7 +581,7 @@ namespace FineUIPro.Web
/// <param name="type"></param>
protected void MenuSwitchMethod(string type)
{
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
// this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
this.XmlDataSource1.DataFile = "common/Menu_Personal.xml";
this.leftPanel.Hidden = true;
this.Tab1.IFrameUrl = "~/common/mainProject.aspx";