Skip to content

Commit

Permalink
3.6.18205.1720
Browse files Browse the repository at this point in the history
스마트 컬렉션의 테이블 객체가 subscriptable이 아닌 부분을 수정
TableTemplate 강제 종료시에 TableInfo.Empty가 설정되면서 발생하는 예외를 수정
DomainsViewModel에서 도메인이 생성과 삭제가 순식간에 일어날때 이미 삭제된 도메인 객체의 viewModel을 생성하는 부분을 수정
DescriptorTreeItemBase과 DescriptorListItemBase에서 객체가 삭제된후에 발생하는 Descriptor_PropertyChanged 이벤트를 무시하도록 변경
  • Loading branch information
s2quake committed Jul 24, 2018
1 parent d14d908 commit b559c52
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ protected virtual void OnDisposed(EventArgs e)

private async void Descriptor_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (this.isDescriptorDisposed == true)
return;
await this.notifier.RefreshAsync();
this.NotifyOfPropertyChange(e.PropertyName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected override void OnDisposed(EventArgs e)
private async void Descriptor_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (this.isDescriptorDisposed == true)
throw new NotImplementedException("this object was disposed.");
return;
if (e.PropertyName == nameof(this.DisplayName) && this.Parent != null)
{
this.Parent.Items.Reposition(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public override TreeViewItemViewModel CreateTreeViewItemViewModel(TreeViewItemVi
{
if (parent is BookmarkRootTreeViewItemViewModel || parent is BookmarkCategoryTreeViewItemViewModel)
return new BookmarkTableTreeViewItemViewModel(this.authenticator, descriptor, this);
return new TableTreeViewItemViewModel(this.authenticator, new TableDescriptor(this.authenticator, descriptor), this);
return new TableTreeViewItemViewModel(this.authenticator, new TableDescriptor(this.authenticator, descriptor, true, this), this);
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ private void Domains_DomainCreated(object sender, DomainEventArgs e)
if (sender is IDomainCollection domainCollection)
{
var domain = e.Domain;
if (domain.Dispatcher == null)
return;
var viewModel = domain.Dispatcher.Invoke(() => new DomainTreeItemBase(this.authenticator, domain, true, this));
this.Dispatcher.InvokeAsync(() =>
{
Expand Down
9 changes: 6 additions & 3 deletions client/Ntreev.Crema.Services/Data/TableTemplate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,12 @@ protected override void OnEndEdit(Authentication authentication, TableInfo table
{
this.Container.InvokeTableEndTemplateEdit(authentication, this.table);
base.OnEndEdit(authentication, tableInfo);
this.table.UpdateTemplate(tableInfo);
this.table.UpdateTags(tableInfo.Tags);
this.table.UpdateComment(tableInfo.Comment);
if (tableInfo != TableInfo.Empty)
{
this.table.UpdateTemplate(tableInfo);
this.table.UpdateTags(tableInfo.Tags);
this.table.UpdateComment(tableInfo.Comment);
}
this.table.SetTableState(TableState.None);

var items = EnumerableUtility.One(this.table).ToArray();
Expand Down
4 changes: 2 additions & 2 deletions common/Ntreev.Crema.AssemblyInfo/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("3.6")]
[assembly: AssemblyFileVersion("3.6.18191.1802")]
[assembly: AssemblyInformationalVersion("3.6.18191.1802")]
[assembly: AssemblyFileVersion("3.6.18205.1720")]
[assembly: AssemblyInformationalVersion("3.6.18205.1720")]
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6.18191.1802
3.6.18205.1720

0 comments on commit b559c52

Please sign in to comment.