SVN r922
SVN-Revision: r922
This commit is contained in:
@@ -46,9 +46,14 @@ namespace Lskj.BaseWorkflow.Control
|
||||
/// 缓存model
|
||||
/// </summary>
|
||||
public List<BaseflowTypeModel> modellist = new List<BaseflowTypeModel>();
|
||||
/// <summary>
|
||||
/// 主页转过来的操作权限
|
||||
/// </summary>
|
||||
public bool SerpPage3Power;
|
||||
|
||||
public StepPage3()
|
||||
{
|
||||
|
||||
|
||||
InitializeComponent();
|
||||
setCombox();
|
||||
this.labelTextEdit1.TextEdit.EditValueChanged += new EventHandler(OnUserEditValueChanged);
|
||||
@@ -57,14 +62,15 @@ namespace Lskj.BaseWorkflow.Control
|
||||
this.LeftFontColor.TextEdit.Click += new EventHandler(color_Click);
|
||||
this.fontColor.TextEdit.Click += new EventHandler(color_Click);
|
||||
this.LeftFlowCharfillcolor.TextEdit.Click += new EventHandler(color_Click);
|
||||
|
||||
if (SystemInfo.Instance.HideFlowchartTab) this.xtraTabControl1.TabPages[1].PageVisible = false;
|
||||
}
|
||||
|
||||
#region 公共方法
|
||||
/// <summary>
|
||||
/// 设置下拉框值
|
||||
/// </summary>
|
||||
public void setCombox() {
|
||||
public void setCombox()
|
||||
{
|
||||
DataTable flowcharTagIdTable = new DataTable();
|
||||
flowcharTagIdTable.Columns.Add("dm");
|
||||
flowcharTagIdTable.Columns.Add("mc");
|
||||
@@ -100,8 +106,8 @@ namespace Lskj.BaseWorkflow.Control
|
||||
this.fontWeight.ValueField = "dm";
|
||||
this.fontWeight.TextField = "mc";
|
||||
this.fontWeight.SetDataSource(fontWeightTable);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// <para>说明:初始化界面控件</para>
|
||||
@@ -135,7 +141,8 @@ namespace Lskj.BaseWorkflow.Control
|
||||
this.comboBoxEdit1.Properties.Items.Clear();
|
||||
modellist.Clear();
|
||||
DataTable table = WorkFlowBaseImpl.GetBaseFlowType(mMenuCode);
|
||||
if (table.Rows.Count==0) {
|
||||
if (table.Rows.Count == 0)
|
||||
{
|
||||
this.comboBoxEdit1.Visible = false;
|
||||
return;
|
||||
}
|
||||
@@ -219,12 +226,13 @@ namespace Lskj.BaseWorkflow.Control
|
||||
}
|
||||
this.xtraTabControl1.Visible = true;
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
this.xtraTabControl1.Visible = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 执行存储过程
|
||||
/// </summary>
|
||||
@@ -498,7 +506,7 @@ namespace Lskj.BaseWorkflow.Control
|
||||
this.FlowCharfillcolor.TextEdit.BackColor = ColorTranslator.FromHtml(this.FlowCharfillcolor.EditText);
|
||||
this.LeftFlowCharfillcolor.EditText = string.IsNullOrWhiteSpace(model.LeftFlowCharfillcolor) ? "#FFFFFF" : model.LeftFlowCharfillcolor;
|
||||
this.LeftFlowCharfillcolor.TextEdit.BackColor = ColorTranslator.FromHtml(this.LeftFlowCharfillcolor.EditText);
|
||||
this.fontSize.EditText =string.IsNullOrWhiteSpace(model.fontSize) ? "18":model.fontSize;
|
||||
this.fontSize.EditText = string.IsNullOrWhiteSpace(model.fontSize) ? "18" : model.fontSize;
|
||||
this.fontWeight.EditText = string.IsNullOrWhiteSpace(model.fontWeight) ? "normal" : model.fontWeight;
|
||||
this.LeftFlowCharWidth.EditText = string.IsNullOrWhiteSpace(model.LeftFlowCharWidth) ? "160" : model.LeftFlowCharWidth;
|
||||
this.fontFamily.EditText = string.IsNullOrWhiteSpace(model.fontFamily) ? "Microsoft YaHei" : model.fontFamily;
|
||||
@@ -542,9 +550,14 @@ namespace Lskj.BaseWorkflow.Control
|
||||
{
|
||||
StepItem3 item = new StepItem3();
|
||||
item.TitleLabelObj.Text = pos + "、" + model.stepName + " " + model.stepCode;
|
||||
item.DeletePabelObj.Visible = false;
|
||||
//item.DeletePabelObj.Visible = false;
|
||||
if (SerpPage3Power)
|
||||
{
|
||||
item.DeletePabelObj.Enabled = false;
|
||||
}
|
||||
item.DeletePabelObj.Click += new EventHandler(OnDeletePabelObjClick);
|
||||
item.Dock = DockStyle.Top;
|
||||
item.Tag = item.TitleLabelObj.Tag = model;
|
||||
item.Tag = item.TitleLabelObj.Tag = item.DeletePabelObj.Tag = model;
|
||||
item.SetHoverEvent(OnBillFlowLabelObjClick);
|
||||
if (pos == 1)
|
||||
{
|
||||
@@ -756,7 +769,7 @@ namespace Lskj.BaseWorkflow.Control
|
||||
userNames += "{&" + item["roleName"] + "&},";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
this.memoEdit2.EditValue += userNames;
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -787,19 +800,42 @@ namespace Lskj.BaseWorkflow.Control
|
||||
{
|
||||
if (xtraTabControl1.SelectedTabPage == xtraTabPage2)//进行tabpage位置判断
|
||||
{
|
||||
if (moduleWebView1 != null)
|
||||
{
|
||||
moduleWebView1.FDispose();
|
||||
moduleWebView1 = null;
|
||||
}
|
||||
this.xtraTabPage2.Controls.Clear();
|
||||
//if (moduleWebView1 != null)
|
||||
//{
|
||||
// moduleWebView1.FDispose();
|
||||
// moduleWebView1 = null;
|
||||
//}
|
||||
//this.xtraTabPage2.Controls.Clear();
|
||||
// 获取基本数据
|
||||
moduleWebView1 = new ModuleWebView();
|
||||
this.xtraTabPage2.Controls.Add(moduleWebView1);
|
||||
//moduleWebView1 = new ModuleWebView();
|
||||
//this.xtraTabPage2.Controls.Add(moduleWebView1);
|
||||
//BaseflowTypeStepModel model = this.SelectBaseflowTypeStepModel;
|
||||
//string url = SystemInfo.Instance.OAUrl+"/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||
//moduleWebView1.Navigate(url);
|
||||
|
||||
this.xtraTabPage2.Controls.Clear();
|
||||
BaseflowTypeStepModel model = this.SelectBaseflowTypeStepModel;
|
||||
|
||||
string url = SystemInfo.Instance.OAUrl+"/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||
moduleWebView1.Navigate(url);
|
||||
|
||||
string url = SystemInfo.Instance.OAUrl + "/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||
{
|
||||
FrmMiniBlink webView = new FrmMiniBlink();
|
||||
webView.AllowDownload = false;
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = model;
|
||||
|
||||
this.xtraTabPage2.Controls.Add(webView);
|
||||
webView.LoadUrl(ReplaceHelper.ReplaceUserInfo(url));
|
||||
}
|
||||
else
|
||||
{
|
||||
FrmWebBrowser webView = new FrmWebBrowser();
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = model;
|
||||
this.xtraTabPage2.Controls.Add(webView);
|
||||
webView.FrmLoad(ReplaceHelper.ReplaceUserInfo(url));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
@@ -819,9 +855,14 @@ namespace Lskj.BaseWorkflow.Control
|
||||
string colorHtml = ColorTranslator.ToHtml(System.Drawing.Color.FromArgb(colorChoosed.R, colorChoosed.G, colorChoosed.B));
|
||||
txt.EditValue = colorHtml;
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDeletePabelObjClick(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
Panel
|
||||
Reference in New Issue
Block a user