From 1d939d52ed4cfa739e1c0c53c5179bc6aae83d52 Mon Sep 17 00:00:00 2001 From: ShrlAlgo Date: Mon, 23 Feb 2026 15:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A9=BA=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Melskin/Appearance/ThemeManager.cs | 2 +- Melskin/Controls/Cascader.xaml.cs | 8 ++++---- Melskin/Controls/SearchableComboBox.cs | 5 ++--- .../DrawSheet/QuickSelectionCmd.cs | 7 ------- .../DrawSheet/QuickSelectionView.xaml.cs | 7 ------- .../Modeling/CADCurveToModelCurveCmd.cs | 2 +- .../Standardizer/MergeSharedParametersCmd.cs | 7 ------- .../Standardizer/ModifyModelParamsCmd.cs | 7 ------- .../Standardizer/TemplateManagerCmd.cs | 7 ------- .../Standardizer/TemplateManagerView.xaml.cs | 8 +------- 10 files changed, 9 insertions(+), 51 deletions(-) diff --git a/Melskin/Appearance/ThemeManager.cs b/Melskin/Appearance/ThemeManager.cs index 19ebaf8..f4ea90c 100644 --- a/Melskin/Appearance/ThemeManager.cs +++ b/Melskin/Appearance/ThemeManager.cs @@ -87,7 +87,7 @@ namespace Melskin.Appearance foreach (var key in dict.Keys.OfType()) { if (dict[key] is SolidColorBrush) - keys.Add(key.ToString()); + keys.Add(key.ToString()!); } } diff --git a/Melskin/Controls/Cascader.xaml.cs b/Melskin/Controls/Cascader.xaml.cs index 2c8fa4b..77b0f7d 100644 --- a/Melskin/Controls/Cascader.xaml.cs +++ b/Melskin/Controls/Cascader.xaml.cs @@ -85,13 +85,13 @@ public class Cascader : Control private string GetObjectDisplayText(object? item) { - if (item == null) return ""; + if (item == null) return string.Empty; if (!string.IsNullOrEmpty(DisplayMemberPath)) { var prop = item.GetType().GetProperty(DisplayMemberPath); - return prop?.GetValue(item)?.ToString() ?? ""; + return prop?.GetValue(item)?.ToString() ?? string.Empty; } - return item.ToString(); + return item.ToString()!; } // 创建了完整的、非空的 CascadingPanel @@ -130,7 +130,7 @@ public class Cascader : Control private void OnSelectionChanged(object sender, SelectionChangedEventArgs e) { if (e.AddedItems.Count == 0) return; - var selectedItem = e.AddedItems[0]; + var selectedItem = e.AddedItems[0]!; var currentMenu = sender as ItemsControl; var parentPanel = CascadingPanel; if (parentPanel == null) return; diff --git a/Melskin/Controls/SearchableComboBox.cs b/Melskin/Controls/SearchableComboBox.cs index 697c3c1..c7bb7cc 100644 --- a/Melskin/Controls/SearchableComboBox.cs +++ b/Melskin/Controls/SearchableComboBox.cs @@ -31,8 +31,7 @@ namespace Melskin.Controls public override void OnApplyTemplate() { base.OnApplyTemplate(); - _editableTextBox = GetTemplateChild("PART_EditableTextBox") as TextBox; - if (_editableTextBox != null) + if (GetTemplateChild("PART_EditableTextBox") is TextBox _editableTextBox) { _editableTextBox.TextChanged += OnEditableTextBoxTextChanged; // 点击时全选 @@ -100,7 +99,7 @@ namespace Melskin.Controls var prop = item.GetType().GetProperty(path); if (prop != null) return prop.GetValue(item)?.ToString() ?? string.Empty; } - return item.ToString(); + return item.ToString()!; } } } diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionCmd.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionCmd.cs index 7e50a33..9ecdf2b 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionCmd.cs @@ -1,13 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionView.xaml.cs index c050e10..204f5ed 100644 --- a/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/DrawSheet/QuickSelectionView.xaml.cs @@ -1,12 +1,5 @@ using System.Windows; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.DrawSheet; /// /// QuickSelectionView.xaml 的交互逻辑 diff --git a/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs index de132bb..097b34e 100644 --- a/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Modeling/CADCurveToModelCurveCmd.cs @@ -68,7 +68,7 @@ public class CADCurveToModelCurveCmd : ExternalCommand } } - catch (Autodesk.Revit.Exceptions.OperationCanceledException ex) + catch (Autodesk.Revit.Exceptions.OperationCanceledException) { if (trans.GetStatus() == TransactionStatus.Started) { diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/MergeSharedParametersCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/MergeSharedParametersCmd.cs index 4d09d42..9a2b356 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/MergeSharedParametersCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/MergeSharedParametersCmd.cs @@ -1,13 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer; /// /// 合并共享参数 diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/ModifyModelParamsCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/ModifyModelParamsCmd.cs index afb401c..82c2442 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/ModifyModelParamsCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/ModifyModelParamsCmd.cs @@ -8,13 +8,6 @@ using Autodesk.Revit.UI.Selection; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.RvCommon; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs index ae98541..0c8c74c 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerCmd.cs @@ -1,13 +1,6 @@ using Autodesk.Revit.Attributes; using Nice3point.Revit.Toolkit.External; -using ShrlAlgoToolkit.RevitAddins.ModelManager; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - namespace ShrlAlgoToolkit.RevitAddins.Standardizer; [Transaction(TransactionMode.Manual)] diff --git a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerView.xaml.cs b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerView.xaml.cs index a1b030b..54d3499 100644 --- a/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerView.xaml.cs +++ b/ShrlAlgoToolkit.RevitAddins/Standardizer/TemplateManagerView.xaml.cs @@ -1,10 +1,4 @@ -using ShrlAlgoToolkit.RevitAddins.ModelManager; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; -using ShrlAlgoToolkit.RevitAddins.General; -using ShrlAlgoToolkit; -using ShrlAlgoToolkit.RevitAddins; - + namespace ShrlAlgoToolkit.RevitAddins.Standardizer; /// /// TemplateManagerView.xaml 的交互逻辑