SVN r829
SVN-Revision: r829
This commit is contained in:
@@ -378,7 +378,7 @@ namespace Lskj.Control
|
|||||||
GridColumnModel[] AutobandRows = this.ColumnList.Where(x => x.FieldText.Contains("|")).ToArray();
|
GridColumnModel[] AutobandRows = this.ColumnList.Where(x => x.FieldText.Contains("|")).ToArray();
|
||||||
GridColumnModel[] bandEmptyRows = null;
|
GridColumnModel[] bandEmptyRows = null;
|
||||||
|
|
||||||
if (this.moduleModel != null && this.moduleModel.TreeAutoMultiHeader==1)
|
if (this.moduleModel != null && this.moduleModel.TreeAutoMultiHeader == 1)
|
||||||
{
|
{
|
||||||
bandEmptyRows = AutobandRows.Length > 0
|
bandEmptyRows = AutobandRows.Length > 0
|
||||||
? this.ColumnList.Where(x => !x.FieldText.Contains("|") && x.Width > 0).ToArray()
|
? this.ColumnList.Where(x => !x.FieldText.Contains("|") && x.Width > 0).ToArray()
|
||||||
@@ -425,8 +425,21 @@ namespace Lskj.Control
|
|||||||
gridBandEmpty.AppearanceHeader.Options.UseTextOptions = true;
|
gridBandEmpty.AppearanceHeader.Options.UseTextOptions = true;
|
||||||
gridBandEmpty.AppearanceHeader.TextOptions.HAlignment = HorzAlignment.Center;
|
gridBandEmpty.AppearanceHeader.TextOptions.HAlignment = HorzAlignment.Center;
|
||||||
|
|
||||||
if (!gcMain.Bands.Contains(gridBandEmpty))
|
if (this.moduleModel.BandSequentialMode)
|
||||||
gcMain.Bands.Add(gridBandEmpty);
|
{
|
||||||
|
if (!gcMain.Bands.Contains(gridBandEmpty))
|
||||||
|
{
|
||||||
|
gcMain.Bands.Add(gridBandEmpty);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TreeListBand treeListBand = gcMain.Bands.Cast<TreeListBand>().FirstOrDefault(x => string.IsNullOrEmpty(x.Caption));
|
||||||
|
if (treeListBand == null)
|
||||||
|
{
|
||||||
|
gcMain.Bands.Add(gridBandEmpty);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
gridBandEmptyDic.Add(this.ColumnList.IndexOf(columnModel), gridBandEmpty);
|
gridBandEmptyDic.Add(this.ColumnList.IndexOf(columnModel), gridBandEmpty);
|
||||||
}
|
}
|
||||||
@@ -447,7 +460,7 @@ namespace Lskj.Control
|
|||||||
|
|
||||||
TreeListBand gridBand = gcMain.Bands.Cast<TreeListBand>().FirstOrDefault(x => x.Caption == bandTitle);
|
TreeListBand gridBand = gcMain.Bands.Cast<TreeListBand>().FirstOrDefault(x => x.Caption == bandTitle);
|
||||||
|
|
||||||
if (gridBand != null)
|
if (gridBand != null && !string.IsNullOrEmpty(gridBand.Caption))
|
||||||
{
|
{
|
||||||
gridBand.Columns.Add(gridColumn);
|
gridBand.Columns.Add(gridColumn);
|
||||||
if (saveGridBandColumn.ContainsKey(gridBand))
|
if (saveGridBandColumn.ContainsKey(gridBand))
|
||||||
@@ -485,7 +498,7 @@ namespace Lskj.Control
|
|||||||
SetColumnSumming(gridColumn, model);
|
SetColumnSumming(gridColumn, model);
|
||||||
InitEditColumns(gridColumn, model);
|
InitEditColumns(gridColumn, model);
|
||||||
|
|
||||||
if (model.RepeatedVerification)
|
if (model.RepeatedVerification)
|
||||||
this.RepeatedVerificationNames.Add(model.FieldName);
|
this.RepeatedVerificationNames.Add(model.FieldName);
|
||||||
}
|
}
|
||||||
SetCustomColumns();
|
SetCustomColumns();
|
||||||
@@ -2187,11 +2200,11 @@ namespace Lskj.Control
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -2756,11 +2769,11 @@ namespace Lskj.Control
|
|||||||
if (e.Node == this.gcMain.FocusedNode)
|
if (e.Node == this.gcMain.FocusedNode)
|
||||||
e.Appearance.BackColor = ColorTranslator.FromHtml("#9feb6a");
|
e.Appearance.BackColor = ColorTranslator.FromHtml("#9feb6a");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 粘贴功能
|
/// 粘贴功能
|
||||||
|
|||||||
Reference in New Issue
Block a user