개정판 67cfe4dc
Fix: Block의 Attribute의 TAG가 일치하지 않는 경우 처리(Compare)
- GridView에서 Grouping했을때 행의 헤더에 Index 표시
Change-Id: I837eaf7f0db31bfb708504fe5dbf1d22141f7539
| ID2.Manager/ID2.Manager.Compare/Controls/Verification.cs | ||
|---|---|---|
| 654 | 654 |
|
| 655 | 655 |
try |
| 656 | 656 |
{
|
| 657 |
var entities = blkref.Explode(Blocks); |
|
| 657 |
var entities = blkref.Explode(Blocks).Where(x => x.Visible);
|
|
| 658 | 658 |
entities.ToList().ForEach(y => |
| 659 | 659 |
{
|
| 660 | 660 |
#region 블럭 이름이 ARROW로 시작되는 경우 Hatch로 화살표를 그려준다. |
| ... | ... | |
| 717 | 717 |
txt.Color = color != Color.Empty ? color : GetEntColor(Layers, txt); |
| 718 | 718 |
txt.ColorMethod = colorMethodType.byEntity; |
| 719 | 719 |
KeyValuePair<string, AttributeReference>? kp = attributes.Find(z => z.Key == txt.Tag); |
| 720 |
if (kp.HasValue) |
|
| 720 |
if (kp.HasValue && kp.Value.Value != null)
|
|
| 721 | 721 |
{
|
| 722 | 722 |
///attributes.RemoveAll(x => x.Key == txt.Tag); |
| 723 | 723 |
txt.TextString = (kp.Value.Value) != null ? kp.Value.Value.Value : string.Empty; |
| ... | ... | |
| 733 | 733 |
} |
| 734 | 734 |
*/ |
| 735 | 735 |
} |
| 736 |
else |
|
| 737 |
{
|
|
| 738 |
txt.TextString = txt.Value; |
|
| 739 |
} |
|
| 736 | 740 |
} |
| 737 | 741 |
|
| 738 | 742 |
res.AddRange(entities.Where(y => |
| ID2.Manager/ID2.Manager/Main.cs | ||
|---|---|---|
| 54 | 54 |
List<Documents> orgDocuments = null; |
| 55 | 55 |
int TotalCount = 0; |
| 56 | 56 |
int SearchCount = 0; |
| 57 |
int ROW_HEADER_COLUMN_WIDTH { get; } = 48;
|
|
| 57 | 58 |
|
| 58 | 59 |
BriefAndImages briefAndImagesReview = new BriefAndImages { Dock = DockStyle.Fill };
|
| 59 | 60 |
IssueImagesAndAnswer issueImagesAndAnswerWork = new IssueImagesAndAnswer { Dock = DockStyle.Fill };
|
| ... | ... | |
| 154 | 155 |
this.radGridViewDocuments.ValueChanged += RadGridViewDocuments_ValueChanged; |
| 155 | 156 |
this.radGridViewDocuments.MultiSelect = true; |
| 156 | 157 |
this.radGridViewDocuments.EnableHotTracking = true; |
| 157 |
this.radGridViewDocuments.MasterView.TableHeaderRow.MinHeight = 36; |
|
| 158 |
this.radGridViewDocuments.TableElement.RowHeaderColumnWidth = 36; |
|
| 159 | 158 |
//this.radGridViewDocuments.MasterView.TableSearchRow.InitialSearchResultsTreshold = ; |
| 160 | 159 |
this.radGridViewDocuments.MasterView.TableSearchRow.IsVisible = false; |
| 161 | 160 |
this.radGridViewDocuments.GroupSummaryEvaluate += RadGridViewDocuments_GroupSummaryEvaluate; |
| ... | ... | |
| 1969 | 1968 |
{
|
| 1970 | 1969 |
if (e.CellElement is GridRowHeaderCellElement) |
| 1971 | 1970 |
{
|
| 1972 |
// if (e.CellElement.RowIndex > -1) |
|
| 1973 |
// e.CellElement.Text = (e.CellElement.RowIndex + 1).ToString(); |
|
| 1971 |
if (e.CellElement.RowIndex > -1) e.CellElement.Text = (e.CellElement.RowIndex + 1).ToString(); |
|
| 1974 | 1972 |
} |
| 1975 | 1973 |
else if (e.CellElement is GridGroupExpanderCellElement expanderCellElement) |
| 1976 | 1974 |
{
|
| ... | ... | |
| 2045 | 2043 |
detailViewCellElement.BackColor2 = Color.FromArgb(214, 214, 214); |
| 2046 | 2044 |
} |
| 2047 | 2045 |
} |
| 2046 |
else if (e.CellElement is GridRowHeaderCellElement && e.Row is GridViewGroupRowInfo) |
|
| 2047 |
{
|
|
| 2048 |
e.CellElement.ResetValue(LightVisualElement.TextImageRelationProperty, ValueResetFlags.Local); |
|
| 2049 |
|
|
| 2050 |
e.CellElement.Text = (e.CellElement.RowIndex + 1).ToString(); |
|
| 2051 |
e.CellElement.TextAlignment = ContentAlignment.TopRight; |
|
| 2052 |
e.CellElement.TextImageRelation = TextImageRelation.ImageBeforeText; |
|
| 2053 |
} |
|
| 2048 | 2054 |
//else if (e.Row is GridViewNewRowInfo) |
| 2049 | 2055 |
//{
|
| 2050 | 2056 |
// switch (e.CellElement.ColumnInfo.Name) |
| ... | ... | |
| 3366 | 3372 |
columnGroupsView.ColumnGroups.Add(dtColGrp); |
| 3367 | 3373 |
|
| 3368 | 3374 |
gridView.MasterTemplate.ViewDefinition = columnGroupsView; |
| 3375 |
|
|
| 3376 |
this.radGridViewDocuments.MasterView.TableHeaderRow.MinHeight = 36; |
|
| 3377 |
this.radGridViewDocuments.TableElement.RowHeaderColumnWidth = ROW_HEADER_COLUMN_WIDTH; |
|
| 3369 | 3378 |
} |
| 3370 | 3379 |
|
| 3371 | 3380 |
#region grid view group |
내보내기 Unified diff
