From cb3b6d274807e9ab2456714c6c72c716cd3f4465 Mon Sep 17 00:00:00 2001 From: sunhonglei Date: Fri, 24 Jan 2025 15:23:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9D=E5=A7=8B=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Entity/JsonEntity.cs | 1 + SparkDB.db | Bin 1814528 -> 1814528 bytes .../SettingPages/ModelColorSetPage.xaml | 56 +++++++++--------- Views/UserControl/Viewport3D.xaml.cs | 2 +- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Model/Entity/JsonEntity.cs b/Model/Entity/JsonEntity.cs index 393f991..a494e04 100644 --- a/Model/Entity/JsonEntity.cs +++ b/Model/Entity/JsonEntity.cs @@ -80,6 +80,7 @@ namespace EncryptFileTool.Entity public string TEST_ITEM_ID { get; set; } public string STANDARD_ID { get; set; } public string STANDARD_NAME { get; set; } + public string STANDARD_EN_NAME { get; set; } public string STANDARD_MIN { get; set; } public string STANDARD_MAX { get; set; } public string IS_MIN_EXIST { get; set; } = "0"; diff --git a/SparkDB.db b/SparkDB.db index bb8b23a81afb9bb5aa751bd4ce003227cc9c1e5c..dc64fef76b2f86fd1ff3a7c4c2db7b2c44a5d001 100644 GIT binary patch delta 8351 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�GBF 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 delta 8351 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 diff --git a/Views/Configuration/SettingPages/ModelColorSetPage.xaml b/Views/Configuration/SettingPages/ModelColorSetPage.xaml index 6070163..a3b9a1a 100644 --- a/Views/Configuration/SettingPages/ModelColorSetPage.xaml +++ b/Views/Configuration/SettingPages/ModelColorSetPage.xaml @@ -44,22 +44,22 @@ - + - + - + - @@ -67,7 +67,7 @@ - @@ -76,7 +76,7 @@ - + @@ -87,18 +87,18 @@ - + - + - + - @@ -106,7 +106,7 @@ - @@ -114,7 +114,7 @@ - @@ -122,7 +122,7 @@ - @@ -130,7 +130,7 @@ - @@ -138,7 +138,7 @@ - @@ -147,7 +147,7 @@ - + @@ -160,18 +160,18 @@ - + - + - + - @@ -179,7 +179,7 @@ - @@ -187,7 +187,7 @@ - @@ -195,7 +195,7 @@ - @@ -203,7 +203,7 @@ - @@ -211,7 +211,7 @@ - @@ -219,7 +219,7 @@ - @@ -227,7 +227,7 @@ - @@ -235,7 +235,7 @@ - diff --git a/Views/UserControl/Viewport3D.xaml.cs b/Views/UserControl/Viewport3D.xaml.cs index ef207b6..afdbbc8 100644 --- a/Views/UserControl/Viewport3D.xaml.cs +++ b/Views/UserControl/Viewport3D.xaml.cs @@ -64,7 +64,7 @@ public partial class Viewport3D // ViewportRightMenuSelectFaceAngleText.IsChecked = ViewportManager.DoubleClickSelectShowBorderAngle; ViewportRightMenuSelectFaceText.IsChecked = ViewportManager.DoubleClickSelectShowInfoText; ViewportRightMenuSelectFaceKind.IsChecked = ViewportManager.DoubleClickSelectShowPlaneType; - + ViewportRightMenuShowModelFaceByType.IsChecked = true; var a = Viewport3Dx.Items; #if DEBUG