diff --git a/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs b/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs index 0d298a6..f755392 100644 --- a/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs +++ b/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs @@ -73,11 +73,20 @@ namespace Needlework.Net.Desktop.ViewModels { var type = template[i]; if (!type.Contains("#")) continue; - if (requestClasses.Where(c => c.Id == type.Replace("#", string.Empty)).Any()) + + var foundClass = requestClasses.Where(c => c.Id == type.Replace("#", string.Empty)); + if (foundClass.Any()) { - AvaloniaList classes = [.. requestClasses]; - classes.Remove(rootClass); - template[i] = string.Join(string.Empty, CreateTemplate(classes)); + if (foundClass.First().PropertyEnums.Any()) + { + template[i] = string.Join(string.Empty, CreateTemplate([.. foundClass])); + } + else + { + AvaloniaList classes = [.. requestClasses]; + classes.Remove(rootClass); + template[i] = string.Join(string.Empty, CreateTemplate(classes)); + } } else {